path: root/packages/ncurses/6.5/ncurses-6.5-20250118.patch

# ncurses 6.5 - patch 20250118 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.5 is at
#   https://invisible-island.net/archives/ncurses/
#   https://invisible-mirror.net/archives/ncurses/
#   https://ftp.gnu.org/gnu/ncurses/
#
# Patches for ncurses 6.5 can be found at
#   https://invisible-island.net/archives/ncurses/6.5
#   https://invisible-mirror.net/archives/ncurses/6.5
#
# ------------------------------------------------------------------------------
# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250118.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Sun Jan 19 01:57:00 UTC 2025
# ------------------------------------------------------------------------------
# Ada95/aclocal.m4                           |  207 +
# Ada95/configure                            | 3214 +++++++++++-----
# 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             |  288 -
# doc/html/man/curs_beep.3x.html             |   14 
# doc/html/man/curs_bkgd.3x.html             |  117 
# doc/html/man/curs_bkgrnd.3x.html           |  131 
# 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            |  400 +-
# 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         |  198 -
# doc/html/man/curs_getcchar.3x.html         |  202 -
# doc/html/man/curs_getch.3x.html            |   65 
# doc/html/man/curs_getstr.3x.html           |  142 
# 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            |  284 -
# 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          |   37 
# doc/html/man/curs_pad.3x.html              |  133 
# 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          |  121 
# 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           |  110 
# 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               |  702 +--
# 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                           |  314 +
# 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                       |  396 +-
# man/curs_getcchar.3x                       |  409 +-
# man/curs_getch.3x                          |   30 
# man/curs_getstr.3x                         |  164 
# man/curs_getyx.3x                          |   54 
# 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                          |  514 +-
# man/curs_move.3x                           |   16 
# man/curs_opaque.3x                         |   27 
# man/curs_outopts.3x                        |   53 
# man/curs_overlay.3x                        |   52 
# man/curs_pad.3x                            |  208 -
# 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                           |  162 
# man/curs_variables.3x                      |   90 
# man/curs_window.3x                         |  184 
# 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, 13358 insertions(+), 9973 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/aclocal.m4
Prereq:  1.223 
--- ncurses-6.5-20250111+/Ada95/aclocal.m4	2024-12-21 15:29:41.000000000 +0000
+++ ncurses-6.5-20250118/Ada95/aclocal.m4	2025-01-11 00:55:54.000000000 +0000
@@ -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 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 @@
 ])
 ])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
@@ -989,6 +1035,136 @@
 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
 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
@@ -3073,7 +3249,7 @@
 	,[$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 @@
 			;;
 		esac
 
+		CF_REQUIRE_PKG($cf_ncuconfig_root)
 		CF_APPEND_CFLAGS($cf_pkg_cflags)
 		CF_ADD_LIBS($cf_pkg_libs)
 
@@ -3977,6 +4154,30 @@
 $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
Index: Ada95/configure
--- ncurses-6.5-20250111+/Ada95/configure	2024-12-21 15:30:09.000000000 +0000
+++ ncurses-6.5-20250118/Ada95/configure	2025-01-11 00:55:54.000000000 +0000
@@ -5207,6 +5207,20 @@
 			;;
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 			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 @@
 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 @@
 }
 _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 @@
 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 @@
 		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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 		# 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 
 }
 
-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 @@
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5977 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -5998,16 +6012,16 @@
 }
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6214 "configure"
+#line 6228 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -6235,16 +6249,16 @@
 }
 _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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 #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 @@
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6530 "configure"
+#line 6544 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6554,15 +6568,15 @@
 }
 _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 @@
 	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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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"
@@ -6797,13 +6811,13 @@
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:6800: checking for initscr" >&5
+	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 6806 "configure"
+#line 6820 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6834,16 +6848,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6840: \$? = $ac_status" >&5
+  echo "$as_me:6854: \$? = $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:6857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6846: \$? = $ac_status" >&5
+  echo "$as_me:6860: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -6853,18 +6867,18 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6856: result: $ac_cv_func_initscr" >&5
+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:6863: checking for initscr in -l$cf_nculib_root" >&5
+		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 6867 "configure"
+#line 6881 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6876,25 +6890,25 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6882: \$? = $ac_status" >&5
+  echo "$as_me:6896: \$? = $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:6899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6888: \$? = $ac_status" >&5
+  echo "$as_me:6902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6890: result: yes" >&5
+  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:6897: result: no" >&5
+echo "$as_me:6911: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -6962,11 +6976,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:6965: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				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 6969 "configure"
+#line 6983 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -6978,25 +6992,25 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6984: \$? = $ac_status" >&5
+  echo "$as_me:6998: \$? = $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:7001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6990: \$? = $ac_status" >&5
+  echo "$as_me:7004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:6992: result: yes" >&5
+  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:6999: result: no" >&5
+echo "$as_me:7013: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -7011,7 +7025,7 @@
 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: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
@@ -7019,7 +7033,7 @@
 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 "$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
@@ -7029,7 +7043,7 @@
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7032 "configure"
+#line 7046 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -7041,23 +7055,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7047: \$? = $ac_status" >&5
+  echo "$as_me:7061: \$? = $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:7064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7053: \$? = $ac_status" >&5
+  echo "$as_me:7067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:7055: result: yes" >&5
+  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:7060: result: no" >&5
+echo "$as_me:7074: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -7075,7 +7089,7 @@
 	NCURSES_CONFIG=none
 fi
 
-echo "$as_me:7078: checking for specified curses library type" >&5
+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.
@@ -7088,30 +7102,1037 @@
 
 case $cf_cv_screen in
 (curses|curses_*)
-	CF_CURSES_CONFIG
+
+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
+fi
+
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+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
+		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
+	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
+		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 7867 "configure"
+#include "confdefs.h"
+#define tgoto autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef tgoto
+
+#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)
+{
+
+/* 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_tgoto) || defined (__stub___tgoto)
+#error found stub for tgoto
+#endif
+
+	return tgoto ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7898: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7901: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7904: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7907: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_func_tgoto=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_func_tgoto=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+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
+
+			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"
+
+/* 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:7953: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7956: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7962: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  eval "$as_ac_Lib=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+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_nculib_root:=$cf_term_lib}"
+					break
+
+fi
+
+			done
+
+fi
+
+	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
+				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 7999 "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:8011: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8014: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8020: \$? = $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: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
+
+					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()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8080: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8083: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8086: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8089: \$? = $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=error
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+				echo "$as_me:8101: 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:8107: error: no curses library found" >&5
+echo "$as_me: error: no curses library found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+fi
+
 	;;
 (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 @@
 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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 	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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 
 	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 @@
 				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 @@
 }
 _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
 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 @@
 	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 @@
 }
 _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 @@
 		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 "$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_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 @@
 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 @@
 }
 _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 @@
 			;;
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 			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 @@
 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 @@
 }
 _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 @@
 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 @@
 		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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 		# 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 
 }
 
-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 @@
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8686 "configure"
+#line 9721 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8707,16 +9742,16 @@
 }
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8923 "configure"
+#line 9958 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -8944,16 +9979,16 @@
 }
 _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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 #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 @@
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9239 "configure"
+#line 10274 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9263,15 +10298,15 @@
 }
 _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 @@
 	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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 			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 @@
 }
 _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 @@
 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
 
 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 @@
 		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 @@
 }
 _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_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 @@
 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 @@
 }
 _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 @@
 			;;
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 			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 @@
 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 @@
 }
 _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 @@
 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 @@
 		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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 		# 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 
 }
 
-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 @@
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 10773 "configure"
+#line 11822 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10794,16 +11843,16 @@
 }
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11010 "configure"
+#line 12059 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11031,16 +12080,16 @@
 }
 _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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 #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 @@
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11326 "configure"
+#line 12375 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11350,15 +12399,15 @@
 }
 _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 @@
 	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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 			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 @@
 }
 _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 @@
 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
 
 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 @@
 		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 @@
 }
 _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 @@
 
 	;;
 (*)
-	{ { 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 @@
 	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_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 @@
 }
 _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 @@
 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 @@
 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 @@
 	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 @@
 (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 @@
 	(*)
 		;;
 	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 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12101 "configure"
+#line 13150 "configure"
 #include "confdefs.h"
 
 int
@@ -12110,16 +13159,16 @@
 }
 _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 @@
 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 @@
 	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 @@
 		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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 		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 @@
 			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 @@
 }
 _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 @@
 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 @@
 			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 @@
 }
 _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 @@
 			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 @@
 	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 @@
 		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 @@
 
 	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 @@
 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 @@
 
 ###   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 @@
 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 @@
 
 # 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13170 "configure"
+#line 14219 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -13187,16 +14236,16 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13357 "configure"
+#line 14406 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -13369,16 +14418,16 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 	 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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	# 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: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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 	 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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 	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 @@
 	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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 # 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 @@
 #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 @@
 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 @@
 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 @@
   :
 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 @@
 }
 _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 @@
 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 @@
                   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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
      	 # 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 @@
 }
 _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 @@
 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_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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 # 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 @@
 }
 _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 @@
 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
 
-	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 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 @@
 ###############################################################################
 
 ### 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 @@
 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 @@
 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 @@
 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 @@
 ###############################################################################
 # 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 @@
 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 @@
 # 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 @@
 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 @@
 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 @@
 
 	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 @@
 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 @@
 }
 _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 @@
 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 @@
 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
 
-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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 # 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 @@
 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 @@
 
 ### 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 @@
 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 @@
 
 ###	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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 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
 			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
 			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
 			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 @@
 	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 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16299 "configure"
+#line 17348 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16311,26 +17360,26 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 # 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 @@
 		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 @@
 	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 @@
 		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 @@
 				([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 @@
 				([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 @@
 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 @@
 			;;
 		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 @@
 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 @@
 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 @@
 	;;
 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 @@
 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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 (*)
 
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
-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 @@
 }
 _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 @@
 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_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 @@
 }
 _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 @@
 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 @@
 
 ###	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 @@
 
 	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 @@
 }
 #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 @@
   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 @@
 
 _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
 
-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 @@
 
 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 @@
 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 @@
 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 @@
   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 @@
 
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 
 		;;
 	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 @@
 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 @@
 	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 @@
 	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 @@
 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_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 @@
 	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
 		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 @@
 	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 @@
   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 @@
 	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 @@
 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 @@
 	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 @@
 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 @@
 	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 @@
 
 		# 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 @@
 	;;
 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 @@
 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 @@
 	(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 @@
 		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 @@
 			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 @@
 : "${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 @@
     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 @@
     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 @@
   "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_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 @@
   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 "$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 "$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 @@
       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 @@
       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 @@
             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 @@
     $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 @@
   * )   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 "$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 "$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 @@
   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\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: NEWS
Prereq:  1.4229 
--- ncurses-6.5-20250111+/NEWS	2025-01-11 21:55:20.000000000 +0000
+++ ncurses-6.5-20250118/NEWS	2025-01-19 01:24:13.000000000 +0000
@@ -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 @@
 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
Index: VERSION
--- ncurses-6.5-20250111+/VERSION	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/VERSION	2025-01-18 11:23:10.000000000 +0000
@@ -1 +1 @@
-5:0:10	6.5	20250111
+5:0:10	6.5	20250118
Index: aclocal.m4
Prereq:  1.1099 
--- ncurses-6.5-20250111+/aclocal.m4	2024-12-28 21:40:09.000000000 +0000
+++ ncurses-6.5-20250118/aclocal.m4	2025-01-15 22:07:11.000000000 +0000
@@ -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 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 @@
 $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 @@
 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 @@
 	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 @@
 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 @@
 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 @@
 	[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_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 @@
 		rm -f conftest.*
 	fi
 fi
+
+fi
 AC_SUBST(RESULTING_SYMS)
 AC_SUBST(VERSIONED_SYMS)
 AC_SUBST(WILDCARD_SYMS)
Index: configure
--- ncurses-6.5-20250111+/configure	2024-12-29 01:01:41.000000000 +0000
+++ ncurses-6.5-20250118/configure	2025-01-18 11:26:09.000000000 +0000
@@ -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 @@
 
 echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
+	PROGRAM=NCURSES
 	PACKAGE=ncurses
 
 cat >>confdefs.h <<EOF
@@ -1387,7 +1388,7 @@
 # Check whether --with-rel-version or --without-rel-version was given.
 if test "${with_rel_version+set}" = set; then
   withval="$with_rel_version"
-  { echo "$as_me: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 @@
   (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 @@
   (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 "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 @@
   (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 @@
   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 @@
 
 # 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 @@
 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 @@
 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_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 @@
 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 @@
 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 @@
 # 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 @@
 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 @@
 do
   # Extract the 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 @@
   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 @@
 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 @@
 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 @@
 		;;
 	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 @@
 	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 @@
   (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 @@
 	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 @@
   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 @@
 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 @@
 		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 @@
 	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 @@
 			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 @@
 				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 @@
 	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 @@
 	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 @@
 	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 @@
 
 		# 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 @@
   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
 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 @@
 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 @@
 		# 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 @@
   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 @@
 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 @@
 				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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
   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 @@
 # 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 @@
 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 @@
     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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
    '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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 			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 @@
 	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 @@
   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 @@
 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 @@
 
 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 @@
 # 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 @@
 	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 @@
 	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_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 @@
   # 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 @@
   # 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 @@
 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 @@
   # 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 @@
   # 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 @@
 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_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 @@
 
   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 @@
 
   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 @@
 # 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 @@
 
 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 @@
 	(*) 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 @@
   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 @@
 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 @@
 	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 @@
 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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
    '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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 	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 @@
 		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 @@
 }
 _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 @@
 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 @@
 	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 @@
   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 @@
 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 @@
 
 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 @@
 		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 @@
 ([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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 # 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 @@
     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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 	;;
 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 @@
 	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 @@
   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 @@
   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 @@
 
 # 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 @@
 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 @@
 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 @@
   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 @@
 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 @@
   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 @@
   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 @@
 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 @@
 	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 @@
 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 @@
 	;;
 (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 @@
 "`
 	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 @@
 
 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 @@
 			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 @@
 
 	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 @@
 			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 @@
 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 @@
 	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 @@
 	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 @@
 
 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 @@
 	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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 # 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 @@
   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
 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 @@
   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
 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 @@
 	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 @@
 			;;
 		(*)
 
-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 @@
 	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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
   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 @@
 			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 @@
 			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 @@
 	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 @@
 	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 @@
 		;;
 	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 @@
 	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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 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 @@
 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 @@
   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 @@
   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 @@
   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 @@
   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 @@
 
 	: ${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 @@
   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 @@
 
 _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 @@
 	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 @@
 ### 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 @@
 	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 @@
 	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_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 @@
 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 @@
 	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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 		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 @@
 
 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 @@
 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 @@
 		(*...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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 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_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 @@
 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 @@
 
 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 @@
 #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 @@
 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 @@
 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 @@
   :
 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 @@
 }
 _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 @@
 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 @@
                   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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 ###############################################################################
 
-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 @@
 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 @@
 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 @@
 	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 @@
 (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 @@
 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 @@
 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 @@
 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 @@
 	(*)
 		;;
 	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 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6836 "configure"
+#line 6837 "configure"
 #include "confdefs.h"
 
 int
@@ -6845,16 +6846,16 @@
 }
 _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 @@
 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 @@
 	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 @@
 		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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 		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 @@
 			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 @@
 }
 _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 @@
 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 @@
 			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 @@
 }
 _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 @@
 			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 @@
 	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 @@
 		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 @@
 
 	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 @@
 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 @@
 	;;
 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 @@
 	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 @@
 		;;
 	(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 @@
 }
 _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 @@
 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 @@
 (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 @@
 		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 @@
 		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 @@
 	# 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 @@
 } 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,12 +7787,14 @@
 			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
+
 		;;
 	esac
 done
@@ -7796,7 +7802,7 @@
 ### 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 @@
 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 @@
 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 @@
 		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 @@
 
 			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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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
 
 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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
   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 @@
 		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 @@
 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 @@
 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 @@
 #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 @@
   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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
 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
 
-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 @@
 
 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 "$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 @@
 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 @@
 	(*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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 # 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 	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 @@
 
 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 @@
   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
 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 @@
 		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 @@
 }
 _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 @@
 					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 @@
 
 	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 @@
 			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 @@
 
 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 @@
 			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 @@
 
 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 @@
 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 @@
 	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 @@
 ###############################################################################
 
 ###	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 @@
 	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 @@
 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 @@
 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 @@
 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 @@
   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 @@
 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 @@
 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 @@
 	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 @@
 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 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 @@
   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
 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 @@
   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 @@
   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
 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 @@
 # 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 @@
 	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 @@
 do
   # Extract the 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 @@
   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 @@
 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 @@
 
 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 @@
 
 		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 @@
 # 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 @@
 	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 @@
 do
   # Extract the 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 @@
   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 @@
 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 @@
 
 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 @@
 
 		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 @@
 	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 @@
 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 @@
 (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 @@
 	;;
 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 @@
 	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 @@
 	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 @@
 	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 @@
 	;;
 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 @@
 
 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 @@
 	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 @@
 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 @@
 
 ###	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 @@
   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 @@
 }
 _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 @@
 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 @@
 ### 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 @@
 	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 @@
 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 @@
 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 @@
 	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 @@
 	;;
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 		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 @@
 }
 _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 @@
 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 @@
 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 @@
 			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 @@
 
 _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 @@
 		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 @@
 # 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 @@
 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 @@
 
 ###   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 @@
 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 @@
 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 @@
 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 @@
 # 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10974 "configure"
+#line 10994 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -10991,16 +11011,16 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11161 "configure"
+#line 11181 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11173,16 +11193,16 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 	 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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	# 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: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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 	 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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 	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 @@
 	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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 
 # 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 # 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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 	(*_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 @@
 
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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
 
-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 @@
   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 @@
 
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 	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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 
 	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 @@
 				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 @@
 }
 _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
 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 @@
 	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 @@
 }
 _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 @@
 		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 "$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
 
 # 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
      	 # 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 @@
 }
 _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 @@
 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_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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 # 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 @@
 }
 _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 @@
 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
 
-	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 
 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 @@
 
 ###   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 @@
 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 @@
 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 @@
 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 @@
 
 ###   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 @@
 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 @@
 
 ###   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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 ###############################################################################
 
-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 @@
 	;;
 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 @@
 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 @@
 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 @@
   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 @@
 
 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 @@
 
 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 @@
   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 @@
 ###############################################################################
 
 ### 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 @@
 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 @@
 	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 @@
 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 @@
 	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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 		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 @@
 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 @@
 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 @@
 		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 @@
 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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 ##############################################################################
 
-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 @@
 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 @@
 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 @@
 
 	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 @@
 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 @@
 }
 _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 @@
 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 @@
 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
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 # 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 @@
 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 @@
 		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 @@
 	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 @@
 	 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 @@
 	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 @@
 	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 @@
 	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 @@
 
 ### 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 @@
 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 @@
 ###############################################################################
 # 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 ###############################################################################
 # 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
     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 @@
 }
 _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 @@
     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_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 @@
     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 @@
 }
 _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 @@
     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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 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 @@
 
 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 @@
 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 @@
 
 ###	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 @@
 	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 @@
 
 # --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 @@
 	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 @@
 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 @@
 	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 @@
 	;;
 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 @@
 
 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 @@
 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 @@
 				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 @@
 			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 @@
 
 ###	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 @@
 	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 @@
 }
 _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 @@
 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
 			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
 			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
 			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 @@
 	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 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17792 "configure"
+#line 17812 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -17804,26 +17824,26 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 # 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 @@
 		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 @@
 	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 @@
 		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 @@
 				([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 @@
 				([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 @@
 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 @@
 			;;
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 			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_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 @@
 # 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 @@
 		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 @@
 
 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 @@
 		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 @@
 	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 @@
 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 @@
 #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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 
 ###	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 @@
 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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
-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 @@
 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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
-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 @@
 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 @@
 	;;
 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 @@
   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 @@
 	;;
 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 @@
 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 @@
 	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 @@
 	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 @@
 		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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	;;
 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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	;;
 (*)
 	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 @@
 }
 _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 @@
 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 @@
 		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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
 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 @@
 	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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 # 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 
 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_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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 
 _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 @@
 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 @@
 		:
 	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 @@
 		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 @@
 }
 _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 @@
 		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
 
-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 @@
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21470 "configure"
+#line 21490 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21491,16 +21511,16 @@
 }
 _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 @@
 
 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 @@
 
 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 @@
   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 @@
 
 _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
 
-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 @@
 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 @@
 }
 _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 @@
 
 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 @@
 
 ###	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 @@
 }
 _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 @@
 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 @@
 
 # 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 
 	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 @@
 }
 #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 @@
   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 @@
 
 _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
 
-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 @@
 ###	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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 #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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 }
 _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 @@
 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
 
-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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 
 _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 @@
 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 @@
 
 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 @@
 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 @@
 	(*)	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
   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 @@
 
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 	;;
 
 (*)
-	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 	;;
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
       }
 _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 @@
 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 @@
       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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 # 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 	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 @@
 }
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 "$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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 "$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
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 
 # 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 @@
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25810 "configure"
+#line 25830 "configure"
 #include "confdefs.h"
 
 int
@@ -25819,23 +25839,23 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25891 "configure"
+#line 25911 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25903,16 +25923,16 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 			;;
 		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 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26027 "configure"
+#line 26047 "configure"
 #include "confdefs.h"
 
 				#include <iostream>
@@ -26038,16 +26058,16 @@
 }
 _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 @@
 			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 @@
 	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 @@
 # 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 @@
 
 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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
   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 @@
 }
 _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 @@
 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_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 @@
   # 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 @@
   # 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 @@
 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 @@
   # 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 @@
   # 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 	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 @@
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26640 "configure"
+#line 26660 "configure"
 #include "confdefs.h"
 
 int
@@ -26649,23 +26669,23 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26721 "configure"
+#line 26741 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26733,16 +26753,16 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27140 "configure"
+#line 27160 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27178,15 +27198,15 @@
 
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 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 @@
   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 @@
 
 _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_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 @@
 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 @@
   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 @@
 
 _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_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 @@
 
 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_main_return="return"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27444 "configure"
+#line 27464 "configure"
 #include "confdefs.h"
 
 class NCursesPanel
@@ -27485,16 +27505,16 @@
 }
 _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_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 @@
 		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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27939 "configure"
+#line 27959 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27977,15 +27997,15 @@
 
 _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 @@
 	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 "$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 @@
 
  	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 @@
 
 		;;
 	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 @@
 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 @@
 	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 @@
 	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 @@
 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_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 @@
 	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
 		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 @@
 	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 @@
   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 @@
 	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 @@
 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 @@
 	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 @@
 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 @@
 	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 @@
 
 			# 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 @@
 	;;
 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 @@
 
 # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
   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 @@
 	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 @@
 ### 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 @@
 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 @@
 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 @@
 	(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 @@
 		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 @@
 			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 @@
 	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 @@
 
 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 @@
 
 	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 @@
 }
 _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 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 @@
 	;;
 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 @@
 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 @@
 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 @@
 
 # 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 @@
 	;;
 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 @@
 	;;
 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 @@
 	;;
 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 @@
 	;;
 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 @@
 		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 @@
 	(*-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 @@
 
 # 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 @@
 	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 @@
 	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 @@
 
 # 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 @@
 			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 @@
 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 @@
 : "${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 @@
     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 @@
     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 @@
   "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_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,@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 @@
   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 "$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 "$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 @@
       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 @@
       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 @@
             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 @@
     $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 @@
   * )   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 "$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 "$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 @@
   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 @@
 				(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
 					;;
Index: configure.in
Prereq:  1.789 
--- ncurses-6.5-20250111+/configure.in	2024-12-29 00:50:56.000000000 +0000
+++ ncurses-6.5-20250118/configure.in	2025-01-18 11:20:02.000000000 +0000
@@ -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 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
 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 @@
 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
 	;;
 (*)
Index: dist.mk
Prereq:  1.1650 
--- ncurses-6.5-20250111+/dist.mk	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/dist.mk	2025-01-18 11:23:10.000000000 +0000
@@ -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 @@
 # 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)
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.5-20250111+/doc/html/man/captoinfo.1m.html	2024-09-14 20:23:25.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/captoinfo.1m.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/clear.1.html
--- ncurses-6.5-20250111+/doc/html/man/clear.1.html	2024-04-27 18:38:45.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/clear.1.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_add_wch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_add_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_add_wch.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 </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 @@
 
        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 @@
 
 </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 @@
 
 
 </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 @@
 
 
 </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 @@
        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>
Index: doc/html/man/curs_add_wchstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_add_wchstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_add_wchstr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        <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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_addch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_addch.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_addch.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        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 @@
 </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 @@
        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 @@
 
 
 
-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>
Index: doc/html/man/curs_addchstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_addchstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_addchstr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        <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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_addstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_addstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_addstr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        <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 @@
 
 
 </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 @@
 
 
 </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>
Index: doc/html/man/curs_addwstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_addwstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_addwstr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        <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 @@
        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 @@
 
        <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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_attr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_attr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_attr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        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 @@
               <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 @@
               <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 @@
 
 
 </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>
-              and <STRONG>standout</STRONG>.
-
-       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.
+       <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>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
+       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 @@
 
 
 </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 @@
               <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 @@
               <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 @@
        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 @@
 
           <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 @@
 
 
 
-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>
Index: doc/html/man/curs_beep.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_beep.3x.html	2024-07-20 22:19:03.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_beep.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_bkgd.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_bkgd.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_bkgd.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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.
-
-       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.
-
-       <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 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,  <EM>curses</EM> displays the
-       attributes of the background as the graphic rendition of the  character
-       put on the screen.
+       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.
+
+       <EM>curses</EM> also uses the background character when writing characters to  a
+       populated window.
+
+       <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 code and attributes of the background  character
+           combine with blank character cells in the window.
+
+       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 @@
            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 @@
            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  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 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 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.
-
-       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
+       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  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 @@
 
 
 </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>
Index: doc/html/man/curs_bkgrnd.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_bkgrnd.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_bkgrnd.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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.
-
-       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.
-
-       <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 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,  <EM>curses</EM> displays the
-       attributes of the background as the graphic rendition of the  character
-       put on the screen.
+       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.
+
+       <EM>curses</EM>  also uses the background character when writing characters to a
+       populated window.
+
+       <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 code and attributes of the background character
+           combine with blank character cells in the window.
+
+       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  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 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 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 @@
 </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 @@
 </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>
Index: doc/html/man/curs_border.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_border.3x.html	2024-07-27 23:11:31.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_border.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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>
Index: doc/html/man/curs_border_set.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_border_set.3x.html	2024-05-25 22:33:41.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_border_set.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_clear.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_clear.3x.html	2024-05-25 22:33:41.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_clear.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 </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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_color.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_color.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_color.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
        <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 @@
        <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 @@
        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>.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       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.
+       <EM>ncurses</EM> satisfies X/Open  Curses's  minimum  maximums  for  <EM>COLORS</EM>  and
+       <EM>COLOR</EM><STRONG>_</STRONG><EM>PAIRS</EM>.
 
-       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.
-
-       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 <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>.
+       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.
+
+       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.
-
-       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>).
+       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  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>   <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.
-
-           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 <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>   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), in its non-wide configuration, uses 8  bits
+           of <EM>chtype</EM> for the color pair identifier.
+
+           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), <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  <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 @@
 
 
 
-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>
Index: doc/html/man/curs_delch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_delch.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_delch.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_deleteln.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_deleteln.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_deleteln.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_extend.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_extend.3x.html	2024-09-14 20:23:26.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_extend.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_get_wch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_get_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_get_wch.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
        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 @@
            <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 @@
        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 @@
        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 @@
 <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>
Index: doc/html/man/curs_get_wstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_get_wstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_get_wstr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 </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 @@
        <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.
-
-       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.
+       All of these functions except <STRONG>wgetn_wstr</STRONG> may be implemented as macros.
 
-       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.
+       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.
+
+       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.
+
+
+</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 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
-              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.
-
-       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 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       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  <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.
+
+       <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  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>   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>   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>   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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_getcchar.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_getcchar.3x.html	2024-04-27 18:38:46.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_getcchar.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 </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.
+
+       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 character attributes in <EM>attrs</EM>
+       The string may contain a single control  character  instead.   In  that
+       case, no non-spacing characters are allowed.
 
-       <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>wc</EM>.   The  string  must  be
-           L'\0' terminated, contain at most one spacing character, which must
-           be the first.
+</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.
 
-           Up to <STRONG>CCHARW_MAX</STRONG>-1 non-spacing characters may  follow.   Additional
-           non-spacing characters are ignored.
+       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.
 
-           The string may contain a single control character instead.  In that
-           case, no non-spacing characters are allowed.
+       <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
 
+       In <EM>ncurses</EM>, <STRONG>setcchar</STRONG> returns <STRONG>ERR</STRONG> if
 
-</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.
+       <STRONG>o</STRONG>   <EM>wch</EM> is a null pointer,
 
-       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>wc</EM> starts with a (wide) control character and  contains  any  other
+           wide characters, or
 
-       Upon successful completion, <STRONG>setcchar</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, it returns
-       <STRONG>ERR</STRONG>.
+       <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:
-
-       <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>   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.
+       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>   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>   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 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>   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  uses  an  opaque  structure with 28 bytes, which is large
-           enough for the 6 <STRONG>wchar_t</STRONG> values.
+       <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>   Solaris <EM>xpg4</EM> curses uses a single array of 6 <STRONG>wchar_t</STRONG> values.
-
-       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.
+       <STRONG>o</STRONG>   Solaris <EM>xcurses</EM> uses a single array of 6 <EM>wchar</EM><STRONG>_</STRONG><EM>t</EM> 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.
+
+       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.
+
+
+</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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_getch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_getch.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_getch.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
        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 @@
 </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 @@
 
        <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 @@
        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 @@
        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>
Index: doc/html/man/curs_getstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_getstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_getstr.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 </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 @@
        <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 @@
        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 @@
        <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 @@
 
        <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.
-
-       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.
+       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  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 @@
        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 @@
        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.)
-
-       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.
+       <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.)
+
+       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 @@
            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 @@
 
        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 @@
        <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>
Index: doc/html/man/curs_getyx.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_getyx.3x.html	2024-06-08 23:12:48.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_getyx.3x.html	2025-01-19 00:54:58.000000000 +0000
@@ -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 @@
 
 
 </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 @@
        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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_in_wch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_in_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_in_wch.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_in_wchstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_in_wchstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_in_wchstr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
        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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_inch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_inch.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_inch.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_inchstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_inchstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_inchstr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        (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 @@
 
 
 </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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_initscr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_initscr.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_initscr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
            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 @@
 
 
 
-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>
Index: doc/html/man/curs_inopts.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_inopts.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_inopts.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 </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 @@
        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 @@
 
        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 @@
        <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 @@
 
        <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 @@
 
 
 
-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>
Index: doc/html/man/curs_ins_wch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_ins_wch.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_ins_wch.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_ins_wstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_ins_wstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_ins_wstr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
        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 @@
        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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_insch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_insch.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_insch.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_insstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_insstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_insstr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
        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 @@
 
        <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 @@
        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 @@
 
        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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_instr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_instr.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_instr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
        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 @@
 
 
 </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 @@
 
        <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 @@
 
 
 
-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>
Index: doc/html/man/curs_inwstr.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_inwstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_inwstr.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
        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 @@
 
        <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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_kernel.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_kernel.3x.html	2024-09-21 18:35:27.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_kernel.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        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 @@
 
 
 
-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>
Index: doc/html/man/curs_mouse.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_mouse.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_mouse.3x.html	2025-01-19 01:14:35.000000000 +0000
@@ -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 @@
 
 </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 @@
        <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 @@
 
 </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.
-
-       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> 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.
+
+       <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>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 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.
+       <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>.
+
+       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  <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 @@
 
        <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 @@
 
           <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 @@
 
 
 </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 @@
        "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 @@
        <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 @@
 
        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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_move.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_move.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_move.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_opaque.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_opaque.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_opaque.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        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 @@
 <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>
Index: doc/html/man/curs_outopts.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_outopts.3x.html	2024-09-14 20:23:26.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_outopts.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 </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>
Index: doc/html/man/curs_overlay.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_overlay.3x.html	2024-05-25 22:33:42.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_overlay.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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.
-
-       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.
+       These functions return <STRONG>OK</STRONG> on success and <STRONG>ERR</STRONG> on failure.
+
+       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 @@
 
 
 
-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>
Index: doc/html/man/curs_pad.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_pad.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_pad.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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.
-
+       <STRONG>pechochar</STRONG> may be implemented as 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.
-
-       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>.
-
-           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>,
-           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.
-           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 <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>.
+
+</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 <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   its
+           <EM>wnoutrefresh</EM>, returning <EM>ERR</EM> in that case.
+
+           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  <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 <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 @@
 <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>
Index: doc/html/man/curs_printw.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_printw.3x.html	2024-04-27 18:38:47.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_printw.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
        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 @@
 
 
 
-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>
Index: doc/html/man/curs_refresh.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_refresh.3x.html	2024-09-14 20:23:26.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_refresh.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_scanw.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_scanw.3x.html	2024-04-27 18:38:47.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_scanw.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
        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 @@
 
 
 
-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>
Index: doc/html/man/curs_scr_dump.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_scr_dump.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_scr_dump.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_scroll.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_scroll.3x.html	2024-09-22 18:37:11.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_scroll.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_slk.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_slk.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_slk.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
                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 @@
 
 
 
-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>
Index: doc/html/man/curs_sp_funcs.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_sp_funcs.3x.html	2024-05-11 21:39:57.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_sp_funcs.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
 
 
 
-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>
Index: doc/html/man/curs_termattrs.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_termattrs.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_termattrs.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
        <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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_termcap.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_termcap.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_termcap.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
        <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 @@
 
        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>   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>   <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.
 
 
 </PRE><H3><a name="h3-Retrieving-Capability-Values">Retrieving Capability Values</a></H3><PRE>
@@ -111,22 +111,22 @@
        <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>   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>   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>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 @@
 
 </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 @@
 
        <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 @@
 
 
 </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 @@
        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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_terminfo.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_terminfo.3x.html	2024-12-28 21:54:09.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_terminfo.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
        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 @@
 
 
 </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 @@
        <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 @@
 
        <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 @@
 
 </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 @@
 
 
 </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 @@
 
 
 </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 @@
 
 </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 @@
            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 @@
        <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 @@
        <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 @@
        <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 @@
        <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>
Index: doc/html/man/curs_touch.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_touch.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_touch.3x.html	2025-01-19 00:54:59.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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 @@
 <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>
Index: doc/html/man/curs_trace.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_trace.3x.html	2024-12-28 21:43:56.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_trace.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/curs_util.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_util.3x.html	2024-12-28 21:54:09.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_util.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 </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 are displayed  as  themselves,  e.g.,  a  one-
-           character string containing the key.
+       <STRONG>o</STRONG>   Printable   characters  represent  themselves  as  a  one-character
+           string.
 
-       <STRONG>o</STRONG>   Control characters are displayed in the <STRONG>^</STRONG><EM>X</EM> notation.
+       <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>   Printing characters are displayed as is.
+       <STRONG>o</STRONG>   DEL (character code 127) is represented as <STRONG>^?</STRONG>.
 
-       <STRONG>o</STRONG>   DEL (character 127) is displayed as <STRONG>^?</STRONG>.
+       <STRONG>o</STRONG>   A character code greater than 127 is  represented  in  one  of  two
+           ways.
 
-       <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.
+           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.
 
-       The  corresponding  <STRONG>wunctrl</STRONG>  returns  a  printable  representation of a
-       complex character <EM>wch</EM>.
+           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.
 
-       In both <STRONG>unctrl</STRONG> and <STRONG>wunctrl</STRONG> the attributes and color associated with the
-       character parameter are ignored.
+           <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.
+
+       <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
+       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 @@
 
 
 </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 @@
 
        <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 @@
 
 
 </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.
 
-       Routines that return pointers return <EM>NULL</EM> on error.
+       In <EM>ncurses</EM>,
 
-       In this implementation
+       <STRONG>o</STRONG>   <STRONG>flushinp</STRONG> returns <STRONG>ERR</STRONG> if the terminal was not initialized, and
 
-          <STRONG>flushinp</STRONG>
-               returns <STRONG>ERR</STRONG> if the terminal was not initialized.
+       <STRONG>o</STRONG>   <STRONG>putwin</STRONG> returns <STRONG>ERR</STRONG> if its associated <STRONG>write(2)</STRONG> calls return <STRONG>ERR</STRONG>.
 
-          <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 @@
            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 @@
 
        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 @@
 
 
 
-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 @@
 <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 @@
 </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>
Index: doc/html/man/curs_variables.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_variables.3x.html	2024-09-21 18:35:27.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_variables.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 </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 @@
        <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 @@
        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 @@
 
 </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 @@
        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 @@
 
        <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 @@
 <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 @@
 </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 @@
 </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>
Index: doc/html/man/curs_window.3x.html
--- ncurses-6.5-20250111+/doc/html/man/curs_window.3x.html	2024-12-28 21:54:09.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/curs_window.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 
 </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.
-
-       Routines that return pointers return <EM>NULL</EM> on error.
-
-       X/Open defines no error conditions.  In this implementation
-
-       <STRONG>delwin</STRONG>
-            returns <STRONG>ERR</STRONG> if the window pointer is null, or if the window 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.
-
-       <STRONG>dupwin</STRONG>
-            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  <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 <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 <STRONG>ERR</STRONG> if the window pointer is null.
-
-       <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.
-
-       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 integers return <STRONG>ERR</STRONG>  upon  failure  and  <STRONG>OK</STRONG>  upon
+       success.
+
+       Functions that return pointers return <EM>NULL</EM> on error.
+
+       <EM>ncurses</EM> defines several error conditions.
+
+       <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.
+
+           <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>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.
+
+       <STRONG>o</STRONG>   <STRONG>dupwin</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer.
+
+       <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>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>o</STRONG>   <STRONG>newwin</STRONG> returns <STRONG>ERR</STRONG> if any of its arguments is negative.
+
+       <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>o</STRONG>   <STRONG>syncok</STRONG> returns <STRONG>ERR</STRONG> if <EM>win</EM> is a null pointer.
+
+       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 @@
 
 
 
-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>
Index: doc/html/man/form_field_opts.3x.html
--- ncurses-6.5-20250111+/doc/html/man/form_field_opts.3x.html	2024-04-27 18:38:47.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/form_field_opts.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/form_field_validation.3x.html
--- ncurses-6.5-20250111+/doc/html/man/form_field_validation.3x.html	2024-12-28 21:43:57.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/form_field_validation.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 
 
-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>
Index: doc/html/man/form_fieldtype.3x.html
--- ncurses-6.5-20250111+/doc/html/man/form_fieldtype.3x.html	2024-12-28 21:43:57.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/form_fieldtype.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/form_opts.3x.html
--- ncurses-6.5-20250111+/doc/html/man/form_opts.3x.html	2024-04-27 18:38:48.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/form_opts.3x.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.5-20250111+/doc/html/man/infocmp.1m.html	2024-12-28 21:43:57.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/infocmp.1m.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
        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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.5-20250111+/doc/html/man/infotocap.1m.html	2024-07-27 23:11:33.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/infotocap.1m.html	2025-01-19 00:55:00.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/menu_opts.3x.html
--- ncurses-6.5-20250111+/doc/html/man/menu_opts.3x.html	2024-04-27 18:38:48.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/menu_opts.3x.html	2025-01-19 00:55:01.000000000 +0000
@@ -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 @@
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/mitem_opts.3x.html
--- ncurses-6.5-20250111+/doc/html/man/mitem_opts.3x.html	2024-04-27 18:38:49.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/mitem_opts.3x.html	2025-01-19 00:55:01.000000000 +0000
@@ -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 @@
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.5-20250111+/doc/html/man/ncurses.3x.html	2024-12-28 21:43:58.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/ncurses.3x.html	2025-01-19 00:55:01.000000000 +0000
@@ -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 @@
        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 @@
        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 @@
                     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 @@
                     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 @@
                     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 @@
                     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 @@
                     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 @@
                     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 @@
                     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 @@
                     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 @@
 
 </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 @@
           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 @@
                   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 @@
 
 
 </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 @@
 
 
 </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 @@
 
                 <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 @@
 
                 <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>   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>   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>
                 (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 @@
             <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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/new_pair.3x.html
--- ncurses-6.5-20250111+/doc/html/man/new_pair.3x.html	2024-04-27 18:38:49.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/new_pair.3x.html	2025-01-19 00:55:01.000000000 +0000
@@ -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 @@
 
 </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 @@
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/scr_dump.5.html
--- ncurses-6.5-20250111+/doc/html/man/scr_dump.5.html	2024-04-27 18:38:49.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/scr_dump.5.html	2025-01-19 00:55:01.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/tabs.1.html
--- ncurses-6.5-20250111+/doc/html/man/tabs.1.html	2024-09-21 18:35:29.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/tabs.1.html	2025-01-19 00:55:01.000000000 +0000
@@ -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 @@
 
 
 
-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>
Index: doc/html/man/terminfo.5.html
--- ncurses-6.5-20250111+/doc/html/man/terminfo.5.html	2024-12-28 21:43:58.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/terminfo.5.html	2025-01-19 00:55:01.000000000 +0000
@@ -71,7 +71,7 @@
        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 @@
        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 @@
             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 @@
 
        <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 @@
 
             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 @@
        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 @@
            <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 @@
                  <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 @@
                    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 @@
            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 @@
 
        <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 @@
               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 @@
        <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 @@
        <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 @@
 
        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 @@
            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 @@
                    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 @@
                         <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 @@
        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 @@
 
        <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 @@
 
 
 </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 @@
 
 
 </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>
 
 
Index: doc/html/man/tic.1m.html
--- ncurses-6.5-20250111+/doc/html/man/tic.1m.html	2024-09-14 20:23:29.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/tic.1m.html	2025-01-19 00:55:02.000000000 +0000
@@ -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 @@
 
 
 </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 @@
 
 
 
-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>
Index: doc/html/man/tput.1.html
--- ncurses-6.5-20250111+/doc/html/man/tput.1.html	2024-12-28 21:43:58.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/tput.1.html	2025-01-19 00:55:02.000000000 +0000
@@ -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 @@
                 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 @@
 
                        <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 @@
        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 @@
 
 
 </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 @@
 
 
 </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 @@
               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 @@
               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 @@
               &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 @@
 
 
 
-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>
Index: doc/html/man/tset.1.html
--- ncurses-6.5-20250111+/doc/html/man/tset.1.html	2024-12-28 21:43:58.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/tset.1.html	2025-01-19 00:55:02.000000000 +0000
@@ -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 @@
 
        <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 @@
 
 
 
-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>
Index: doc/html/man/wresize.3x.html
--- ncurses-6.5-20250111+/doc/html/man/wresize.3x.html	2024-12-28 21:43:59.000000000 +0000
+++ ncurses-6.5-20250118/doc/html/man/wresize.3x.html	2025-01-19 00:55:02.000000000 +0000
@@ -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 @@
        <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 @@
 
 
 
-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>
Index: include/curses.wide
Prereq:  1.52 
--- ncurses-6.5-20250111+/include/curses.wide	2025-01-12 00:39:32.000000000 +0000
+++ ncurses-6.5-20250118/include/curses.wide	2025-01-18 21:08:32.000000000 +0000
@@ -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) 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 @@
 #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)
Index: man/captoinfo.1m
Prereq:  1.65 
--- ncurses-6.5-20250111+/man/captoinfo.1m	2024-09-14 00:39:51.000000000 +0000
+++ ncurses-6.5-20250118/man/captoinfo.1m	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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
Index: man/clear.1
Prereq:  1.48 
--- ncurses-6.5-20250111+/man/clear.1	2024-03-16 15:35:01.000000000 +0000
+++ ncurses-6.5-20250118/man/clear.1	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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
Index: man/curs_add_wch.3x
Prereq:  1.74 
--- ncurses-6.5-20250111+/man/curs_add_wch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_add_wch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 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 @@
 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 @@
 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 @@
 .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
Index: man/curs_add_wchstr.3x
Prereq:  1.46 
--- ncurses-6.5-20250111+/man/curs_add_wchstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_add_wchstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 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 @@
 .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
Index: man/curs_addch.3x
Prereq:  1.103 
--- ncurses-6.5-20250111+/man/curs_addch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_addch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 line drawing.
 .bP
 X/Open Curses
-(Issues 2 through 7)
+(Issues\ 2 through 7)
 has a typographical error
 for the
 .B \%ACS_LANTERN
Index: man/curs_addchstr.3x
Prereq:  1.52 
--- ncurses-6.5-20250111+/man/curs_addchstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_addchstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .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
Index: man/curs_addstr.3x
Prereq:  1.57 
--- ncurses-6.5-20250111+/man/curs_addstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_addstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .I char
 in
 .IR str .
-.PP
-.B waddnstr
+.B \%waddnstr
 is similar,
 but writes at most
 .I n
@@ -87,10 +87,8 @@
 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 @@
 .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
Index: man/curs_addwstr.3x
Prereq:  1.47 
--- ncurses-6.5-20250111+/man/curs_addwstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_addwstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 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 @@
 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 @@
 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
Index: man/curs_attr.3x
Prereq:  1.115 
--- ncurses-6.5-20250111+/man/curs_attr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_attr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 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 @@
 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 @@
 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_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_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 @@
 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 @@
 .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 @@
 .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 @@
 (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
-.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
+4BSD (1980)
 .I curses
-provided the basic features for manipulating video attributes.
-However, earlier versions of
+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
+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 @@
 .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 @@
 .I curses
 interface.
 .PP
-Regarding U/Win,
+Regarding UWIN,
 .bP
 Development of the
 .I curses
@@ -681,7 +746,7 @@
 .bP
 The library uses only
 .I \%chtype
-(no
+(not
 .IR \%cchar_t ")."
 .RE
 .PP
@@ -691,23 +756,32 @@
 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),
Index: man/curs_beep.3x
Prereq:  1.35 
--- ncurses-6.5-20250111+/man/curs_beep.3x	2024-07-20 20:54:51.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_beep.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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
Index: man/curs_bkgd.3x
Prereq:  1.67 
--- ncurses-6.5-20250111+/man/curs_bkgd.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_bkgd.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 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 @@
 .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 @@
 .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 @@
 .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 @@
 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
Index: man/curs_bkgrnd.3x
Prereq:  1.49 
--- ncurses-6.5-20250111+/man/curs_bkgrnd.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_bkgrnd.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 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 @@
 .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 @@
 .IR \%ncurses ","
 failure occurs if
 .bP
+the
+.I curses
+screen has not been initialized,
+.bP
 .I win
 is
 .IR NULL ","
@@ -220,14 +236,12 @@
 .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 @@
 .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
Index: man/curs_border.3x
Prereq:  1.53 
--- ncurses-6.5-20250111+/man/curs_border.3x	2024-07-27 19:55:45.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_border.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 .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)
Index: man/curs_border_set.3x
Prereq:  1.38 
--- ncurses-6.5-20250111+/man/curs_border_set.3x	2024-05-25 20:10:58.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_border_set.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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),
Index: man/curs_clear.3x
Prereq:  1.50 
--- ncurses-6.5-20250111+/man/curs_clear.3x	2024-05-25 20:10:58.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_clear.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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 @@
 \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
Index: man/curs_color.3x
Prereq:  1.104 
--- ncurses-6.5-20250111+/man/curs_color.3x	2024-12-28 21:18:35.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_color.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .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 @@
 \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.
-.PP
-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 \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.
-.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
+.B \%can_change_color
 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.
+.B \%has_colors
+return
+.B TRUE
+or
+.BR FALSE "."
+The other functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-Specific functions make additional checks:
-.RS 3
-.TP 5
-\fB\%init_color\fP
+In
+.IR \%ncurses ","
+functions returning an
+.I int
+recognize several error conditions.
+.bP
+All return
+.B ERR
+if the screen has not been initialized;
+see \fBinitscr\fP(3X) or \fBnewterm\fP(3X).
+.bP
+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
+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 settable.
+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 @@
 .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.
+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
-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:
+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),
Index: man/curs_delch.3x
Prereq:  1.41 
--- ncurses-6.5-20250111+/man/curs_delch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_delch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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)
Index: man/curs_deleteln.3x
Prereq:  1.43 
--- ncurses-6.5-20250111+/man/curs_deleteln.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_deleteln.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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
Index: man/curs_extend.3x
Prereq:  1.51 
--- ncurses-6.5-20250111+/man/curs_extend.3x	2024-09-14 20:06:50.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_extend.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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
Index: man/curs_get_wch.3x
Prereq:  1.50 
--- ncurses-6.5-20250111+/man/curs_get_wch.3x	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_get_wch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 .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 @@
 .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 @@
 .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 @@
 .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
Index: man/curs_get_wstr.3x
Prereq:  1.56 
--- ncurses-6.5-20250111+/man/curs_get_wstr.3x	2024-12-28 21:18:35.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_get_wstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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.
-.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.
+populates
+.I wstr
+with
+.I WEOF
+(as defined in
+.IR \%wchar.h )
+if an end-of-file condition occurs on the input;
+.bP
+always terminates the string with a null wide character
+(after any
+.IR WEOF );
+.bP
+interprets the screen's erase and kill characters
+(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
+.bP
+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 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 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
+.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
-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
-\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.
+\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.
-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
+.IR NULL ","
+or
 .bP
-if its timeout expires without having any data, 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 @@
 .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.
-.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.
+.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 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
Index: man/curs_getcchar.3x
Prereq:  1.49 
--- ncurses-6.5-20250111+/man/curs_getcchar.3x	2024-04-20 18:55:09.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_getcchar.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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
-.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 \fIwch\fP, into the array pointed to by \fIwc\fP.
+.B \%getcchar
+destructures a
+.I \%cchar_t
+into its components.
 .PP
-When
-\fIwc\fP
-is a null pointer, the
-\fBgetcchar\fP
-function does the following:
+If
+.I wc
+is not a null pointer,
+.BR \%getcchar :
+.bP
+stores the wide-character string in the
+.I curses
+complex character
+.I wch
+into
+.IR wc ;
+.bP
+stores the attributes in
+.IR attrs ;
+and
 .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
+stores the color pair identifier in
+.IR pair .
+.PP
+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.
-.PP
-When \fIwc\fP is not a null pointer,
-\fBgetcchar\fP returns \fBOK\fP upon successful completion,
-and \fBERR\fP otherwise.
+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
+.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:
-.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.
-.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.
+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
+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
+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:
-.bP
-a spacing character (\fBwchar_t\fP, i.e., 32-bits).
-.bP
-non-spacing characters (again, \fBwchar_t\fP's).
-.bP
-attributes (at least 16 bits, inferred from the various ACS- and WACS-flags).
-.bP
-color pair (at least 16 bits, inferred from the \fBunsigned short\fP type).
+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 wide character
+.RI \%( wchar_t ),
+.bP
+at least five non-spacing wide characters
+.RI \%( wchar_t ;
+see below),
+.bP
+attributes
+(at least 15 bits' worth,
+inferred from the count of specified
+.B WA_
+constants),
+.\" See X/Open Curses Issue 7, p. 307.
+.bP
+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.
-.bP
-HP-UX\ 10 uses an opaque structure with 28 bytes,
-which is large enough for the 6 \fBwchar_t\fP values.
-.bP
-Solaris \fIxpg4\fP curses uses a single array of 6 \fBwchar_t\fP values.
+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 used an opaque structure of 28 bytes,
+large enough for 6
+.I \%wchar_t
+values.
+.bP
+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.
-.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.
+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,
+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),
Index: man/curs_getch.3x
Prereq:  1.104 
--- ncurses-6.5-20250111+/man/curs_getch.3x	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_getch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 .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 @@
 .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 @@
 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 @@
 \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 @@
 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
Index: man/curs_getstr.3x
Prereq:  1.71 
--- ncurses-6.5-20250111+/man/curs_getstr.3x	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_getstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .B \%wgetstr
 updates
 .I win
-with \fB\%wechochar\fP(3X).
+with \fB\%waddch\fP(3X).
 Further,
 .bP
 the erase character
@@ -141,6 +142,15 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 .\" 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 @@
 \*(``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 @@
 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)
-.PP
-X/Open Curses Issue 5 (2007) stated that these functions
+survived into X/Open Curses Issue\ 4,
+Version\ 2 \" p. 94 (PDF 114)
+but disappeared from Issue\ 7.) \" p. 105 (PDF 119)
+.PP
+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 @@
 .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 @@
 .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 @@
 .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 @@
 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 @@
 .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
Index: man/curs_getyx.3x
Prereq:  1.47 
--- ncurses-6.5-20250111+/man/curs_getyx.3x	2024-06-08 20:42:50.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_getyx.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 ","
-and
-.B \%getpary
-for compatibility with older versions of
-.IR curses ";"
+.IR \%getbegy ","
+.IR \%getbegx ","
+.IR \%getcury ","
+.IR \%getcurx ","
+.IR \%getmaxy ","
+.IR \%getmaxx ","
+.IR \%getpary ","
+and
+.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 @@
 .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),
Index: man/curs_in_wch.3x
Prereq:  1.37 
--- ncurses-6.5-20250111+/man/curs_in_wch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_in_wch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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).
Index: man/curs_in_wchstr.3x
Prereq:  1.41 
--- ncurses-6.5-20250111+/man/curs_in_wchstr.3x	2024-05-25 20:10:58.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_in_wchstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 .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 @@
 \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
Index: man/curs_inch.3x
Prereq:  1.64 
--- ncurses-6.5-20250111+/man/curs_inch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_inch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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
Index: man/curs_inchstr.3x
Prereq:  1.49 
--- ncurses-6.5-20250111+/man/curs_inchstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_inchstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 .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 @@
 \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),
Index: man/curs_initscr.3x
Prereq:  1.81 
--- ncurses-6.5-20250111+/man/curs_initscr.3x	2024-12-28 21:18:35.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_initscr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 .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 @@
 \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 @@
 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
Index: man/curs_inopts.3x
Prereq:  1.82 
--- ncurses-6.5-20250111+/man/curs_inopts.3x	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_inopts.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 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
Index: man/curs_ins_wch.3x
Prereq:  1.36 
--- ncurses-6.5-20250111+/man/curs_ins_wch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_ins_wch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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).
Index: man/curs_ins_wstr.3x
Prereq:  1.48 
--- ncurses-6.5-20250111+/man/curs_ins_wstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_ins_wstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .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 @@
 (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 @@
 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
Index: man/curs_insch.3x
Prereq:  1.44 
--- ncurses-6.5-20250111+/man/curs_insch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_insch.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 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 "."
Index: man/curs_insstr.3x
Prereq:  1.59 
--- ncurses-6.5-20250111+/man/curs_insstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_insstr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .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 @@
 (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 @@
 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 @@
 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
Index: man/curs_instr.3x
Prereq:  1.61 
--- ncurses-6.5-20250111+/man/curs_instr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_instr.3x	2025-01-19 00:49:39.000000000 +0000
@@ -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 @@
 \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 @@
 .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 @@
 .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 @@
 .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 @@
 .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
Index: man/curs_inwstr.3x
Prereq:  1.49 
--- ncurses-6.5-20250111+/man/curs_inwstr.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_inwstr.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 \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 @@
 .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 @@
 .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 @@
 .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 @@
 .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
Index: man/curs_kernel.3x
Prereq:  1.72 
--- ncurses-6.5-20250111+/man/curs_kernel.3x	2024-09-21 18:05:20.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_kernel.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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\*(''.
Index: man/curs_mouse.3x
Prereq:  1.106 
--- ncurses-6.5-20250111+/man/curs_mouse.3x	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_mouse.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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.
-.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.
+If the screen is not initialized,
+or the terminal interface does report mouse events,
+.B \%mousemask
+returns 0.
+.bP
+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 pointer;
+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_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 @@
 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 @@
 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.
+.B \%wmouse_trafo
+return
+.B TRUE
+or
+.B FALSE
+as noted above.
 .PP
-\fB\%getmouse\fP and \fB\%ungetmouse\fP
-return \fBERR\fP upon failure and \fBOK\fP upon success.
+.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 @@
 .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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 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 @@
 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 @@
 .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,
Index: man/curs_move.3x
Prereq:  1.48 
--- ncurses-6.5-20250111+/man/curs_move.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_move.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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
Index: man/curs_opaque.3x
Prereq:  1.45 
--- ncurses-6.5-20250111+/man/curs_opaque.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_opaque.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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),
Index: man/curs_outopts.3x
Prereq:  1.71 
--- ncurses-6.5-20250111+/man/curs_outopts.3x	2024-09-14 20:06:50.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_outopts.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 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;
Index: man/curs_overlay.3x
Prereq:  1.45 
--- ncurses-6.5-20250111+/man/curs_overlay.3x	2024-05-25 20:10:58.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_overlay.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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),
Index: man/curs_pad.3x
Prereq:  1.69 
--- ncurses-6.5-20250111+/man/curs_pad.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_pad.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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 @@
 .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:
-.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.
+.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
+.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.
-.bP
-Solaris \fI\%xcurses\fP checks whether a window is a pad in
-\fB\%wnoutrefresh\fP,
-returning \fBERR\fP in that case.
+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
+.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.
-.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.
+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
+.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.
-.PP
-This implementation
-.bP
-sets a flag in the \fI\%WINDOW\fP structure
-for \fB\%newpad\fP and \fB\%subpad\fP,
+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
+.IR \%ncurses ":"
+.bP
+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),
Index: man/curs_printw.3x
Prereq:  1.53 
--- ncurses-6.5-20250111+/man/curs_printw.3x	2024-04-20 19:18:18.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_printw.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 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
Index: man/curs_refresh.3x
Prereq:  1.52 
--- ncurses-6.5-20250111+/man/curs_refresh.3x	2024-09-14 20:06:50.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_refresh.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 .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).
Index: man/curs_scanw.3x
Prereq:  1.53 
--- ncurses-6.5-20250111+/man/curs_scanw.3x	2024-04-20 19:18:18.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_scanw.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 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
Index: man/curs_scr_dump.3x
Prereq:  1.51 
--- ncurses-6.5-20250111+/man/curs_scr_dump.3x	2024-12-28 21:19:39.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_scr_dump.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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).
Index: man/curs_scroll.3x
Prereq:  1.49 
--- ncurses-6.5-20250111+/man/curs_scroll.3x	2024-09-22 14:08:11.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_scroll.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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,
Index: man/curs_slk.3x
Prereq:  1.78 
--- ncurses-6.5-20250111+/man/curs_slk.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_slk.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 \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 @@
 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 @@
 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,
Index: man/curs_sp_funcs.3x
Prereq:  1.51 
--- ncurses-6.5-20250111+/man/curs_sp_funcs.3x	2024-05-11 20:39:53.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_sp_funcs.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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);
Index: man/curs_termattrs.3x
Prereq:  1.44 
--- ncurses-6.5-20250111+/man/curs_termattrs.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_termattrs.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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),
Index: man/curs_termcap.3x
Prereq:  1.95 
--- ncurses-6.5-20250111+/man/curs_termcap.3x	2024-12-28 21:28:49.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_termcap.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 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 @@
 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
Index: man/curs_terminfo.3x
Prereq:  1.151 
--- ncurses-6.5-20250111+/man/curs_terminfo.3x	2024-12-28 21:32:56.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_terminfo.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 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 @@
 .B ERR
 is returned,
 examine
-.I errret:
+.IR errret "."
 .RS
 .TP 5
 .B 1
@@ -313,7 +315,7 @@
 .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 @@
 \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 @@
 .\" ********************************************************************
 .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 @@
 .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 @@
 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 @@
 with
 .B \%vid_attr
 and
-.BR \%vid_puts .
+.BR \%vid_puts "."
 .PP
 X/Open Curses reserves the
 .I opts
@@ -544,24 +546,29 @@
 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 @@
 .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 @@
 .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 @@
 .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 @@
 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 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 .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 @@
 .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 @@
 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 @@
 \*(``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 @@
 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 @@
 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 @@
 .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 @@
 .\" 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 @@
 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 @@
 .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 @@
 (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,
Index: man/curs_touch.3x
Prereq:  1.53 
--- ncurses-6.5-20250111+/man/curs_touch.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_touch.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 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),
Index: man/curs_trace.3x
Prereq:  1.52 
--- ncurses-6.5-20250111+/man/curs_trace.3x	2024-12-28 21:18:35.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_trace.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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
Index: man/curs_util.3x
Prereq:  1.122 
--- ncurses-6.5-20250111+/man/curs_util.3x	2024-12-28 21:51:21.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_util.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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.
+(character code 127)
+is represented as
+.BR \*^? .
 .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.
-.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
-with the character parameter are ignored.
+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
+.B \%wunctrl
+returns a null-terminated wide-character string printably representing
+the
+.I curses
+complex character
+.IR wch .
+.PP
+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 @@
 \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 @@
 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 @@
 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 @@
 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 "."
Index: man/curs_variables.3x
Prereq:  1.53 
--- ncurses-6.5-20250111+/man/curs_variables.3x	2024-09-21 18:01:56.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_variables.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 \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 @@
 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 @@
 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 @@
 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 @@
 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),
Index: man/curs_window.3x
Prereq:  1.57 
--- ncurses-6.5-20250111+/man/curs_window.3x	2024-12-28 21:51:45.000000000 +0000
+++ ncurses-6.5-20250118/man/curs_window.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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
-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
-.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
-returns
-.B ERR
-if the window pointer is null.
-.TP 5
-\fBsubwin\fP
-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
-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.
+if
+.I win
+is a null pointer.
+.bP
+.B \%mvderwin
+returns
+.B ERR
+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
+.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 any of its arguments is negative.
+.bP
+.B \%subwin
+returns
+.B ERR
+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
+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 ","
Index: man/form_field_opts.3x
Prereq:  1.44 
--- ncurses-6.5-20250111+/man/form_field_opts.3x	2024-03-16 15:35:01.000000000 +0000
+++ ncurses-6.5-20250118/man/form_field_opts.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 \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.
Index: man/form_field_validation.3x
Prereq:  1.55 
--- ncurses-6.5-20250111+/man/form_field_validation.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/form_field_validation.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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
Index: man/form_fieldtype.3x
Prereq:  1.48 
--- ncurses-6.5-20250111+/man/form_fieldtype.3x	2024-12-28 21:26:21.000000000 +0000
+++ ncurses-6.5-20250118/man/form_fieldtype.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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:
Index: man/form_opts.3x
Prereq:  1.34 
--- ncurses-6.5-20250111+/man/form_opts.3x	2024-03-16 15:35:01.000000000 +0000
+++ ncurses-6.5-20250118/man/form_opts.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 \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.
Index: man/infocmp.1m
Prereq:  1.117 
--- ncurses-6.5-20250111+/man/infocmp.1m	2024-12-28 21:36:19.000000000 +0000
+++ ncurses-6.5-20250118/man/infocmp.1m	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 .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
Index: man/infotocap.1m
Prereq:  1.44 
--- ncurses-6.5-20250111+/man/infotocap.1m	2024-07-27 19:43:16.000000000 +0000
+++ ncurses-6.5-20250118/man/infotocap.1m	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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
Index: man/man_db.renames.in
Prereq:  1.79 
--- ncurses-6.5-20250111+/man/man_db.renames.in	2024-12-28 21:30:24.000000000 +0000
+++ ncurses-6.5-20250118/man/man_db.renames.in	2025-01-19 01:00:28.000000000 +0000
@@ -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 @@
 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 @@
 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 @@
 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
Index: man/manhtml.aliases
Prereq:  1.42 
--- ncurses-6.5-20250111+/man/manhtml.aliases	2024-12-28 21:50:30.000000000 +0000
+++ ncurses-6.5-20250118/man/manhtml.aliases	2025-01-19 01:13:04.000000000 +0000
@@ -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 @@
 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 @@
 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)
Index: man/menu_opts.3x
Prereq:  1.35 
--- ncurses-6.5-20250111+/man/menu_opts.3x	2024-03-16 15:35:01.000000000 +0000
+++ ncurses-6.5-20250118/man/menu_opts.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 \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.
Index: man/mitem_opts.3x
Prereq:  1.33 
--- ncurses-6.5-20250111+/man/mitem_opts.3x	2024-03-16 15:35:01.000000000 +0000
+++ ncurses-6.5-20250118/man/mitem_opts.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 \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.
Index: man/ncurses.3x
Prereq:  1.236 
--- ncurses-6.5-20250111+/man/ncurses.3x	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/ncurses.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 .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 @@
 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 @@
 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
Index: man/new_pair.3x
Prereq:  1.46 
--- ncurses-6.5-20250111+/man/new_pair.3x	2024-03-16 15:35:01.000000000 +0000
+++ ncurses-6.5-20250118/man/new_pair.3x	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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 @@
 .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
Index: man/scr_dump.5
Prereq:  1.46 
--- ncurses-6.5-20250111+/man/scr_dump.5	2024-03-23 20:42:29.000000000 +0000
+++ ncurses-6.5-20250118/man/scr_dump.5	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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
Index: man/tabs.1
Prereq:  1.65 
--- ncurses-6.5-20250111+/man/tabs.1	2024-09-21 18:04:07.000000000 +0000
+++ ncurses-6.5-20250118/man/tabs.1	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 .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 @@
 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
Index: man/terminfo.tail
Prereq:  1.154 
--- ncurses-6.5-20250111+/man/terminfo.tail	2024-12-28 21:21:36.000000000 +0000
+++ ncurses-6.5-20250118/man/terminfo.tail	2025-01-19 00:51:10.000000000 +0000
@@ -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 @@
 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 @@
 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
Index: man/tic.1m
Prereq:  1.113 
--- ncurses-6.5-20250111+/man/tic.1m	2024-09-14 20:06:50.000000000 +0000
+++ ncurses-6.5-20250118/man/tic.1m	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
 \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
Index: man/tput.1
Prereq:  1.122 
--- ncurses-6.5-20250111+/man/tput.1	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/tput.1	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
 .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 @@
 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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 .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 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 .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 @@
 (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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 .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 @@
 .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 @@
 .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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 .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 @@
 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 @@
 .\" 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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"
Index: man/tset.1
Prereq:  1.90 
--- ncurses-6.5-20250111+/man/tset.1	2024-12-28 21:27:26.000000000 +0000
+++ ncurses-6.5-20250118/man/tset.1	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
 .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 @@
 .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
Index: man/wresize.3x
Prereq:  1.44 
--- ncurses-6.5-20250111+/man/wresize.3x	2024-12-28 21:16:46.000000000 +0000
+++ ncurses-6.5-20250118/man/wresize.3x	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
 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
Index: ncurses/base/lib_color.c
Prereq:  1.154 
--- ncurses-6.5-20250111+/ncurses/base/lib_color.c	2024-12-14 23:49:54.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/base/lib_color.c	2025-01-18 14:47:35.000000000 +0000
@@ -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 @@
 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);
 
Index: ncurses/base/lib_dft_fgbg.c
Prereq:  1.32 
--- ncurses-6.5-20250111+/ncurses/base/lib_dft_fgbg.c	2024-12-07 20:00:48.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/base/lib_dft_fgbg.c	2025-01-18 14:47:35.000000000 +0000
@@ -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 @@
 	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) {
Index: ncurses/base/lib_getstr.c
Prereq:  1.40 
--- ncurses-6.5-20250111+/ncurses/base/lib_getstr.c	2024-07-27 19:22:23.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/base/lib_getstr.c	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
     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 @@
     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)
Index: ncurses/base/lib_mouse.c
Prereq:  1.203 
--- ncurses-6.5-20250111+/ncurses/base/lib_mouse.c	2024-12-07 17:40:33.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/base/lib_mouse.c	2025-01-18 15:01:47.000000000 +0000
@@ -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 @@
 {
     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 @@
 	    }
 	}
     } else {
-	int code = tigetnum("XM");
+	int code = tigetnum(UserCap(XM));
 	switch (code) {
 #ifdef EXP_XTERM_1005
 	case 1005:
Index: ncurses/curses.priv.h
Prereq:  1.699 
--- ncurses-6.5-20250111+/ncurses/curses.priv.h	2025-01-12 00:41:56.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/curses.priv.h	2025-01-18 14:41:58.000000000 +0000
@@ -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
  *
@@ -368,6 +368,12 @@
 #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
  */
 
Index: ncurses/tinfo/captoinfo.c
Prereq:  1.105 
--- ncurses-6.5-20250111+/ncurses/tinfo/captoinfo.c	2024-12-07 21:12:53.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tinfo/captoinfo.c	2025-01-12 10:51:43.000000000 +0000
@@ -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 @@
 	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);
Index: ncurses/tinfo/lib_setup.c
Prereq:  1.248 
--- ncurses-6.5-20250111+/ncurses/tinfo/lib_setup.c	2024-12-15 00:12:19.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tinfo/lib_setup.c	2025-01-18 14:47:35.000000000 +0000
@@ -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 @@
     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")) {
Index: ncurses/tinfo/lib_tparm.c
Prereq:  1.155 
--- ncurses-6.5-20250111+/ncurses/tinfo/lib_tparm.c	2024-12-07 18:26:59.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tinfo/lib_tparm.c	2025-01-18 14:47:35.000000000 +0000
@@ -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 @@
 	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 @@
 	    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 */
 		}
Index: ncurses/tinfo/tinfo_driver.c
Prereq:  1.77 
--- ncurses-6.5-20250111+/ncurses/tinfo/tinfo_driver.c	2024-12-15 00:23:20.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tinfo/tinfo_driver.c	2025-01-18 14:47:35.000000000 +0000
@@ -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 @@
 #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 @@
 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%;";
 }
Index: ncurses/tty/hardscroll.c
Prereq:  1.59 
--- ncurses-6.5-20250111+/ncurses/tty/hardscroll.c	2024-12-07 20:06:49.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tty/hardscroll.c	2025-01-12 10:51:43.000000000 +0000
@@ -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 @@
 
 #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 @@
 	do {
 	    oldnums[n++] = atoi(st);
 	} while
-	    ((st = strtok((char *) NULL, " ")) != 0);
+	    ((st = strtok((char *) NULL, " ")) != NULL);
 
 	/* display it */
 	(void) fputs("Initial input:\n", stderr);
Index: ncurses/tty/hashmap.c
Prereq:  1.73 
--- ncurses-6.5-20250111+/ncurses/tty/hashmap.c	2024-12-07 17:18:07.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tty/hashmap.c	2025-01-12 10:51:43.000000000 +0000
@@ -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 @@
 #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 @@
 	    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 */
Index: ncurses/tty/lib_mvcur.c
Prereq:  1.163 
--- ncurses-6.5-20250111+/ncurses/tty/lib_mvcur.c	2024-12-15 00:04:06.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/tty/lib_mvcur.c	2025-01-12 10:51:43.000000000 +0000
@@ -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 @@
   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 @@
 
 	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 @@
 	} 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) {
Index: ncurses/widechar/lib_add_wch.c
Prereq:  1.20 
--- ncurses-6.5-20250111+/ncurses/widechar/lib_add_wch.c	2024-12-07 18:00:11.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/widechar/lib_add_wch.c	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
 {
     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)));
 
Index: ncurses/widechar/lib_inwstr.c
Prereq:  1.12 
--- ncurses-6.5-20250111+/ncurses/widechar/lib_inwstr.c	2024-12-07 18:03:14.000000000 +0000
+++ ncurses-6.5-20250118/ncurses/widechar/lib_inwstr.c	2025-01-19 00:51:54.000000000 +0000
@@ -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 @@
 
 	    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 @@
     }
     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);
-}
Index: package/debian-mingw/changelog
--- ncurses-6.5-20250111+/package/debian-mingw/changelog	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/debian-mingw/changelog	2025-01-12 11:23:10.000000000 +0000
@@ -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
 
Index: package/debian-mingw64/changelog
--- ncurses-6.5-20250111+/package/debian-mingw64/changelog	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/debian-mingw64/changelog	2025-01-12 11:23:10.000000000 +0000
@@ -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
 
Index: package/debian/changelog
--- ncurses-6.5-20250111+/package/debian/changelog	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/debian/changelog	2025-01-12 11:23:10.000000000 +0000
@@ -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
 
Index: package/mingw-ncurses.nsi
Prereq:  1.684 
--- ncurses-6.5-20250111+/package/mingw-ncurses.nsi	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/mingw-ncurses.nsi	2025-01-12 11:23:10.000000000 +0000
@@ -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"
Index: package/mingw-ncurses.spec
--- ncurses-6.5-20250111+/package/mingw-ncurses.spec	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/mingw-ncurses.spec	2025-01-12 11:23:10.000000000 +0000
@@ -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/
Index: package/ncurses.spec
--- ncurses-6.5-20250111+/package/ncurses.spec	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/ncurses.spec	2025-01-12 11:23:10.000000000 +0000
@@ -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/
Index: package/ncursest.spec
--- ncurses-6.5-20250111+/package/ncursest.spec	2025-01-11 12:30:15.000000000 +0000
+++ ncurses-6.5-20250118/package/ncursest.spec	2025-01-12 11:23:10.000000000 +0000
@@ -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
Index: progs/clear_cmd.c
Prereq:  1.5 
--- ncurses-6.5-20250111+/progs/clear_cmd.c	2020-02-02 23:34:34.000000000 +0000
+++ ncurses-6.5-20250118/progs/clear_cmd.c	2025-01-18 14:51:58.000000000 +0000
@@ -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 @@
     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);
     }
Index: test/aclocal.m4
Prereq:  1.231 
--- ncurses-6.5-20250111+/test/aclocal.m4	2024-12-21 15:24:55.000000000 +0000
+++ ncurses-6.5-20250118/test/aclocal.m4	2025-01-12 18:41:15.000000000 +0000
@@ -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 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 @@
 	,[$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 @@
 			;;
 		esac
 
+		CF_REQUIRE_PKG($cf_ncuconfig_root)
 		CF_APPEND_CFLAGS($cf_pkg_cflags)
 		CF_ADD_LIBS($cf_pkg_libs)
 
@@ -3648,6 +3649,30 @@
 		-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 @@
 	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 @@
 	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_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 @@
 (ncurses*)
 	CF_NCURSES_CONFIG($cf_cv_screen)
 	;;
-(pdcurses)
+(pdcurses*)
 	CF_PDCURSES_X11
 	;;
 (*)
Index: test/configure
--- ncurses-6.5-20250111+/test/configure	2024-12-21 15:25:20.000000000 +0000
+++ ncurses-6.5-20250118/test/configure	2025-01-12 18:41:15.000000000 +0000
@@ -8816,6 +8816,20 @@
 			;;
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 			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 @@
 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 @@
 }
 _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 @@
 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 @@
 		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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 		# 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 
 }
 
-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 @@
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9586 "configure"
+#line 9600 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9607,16 +9621,16 @@
 }
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9823 "configure"
+#line 9837 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9844,16 +9858,16 @@
 }
 _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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 #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 @@
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10139 "configure"
+#line 10153 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10163,15 +10177,15 @@
 }
 _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 @@
 	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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 			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 @@
 }
 _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 @@
 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
 
 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 @@
 		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 @@
 }
 _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_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 @@
 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 @@
 }
 _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 @@
 			;;
 		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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 			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 @@
 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 @@
 }
 _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 @@
 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 @@
 		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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 		# 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 
 }
 
-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 @@
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11673 "configure"
+#line 11701 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11694,16 +11722,16 @@
 }
 _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 @@
 	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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 11910 "configure"
+#line 11938 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11931,16 +11959,16 @@
 }
 _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 @@
 		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 @@
 	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 @@
 }
 _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 @@
 		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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 #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 @@
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12226 "configure"
+#line 12254 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12250,15 +12278,15 @@
 }
 _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 @@
 	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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	# 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 			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 @@
 }
 _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 @@
 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
 
 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 @@
 		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 @@
 }
 _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 @@
 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 @@
   # 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 @@
   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 @@
 }
 _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 # $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 @@
   # 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 @@
     # 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
     # 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 @@
 }
 _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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   # 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 && "$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 @@
 			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 @@
 }
 _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 @@
 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 @@
 				(*)
 					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 @@
 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 @@
 
 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 @@
 
 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 @@
 			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 "$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 @@
 	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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 		;;
 	(*)
 # 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 		;;
 	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 @@
 }
 _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 @@
 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 @@
 			(*)
 				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 @@
 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 @@
 
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
-	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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
   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
 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 @@
 do
   # Extract the 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 @@
   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
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 #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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 	;;
 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 @@
 	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 @@
 
 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 @@
 	;;
 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 @@
 	;;
 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 @@
 	;;
 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 @@
 	;;
 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 @@
 	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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	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 @@
 	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 @@
 		;;
 	(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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 	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 @@
 	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 @@
 		;;
 	(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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 
 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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 	;;
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 		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 @@
 }
 _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 @@
 
 	# 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 @@
 
 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 @@
 		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 @@
 }
 _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 @@
 
 	# 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 @@
 				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 @@
 }
 _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 @@
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 			 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 @@
 		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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 
 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 @@
 
 # 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 	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 @@
 }
 _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 @@
 	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 @@
 	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 @@
   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 @@
 
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 	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 @@
 }
 _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 @@
 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 @@
 #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 @@
 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
 
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 
 	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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 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 @@
 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 @@
 }
 _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 @@
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21431 "configure"
+#line 21613 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21460,15 +21642,15 @@
 }
 _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 @@
 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 @@
 
 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 @@
   # 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 @@
   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 @@
 }
 _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 # $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 @@
   # 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 @@
     # 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 @@
 }
 _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 @@
 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 @@
 }
 _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 @@
 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 @@
     # 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 @@
 }
 _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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
     # 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 @@
 }
 _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 @@
 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 @@
   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 @@
 }
 _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 @@
 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 @@
   # 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 @@
   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 @@
 }
 _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 @@
 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
 			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
 			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
 			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 @@
 	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 @@
 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 @@
 			;;
 		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 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22909 "configure"
+#line 23091 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22921,26 +23103,26 @@
 }
 _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 @@
 }
 _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 @@
 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 @@
 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 @@
 # 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 @@
 		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 @@
 	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 @@
 		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 @@
 				([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 @@
 				([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
 
-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 @@
 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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
-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 @@
 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 @@
 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 @@
 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 @@
   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 @@
 }
 _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 @@
 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
 
-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 @@
 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 @@
 	;;
 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 @@
   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 @@
 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 @@
 	(*)
 		;;
 	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 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23817 "configure"
+#line 23999 "configure"
 #include "confdefs.h"
 
 int
@@ -23826,16 +24008,16 @@
 }
 _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 @@
 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 @@
 
 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 @@
   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
 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 @@
 		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 @@
 }
 _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 @@
 					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 @@
 
 	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 @@
 			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 @@
 
 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 @@
 			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 @@
 
 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 @@
 : "${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 @@
     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 @@
     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 @@
   "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,@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 @@
   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 "$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 "$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 @@
       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 @@
       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 @@
             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 @@
     $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 @@
   * )   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 "$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 "$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 @@
   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\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: test/parse_rgb.h
Prereq:  1.6 
--- ncurses-6.5-20250111+/test/parse_rgb.h	2024-10-05 19:26:24.000000000 +0000
+++ ncurses-6.5-20250118/test/parse_rgb.h	2025-01-18 15:03:33.000000000 +0000
@@ -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 @@
 	    ;
 	}
 
-	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;
Index: test/test.priv.h
Prereq:  1.220 
--- ncurses-6.5-20250111+/test/test.priv.h	2024-10-05 19:01:00.000000000 +0000
+++ ncurses-6.5-20250118/test/test.priv.h	2025-01-18 15:07:25.000000000 +0000
@@ -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
@@ -853,6 +853,12 @@
 #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.
  */
Index: test/test_mouse.c
Prereq:  1.35 
--- ncurses-6.5-20250111+/test/test_mouse.c	2024-11-30 18:46:48.000000000 +0000
+++ ncurses-6.5-20250118/test/test_mouse.c	2025-01-18 15:03:25.000000000 +0000
@@ -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 @@
 
     newterm(NULL, stdout, stdin);
     raw();
-    xtermcap = tigetstr("XM");
+    xtermcap = tigetstr(UserCap(XM));
     if (!VALID_STRING(xtermcap)) {
 	fprintf(stderr, "couldn't get XM terminfo");
 	return;