From 235aa9c4f39efed13a7b9a40d191f3a591095f75 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 20 Jan 2024 22:06:16 +0000 Subject: [PATCH] ncurses 6.4 - patch 20240120 + improve formatting/style of manpages (patches by Branden Robinson). + amend discussion of aliases in tput.1 + use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD + modify configure scripts/makefiles to omit KEY_RESIZE if the corresponding SIGWINCH feature is disabled. --- Ada95/aclocal.m4 | 8 +- Ada95/configure | 716 ++--- Ada95/gen/Makefile.in | 17 +- Ada95/gen/gen.c | 6 +- Ada95/gen/terminal_interface-curses.ads.m4 | 12 +- NEWS | 11 +- VERSION | 2 +- configure | 2758 +++++++++-------- configure.in | 15 +- dist.mk | 4 +- .../ada/terminal_interface-curses__ads.htm | 6 +- doc/html/man/form_hook.3x.html | 12 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/tabs.1.html | 107 +- doc/html/man/terminfo.5.html | 1315 ++++---- doc/html/man/toe.1m.html | 19 +- doc/html/man/tput.1.html | 235 +- include/Caps | 55 +- include/Caps.aix4 | 55 +- include/Caps.hpux11 | 55 +- include/Caps.keys | 56 +- include/Caps.osf1r5 | 37 +- include/Caps.uwin | 37 +- include/MKkey_defs.sh | 8 +- include/curses.events | 2 +- include/curses.h.in | 18 +- man/form_hook.3x | 6 +- man/tabs.1 | 146 +- man/toe.1m | 16 +- man/tput.1 | 45 +- misc/terminfo.src | 1440 ++++----- ncurses/Makefile.in | 8 +- ncurses/tinfo/MKkeys_list.sh | 7 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- test/aclocal.m4 | 24 +- test/configure | 1034 +++--- test/demo_defkey.c | 10 +- 43 files changed, 4216 insertions(+), 4110 deletions(-) diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 50df70fb..2ca7a95f 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 Thomas E. Dickey * dnl Copyright 2010-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.207 2023/12/04 00:09:59 tom Exp $ +dnl $Id: aclocal.m4,v 1.209 2024/01/19 18:06:12 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -3359,7 +3359,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 17 updated: 2023/01/05 18:54:02 +dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3389,7 +3389,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); diff --git a/Ada95/configure b/Ada95/configure index 27b6afa5..80aa515e 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.91 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20230903. +# Generated by Autoconf 2.52.20231210. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -823,7 +823,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20230903. Invocation command line was +generated by GNU Autoconf 2.52.20231210. Invocation command line was $ $0 $@ @@ -6187,7 +6187,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -6246,7 +6246,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -6296,7 +6296,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -6358,7 +6358,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -8901,7 +8901,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -8960,7 +8960,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -9010,7 +9010,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -9072,7 +9072,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -10987,7 +10987,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -11046,7 +11046,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -11096,7 +11096,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -11158,7 +11158,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -14571,7 +14571,7 @@ int main (void) { #ifndef exit - char *p = (char *) exit; (void) p; + (void) exit; #endif ; @@ -14896,25 +14896,28 @@ else #line 14896 "configure" #include "confdefs.h" #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14908: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14911: \$? = $ac_status" >&5 + echo "$as_me:14914: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14914: \"$ac_try\"") >&5 + { (eval echo "$as_me:14917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14917: \$? = $ac_status" >&5 + echo "$as_me:14920: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14923,29 +14926,32 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14926 "configure" +#line 14929 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14942: \$? = $ac_status" >&5 + echo "$as_me:14948: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14945: \"$ac_try\"") >&5 + { (eval echo "$as_me:14951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14948: \$? = $ac_status" >&5 + echo "$as_me:14954: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14956,7 +14962,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14959: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:14965: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -14970,34 +14976,36 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:14973: checking for fseeko" >&5 +echo "$as_me:14979: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14979 "configure" +#line 14985 "configure" #include "confdefs.h" #include + #include int main (void) { -return fseeko && fseeko (stdin, 0, 0); +int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko && my_fseeko (stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14991: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14999: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14994: \$? = $ac_status" >&5 + echo "$as_me:15002: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14997: \"$ac_try\"") >&5 + { (eval echo "$as_me:15005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15000: \$? = $ac_status" >&5 + echo "$as_me:15008: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -15007,7 +15015,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15010: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:15018: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -15046,14 +15054,14 @@ fi fi - echo "$as_me:15049: checking whether to use struct dirent64" >&5 + echo "$as_me:15057: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15056 "configure" +#line 15064 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -15080,16 +15088,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15083: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15086: \$? = $ac_status" >&5 + echo "$as_me:15094: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15089: \"$ac_try\"") >&5 + { (eval echo "$as_me:15097: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15092: \$? = $ac_status" >&5 + echo "$as_me:15100: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -15100,7 +15108,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15103: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:15111: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -15110,7 +15118,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:15113: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:15121: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -15120,7 +15128,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:15123: result: $with_rcs_ids" >&5 +echo "$as_me:15131: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -15130,7 +15138,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:15133: checking if you want to build with function extensions" >&5 +echo "$as_me:15141: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -15140,7 +15148,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:15143: result: $with_ext_funcs" >&5 +echo "$as_me:15151: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -15158,7 +15166,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:15161: checking for extended use of const keyword" >&5 +echo "$as_me:15169: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -15168,7 +15176,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:15171: result: $with_ext_const" >&5 +echo "$as_me:15179: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -15178,7 +15186,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:15181: checking if you want all development code" >&5 +echo "$as_me:15189: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -15188,7 +15196,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:15191: result: $with_develop" >&5 +echo "$as_me:15199: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -15197,7 +15205,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:15200: checking if you want to link with the pthread library" >&5 +echo "$as_me:15208: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -15207,27 +15215,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:15210: result: $with_pthread" >&5 +echo "$as_me:15218: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:15214: checking for pthread.h" >&5 + echo "$as_me:15222: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15220 "configure" +#line 15228 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15224: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:15232: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15230: \$? = $ac_status" >&5 + echo "$as_me:15238: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15246,7 +15254,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15249: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:15257: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -15256,7 +15264,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:15259: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:15267: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -15277,7 +15285,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15280 "configure" +#line 15288 "configure" #include "confdefs.h" #include @@ -15294,16 +15302,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15297: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15305: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15300: \$? = $ac_status" >&5 + echo "$as_me:15308: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15303: \"$ac_try\"") >&5 + { (eval echo "$as_me:15311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15306: \$? = $ac_status" >&5 + echo "$as_me:15314: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -15313,7 +15321,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:15316: result: $with_pthread" >&5 + echo "$as_me:15324: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -15341,7 +15349,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:15344: error: Cannot link with pthread library" >&5 + { { echo "$as_me:15352: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -15350,7 +15358,7 @@ fi fi -echo "$as_me:15353: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:15361: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -15360,18 +15368,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:15363: result: $use_weak_symbols" >&5 +echo "$as_me:15371: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:15367: checking if $CC supports weak symbols" >&5 +echo "$as_me:15375: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15374 "configure" +#line 15382 "configure" #include "confdefs.h" #include @@ -15397,16 +15405,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15403: \$? = $ac_status" >&5 + echo "$as_me:15411: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15406: \"$ac_try\"") >&5 + { (eval echo "$as_me:15414: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15409: \$? = $ac_status" >&5 + echo "$as_me:15417: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -15417,7 +15425,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15420: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:15428: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -15446,13 +15454,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:15449: checking for _nc_TABSIZE" >&5 +echo "$as_me:15457: checking for _nc_TABSIZE" >&5 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15455 "configure" +#line 15463 "configure" #include "confdefs.h" #define _nc_TABSIZE autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15483,16 +15491,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15486: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15489: \$? = $ac_status" >&5 + echo "$as_me:15497: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15492: \"$ac_try\"") >&5 + { (eval echo "$as_me:15500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15495: \$? = $ac_status" >&5 + echo "$as_me:15503: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -15502,7 +15510,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15505: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:15513: result: $ac_cv_func__nc_TABSIZE" >&5 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 if test "$ac_cv_func__nc_TABSIZE" = yes; then assume_reentrant=yes @@ -15514,7 +15522,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:15517: checking if you want experimental reentrant code" >&5 +echo "$as_me:15525: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -15524,7 +15532,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:15527: result: $with_reentrant" >&5 +echo "$as_me:15535: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -15547,7 +15555,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:15550: checking for prefix used to wrap public variables" >&5 + echo "$as_me:15558: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -15557,7 +15565,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:15560: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:15568: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -15571,7 +15579,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:15574: checking if you want to see long compiling messages" >&5 +echo "$as_me:15582: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -15605,10 +15613,10 @@ else ECHO_CC='' fi; -echo "$as_me:15608: result: $enableval" >&5 +echo "$as_me:15616: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:15611: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:15619: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -15625,17 +15633,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:15628: result: $enable_stdnoreturn" >&5 +echo "$as_me:15636: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:15632: checking for C11 _Noreturn feature" >&5 +echo "$as_me:15640: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15638 "configure" +#line 15646 "configure" #include "confdefs.h" $ac_includes_default @@ -15651,16 +15659,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15654: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15657: \$? = $ac_status" >&5 + echo "$as_me:15665: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15660: \"$ac_try\"") >&5 + { (eval echo "$as_me:15668: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15663: \$? = $ac_status" >&5 + echo "$as_me:15671: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -15671,7 +15679,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15674: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:15682: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -15727,16 +15735,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:15730: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15738: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:15735: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15743: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15739: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15747: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -15775,16 +15783,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15778: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15786: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15783: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15791: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15787: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15795: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -15823,23 +15831,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15826: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15834: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15831: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15839: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15835: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15843: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:15842: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:15850: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -15856,7 +15864,7 @@ else enable_warnings=no fi; -echo "$as_me:15859: result: $enable_warnings" >&5 +echo "$as_me:15867: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -15880,7 +15888,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 15883 "configure" +#line 15891 "configure" #include "confdefs.h" #include @@ -15895,26 +15903,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15898: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15901: \$? = $ac_status" >&5 + echo "$as_me:15909: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15904: \"$ac_try\"") >&5 + { (eval echo "$as_me:15912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15907: \$? = $ac_status" >&5 + echo "$as_me:15915: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:15910: checking for X11/Xt const-feature" >&5 +echo "$as_me:15918: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15917 "configure" +#line 15925 "configure" #include "confdefs.h" #undef _CONST_X_STRING @@ -15932,16 +15940,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15935: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15943: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15938: \$? = $ac_status" >&5 + echo "$as_me:15946: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15941: \"$ac_try\"") >&5 + { (eval echo "$as_me:15949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15944: \$? = $ac_status" >&5 + echo "$as_me:15952: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -15956,7 +15964,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15959: result: $cf_cv_const_x_string" >&5 +echo "$as_me:15967: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -15985,7 +15993,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:16012: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -16017,12 +16025,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16020: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16023: \$? = $ac_status" >&5 + echo "$as_me:16031: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16025: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16033: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -16030,7 +16038,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:16033: checking for $CC warning options..." >&5 + { echo "$as_me:16041: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -16053,12 +16061,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16056: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16064: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16059: \$? = $ac_status" >&5 + echo "$as_me:16067: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16061: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16069: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -16066,7 +16074,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:16069: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16077: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16076,7 +16084,7 @@ echo "${as_me:-configure}:16069: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:16079: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16087: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16109,10 +16117,10 @@ cat > conftest.i <&5 + { echo "$as_me:16120: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -16162,12 +16170,12 @@ EOF ;; esac - if { (eval echo "$as_me:16165: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16168: \$? = $ac_status" >&5 + echo "$as_me:16176: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16170: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:16178: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -16235,7 +16243,7 @@ if test "x$enable_warnings" = "xyes"; then fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:16238: checking if you want to enable runtime assertions" >&5 +echo "$as_me:16246: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -16245,7 +16253,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:16248: result: $with_assertions" >&5 +echo "$as_me:16256: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -16298,7 +16306,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:16301: checking whether to add trace feature to all models" >&5 +echo "$as_me:16309: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -16308,7 +16316,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:16311: result: $cf_with_trace" >&5 +echo "$as_me:16319: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -16416,7 +16424,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:16419: checking if we want to use GNAT projects" >&5 +echo "$as_me:16427: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -16433,21 +16441,21 @@ else enable_gnat_projects=yes fi; -echo "$as_me:16436: result: $enable_gnat_projects" >&5 +echo "$as_me:16444: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. case $cf_cv_system_name in (*mingw32*) -echo "$as_me:16443: checking if ssp library is needed" >&5 +echo "$as_me:16451: checking if ssp library is needed" >&5 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 if test "${cf_cv_need_libssp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16450 "configure" +#line 16458 "configure" #include "confdefs.h" #include @@ -16464,16 +16472,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16467: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16475: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16470: \$? = $ac_status" >&5 + echo "$as_me:16478: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16473: \"$ac_try\"") >&5 + { (eval echo "$as_me:16481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16476: \$? = $ac_status" >&5 + echo "$as_me:16484: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=no else @@ -16483,7 +16491,7 @@ cat "conftest.$ac_ext" >&5 cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" cat >"conftest.$ac_ext" <<_ACEOF -#line 16486 "configure" +#line 16494 "configure" #include "confdefs.h" #include @@ -16500,16 +16508,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16503: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16506: \$? = $ac_status" >&5 + echo "$as_me:16514: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16509: \"$ac_try\"") >&5 + { (eval echo "$as_me:16517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16512: \$? = $ac_status" >&5 + echo "$as_me:16520: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=yes else @@ -16523,7 +16531,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16526: result: $cf_cv_need_libssp" >&5 +echo "$as_me:16534: result: $cf_cv_need_libssp" >&5 echo "${ECHO_T}$cf_cv_need_libssp" >&6 if test "x$cf_cv_need_libssp" = xyes @@ -16550,14 +16558,14 @@ fi ;; (*) -echo "$as_me:16553: checking for clock_gettime" >&5 +echo "$as_me:16561: checking for clock_gettime" >&5 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 if test "${cf_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16560 "configure" +#line 16568 "configure" #include "confdefs.h" #include int @@ -16570,16 +16578,16 @@ struct timespec ts; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16573: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16581: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16576: \$? = $ac_status" >&5 + echo "$as_me:16584: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16579: \"$ac_try\"") >&5 + { (eval echo "$as_me:16587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16582: \$? = $ac_status" >&5 + echo "$as_me:16590: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -16590,7 +16598,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16593: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:16601: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 if test "$cf_cv_func_clock_gettime" = yes @@ -16601,13 +16609,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:16604: checking for gettimeofday" >&5 +echo "$as_me:16612: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16610 "configure" +#line 16618 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16638,16 +16646,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16649: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16644: \$? = $ac_status" >&5 + echo "$as_me:16652: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16647: \"$ac_try\"") >&5 + { (eval echo "$as_me:16655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16650: \$? = $ac_status" >&5 + echo "$as_me:16658: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -16657,7 +16665,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16660: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:16668: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -16667,7 +16675,7 @@ EOF else -echo "$as_me:16670: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:16678: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16675,7 +16683,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16678 "configure" +#line 16686 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16684,7 +16692,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettimeofday (); +char gettimeofday (void); int main (void) { @@ -16694,16 +16702,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16697: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16705: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16700: \$? = $ac_status" >&5 + echo "$as_me:16708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16703: \"$ac_try\"") >&5 + { (eval echo "$as_me:16711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16706: \$? = $ac_status" >&5 + echo "$as_me:16714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -16714,7 +16722,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16717: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:16725: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -16747,13 +16755,13 @@ fi esac ### Checks for header files. -echo "$as_me:16750: checking for signed char" >&5 +echo "$as_me:16758: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16756 "configure" +#line 16764 "configure" #include "confdefs.h" $ac_includes_default int @@ -16768,16 +16776,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16771: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16774: \$? = $ac_status" >&5 + echo "$as_me:16782: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16777: \"$ac_try\"") >&5 + { (eval echo "$as_me:16785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16780: \$? = $ac_status" >&5 + echo "$as_me:16788: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -16787,10 +16795,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16790: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:16798: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:16793: checking size of signed char" >&5 +echo "$as_me:16801: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16799,7 +16807,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 16802 "configure" +#line 16810 "configure" #include "confdefs.h" $ac_includes_default int @@ -16811,21 +16819,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16817: \$? = $ac_status" >&5 + echo "$as_me:16825: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16820: \"$ac_try\"") >&5 + { (eval echo "$as_me:16828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16823: \$? = $ac_status" >&5 + echo "$as_me:16831: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16828 "configure" +#line 16836 "configure" #include "confdefs.h" $ac_includes_default int @@ -16837,16 +16845,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16840: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16843: \$? = $ac_status" >&5 + echo "$as_me:16851: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16846: \"$ac_try\"") >&5 + { (eval echo "$as_me:16854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16849: \$? = $ac_status" >&5 + echo "$as_me:16857: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -16862,7 +16870,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16865 "configure" +#line 16873 "configure" #include "confdefs.h" $ac_includes_default int @@ -16874,16 +16882,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16880: \$? = $ac_status" >&5 + echo "$as_me:16888: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16883: \"$ac_try\"") >&5 + { (eval echo "$as_me:16891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16886: \$? = $ac_status" >&5 + echo "$as_me:16894: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -16899,7 +16907,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 16902 "configure" +#line 16910 "configure" #include "confdefs.h" $ac_includes_default int @@ -16911,16 +16919,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16917: \$? = $ac_status" >&5 + echo "$as_me:16925: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16920: \"$ac_try\"") >&5 + { (eval echo "$as_me:16928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16923: \$? = $ac_status" >&5 + echo "$as_me:16931: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -16933,12 +16941,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:16936: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:16944: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 16941 "configure" +#line 16949 "configure" #include "confdefs.h" $ac_includes_default int @@ -16954,15 +16962,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16957: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16960: \$? = $ac_status" >&5 + echo "$as_me:16968: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16962: \"$ac_try\"") >&5 + { (eval echo "$as_me:16970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16965: \$? = $ac_status" >&5 + echo "$as_me:16973: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -16978,7 +16986,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:16981: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:16989: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:16998: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16996 "configure" +#line 17004 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -17008,16 +17016,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17019: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17014: \$? = $ac_status" >&5 + echo "$as_me:17022: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17017: \"$ac_try\"") >&5 + { (eval echo "$as_me:17025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17020: \$? = $ac_status" >&5 + echo "$as_me:17028: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -17027,7 +17035,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:17038: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:17051: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17048,7 +17056,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17051 "configure" +#line 17059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17057,7 +17065,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -17067,16 +17075,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17070: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17078: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17073: \$? = $ac_status" >&5 + echo "$as_me:17081: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17076: \"$ac_try\"") >&5 + { (eval echo "$as_me:17084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17079: \$? = $ac_status" >&5 + echo "$as_me:17087: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -17087,14 +17095,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17090: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:17098: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:17097: checking for opendir in -lx" >&5 + echo "$as_me:17105: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17102,7 +17110,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17105 "configure" +#line 17113 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17111,7 +17119,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -17121,16 +17129,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17124: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17127: \$? = $ac_status" >&5 + echo "$as_me:17135: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17130: \"$ac_try\"") >&5 + { (eval echo "$as_me:17138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17133: \$? = $ac_status" >&5 + echo "$as_me:17141: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -17141,7 +17149,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17144: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:17152: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" @@ -17149,13 +17157,13 @@ fi fi -echo "$as_me:17152: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:17160: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17158 "configure" +#line 17166 "configure" #include "confdefs.h" #include #include @@ -17171,16 +17179,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17174: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17177: \$? = $ac_status" >&5 + echo "$as_me:17185: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17180: \"$ac_try\"") >&5 + { (eval echo "$as_me:17188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17183: \$? = $ac_status" >&5 + echo "$as_me:17191: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -17190,7 +17198,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17193: result: $ac_cv_header_time" >&5 +echo "$as_me:17201: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -17208,13 +17216,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:17211: checking for an ANSI C-conforming const" >&5 +echo "$as_me:17219: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17217 "configure" +#line 17225 "configure" #include "confdefs.h" int @@ -17224,13 +17232,13 @@ main (void) #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset x; (void)x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; - static struct point const zero = {0,0}; + static struct point const zero = {0,0}; (void)zero; /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant @@ -17246,16 +17254,19 @@ main (void) char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + (void)s; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; const int *foo = &x[0]; ++foo; + (void)foo; } { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ typedef const int *iptr; iptr p = 0; ++p; + (void)p; } { /* AIX XL C 1.02.0.0 rejects this saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ @@ -17264,6 +17275,7 @@ main (void) } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + (void)foo; } #endif @@ -17272,16 +17284,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17275: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17278: \$? = $ac_status" >&5 + echo "$as_me:17290: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17281: \"$ac_try\"") >&5 + { (eval echo "$as_me:17293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17284: \$? = $ac_status" >&5 + echo "$as_me:17296: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -17291,7 +17303,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17294: result: $ac_cv_c_const" >&5 +echo "$as_me:17306: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -17303,7 +17315,7 @@ fi ### Checks for external-data -echo "$as_me:17306: checking if data-only library module links" >&5 +echo "$as_me:17318: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17311,20 +17323,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17329: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17320: \$? = $ac_status" >&5 + echo "$as_me:17332: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17356: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17347: \$? = $ac_status" >&5 + echo "$as_me:17359: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -17357,7 +17369,7 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 17360 "configure" +#line 17372 "configure" #include "confdefs.h" extern int testfunc(void); @@ -17368,15 +17380,15 @@ else _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17383: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17374: \$? = $ac_status" >&5 + echo "$as_me:17386: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17376: \"$ac_try\"") >&5 + { (eval echo "$as_me:17388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17379: \$? = $ac_status" >&5 + echo "$as_me:17391: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -17391,7 +17403,7 @@ fi fi -echo "$as_me:17394: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17406: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17410,23 +17422,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17413: checking for $ac_header" >&5 +echo "$as_me:17425: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17419 "configure" +#line 17431 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17423: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:17435: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17429: \$? = $ac_status" >&5 + echo "$as_me:17441: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17445,7 +17457,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17448: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:17460: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:17470: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17466,7 +17478,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17469 "configure" +#line 17481 "configure" #include "confdefs.h" $ac_includes_default @@ -17501,15 +17513,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17504: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17516: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17507: \$? = $ac_status" >&5 + echo "$as_me:17519: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17509: \"$ac_try\"") >&5 + { (eval echo "$as_me:17521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17512: \$? = $ac_status" >&5 + echo "$as_me:17524: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -17524,16 +17536,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:17527: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:17539: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:17530: checking for mkstemp" >&5 + echo "$as_me:17542: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17536 "configure" +#line 17548 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17564,16 +17576,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17567: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17579: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17570: \$? = $ac_status" >&5 + echo "$as_me:17582: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17573: \"$ac_try\"") >&5 + { (eval echo "$as_me:17585: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17576: \$? = $ac_status" >&5 + echo "$as_me:17588: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -17583,7 +17595,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17586: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:17598: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -17612,7 +17624,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:17615: checking for $ac_word" >&5 +echo "$as_me:17627: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17629,7 +17641,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:17632: found $ac_dir/$ac_word" >&5 + echo "$as_me:17644: found $ac_dir/$ac_word" >&5 break fi done @@ -17641,10 +17653,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:17644: result: $cf_TEMP_gnat" >&5 + echo "$as_me:17656: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:17647: result: no" >&5 + echo "$as_me:17659: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17654,7 +17666,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:17657: checking for $cf_prog_gnat version" >&5 +echo "$as_me:17669: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17665,7 +17677,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:17668: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17680: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -17694,7 +17706,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:17697: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:17709: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test "$cf_gprconfig" = C then @@ -17713,10 +17725,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:17716: result: $cf_gprconfig_value" >&5 + echo "$as_me:17728: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:17719: result: missing" >&5 + echo "$as_me:17731: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -17729,7 +17741,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:17732: checking for gnat version" >&5 +echo "$as_me:17744: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17740,7 +17752,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:17743: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17755: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -17749,7 +17761,7 @@ case "$cf_cv_gnat_version" in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:17752: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:17764: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -17757,7 +17769,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:17760: checking for $ac_word" >&5 +echo "$as_me:17772: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17772,7 +17784,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:17775: found $ac_dir/$ac_word" >&5 +echo "$as_me:17787: found $ac_dir/$ac_word" >&5 break done @@ -17781,20 +17793,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:17784: result: $M4_exists" >&5 + echo "$as_me:17796: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:17787: result: no" >&5 + echo "$as_me:17799: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:17793: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:17805: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17797: checking if GNAT works" >&5 + echo "$as_me:17809: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf ./conftest* ./*~conftest* @@ -17822,7 +17834,7 @@ else fi rm -rf ./conftest* ./*~conftest* - echo "$as_me:17825: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:17837: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -17832,7 +17844,7 @@ fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17835: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:17847: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -17849,10 +17861,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:17852: result: $ADAFLAGS" >&5 + echo "$as_me:17864: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:17855: checking if GNATPREP supports -T option" >&5 +echo "$as_me:17867: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17862,11 +17874,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:17865: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:17877: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:17869: checking if GNAT supports generics" >&5 +echo "$as_me:17881: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -17876,7 +17888,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:17879: result: $cf_gnat_generics" >&5 +echo "$as_me:17891: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -17888,7 +17900,7 @@ else cf_generic_objects= fi -echo "$as_me:17891: checking if GNAT supports SIGINT" >&5 +echo "$as_me:17903: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17936,7 +17948,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:17939: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:17951: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -17949,7 +17961,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:17952: checking if GNAT supports project files" >&5 +echo "$as_me:17964: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -18012,15 +18024,15 @@ CF_EOF esac ;; esac -echo "$as_me:18015: result: $cf_gnat_projects" >&5 +echo "$as_me:18027: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:18021: checking if GNAT supports libraries" >&5 + echo "$as_me:18033: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:18023: result: $cf_gnat_libraries" >&5 + echo "$as_me:18035: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -18040,7 +18052,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:18043: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:18055: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -18052,7 +18064,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:18055: checking for Ada95 compiler" >&5 +echo "$as_me:18067: checking for Ada95 compiler" >&5 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -18063,12 +18075,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:18066: result: $cf_ada_compiler" >&5 +echo "$as_me:18078: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:18071: checking for Ada95 include directory" >&5 +echo "$as_me:18083: checking for Ada95 include directory" >&5 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -18104,7 +18116,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:18107: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18119: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18113,10 +18125,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:18116: result: $ADA_INCLUDE" >&5 +echo "$as_me:18128: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:18119: checking for Ada95 object directory" >&5 +echo "$as_me:18131: checking for Ada95 object directory" >&5 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -18152,7 +18164,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:18155: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18167: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18161,10 +18173,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:18164: result: $ADA_OBJECTS" >&5 +echo "$as_me:18176: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:18167: checking whether to build an Ada95 shared library" >&5 +echo "$as_me:18179: checking whether to build an Ada95 shared library" >&5 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -18185,11 +18197,11 @@ then fi fi -echo "$as_me:18188: result: $with_ada_sharedlib" >&5 +echo "$as_me:18200: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$cf_ada_sharedlib_warn" != xno then - { echo "$as_me:18192: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 + { echo "$as_me:18204: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} fi @@ -18207,7 +18219,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:18210: checking for Ada95 curses library name" >&5 +echo "$as_me:18222: checking for Ada95 curses library name" >&5 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -18223,16 +18235,16 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:18226: result: $ADA_LIBNAME" >&5 +echo "$as_me:18238: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 else - { { echo "$as_me:18230: error: No usable Ada compiler found" >&5 + { { echo "$as_me:18242: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:18235: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:18247: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -18272,7 +18284,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:18275: checking default library suffix" >&5 +echo "$as_me:18287: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18283,10 +18295,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:18286: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:18298: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:18289: checking default library-dependency suffix" >&5 +echo "$as_me:18301: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -18369,10 +18381,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:18372: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:18384: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:18375: checking default object directory" >&5 +echo "$as_me:18387: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18388,7 +18400,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:18391: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:18403: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -18461,7 +18473,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -18530,7 +18542,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:18533: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18545: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -18666,7 +18678,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18714: error: ambiguous option: $1 + { { echo "$as_me:18726: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -18730,7 +18742,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18733: error: unrecognized option: $1 + -*) { { echo "$as_me:18745: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -18749,7 +18761,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20230903, executed with +This file was extended by $as_me 2.52.20231210, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -18805,7 +18817,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:18808: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18820: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -19166,7 +19178,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:19169: creating $ac_file" >&5 + { echo "$as_me:19181: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -19184,7 +19196,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:19187: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19199: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -19197,7 +19209,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19200: error: cannot find input file: $f" >&5 + { { echo "$as_me:19212: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19213,7 +19225,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:19216: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19228: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -19222,7 +19234,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:19225: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19237: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -19267,7 +19279,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:19270: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:19282: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -19278,7 +19290,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:19281: WARNING: Some variables may not be substituted: + { echo "$as_me:19293: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -19327,7 +19339,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:19330: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19342: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -19338,7 +19350,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:19341: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19353: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19351,7 +19363,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19354: error: cannot find input file: $f" >&5 + { { echo "$as_me:19366: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19409,7 +19421,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f "$tmp"/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:19412: $ac_file is unchanged" >&5 + { echo "$as_me:19424: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 05331374..525ce998 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2019-2021,2022 Thomas E. Dickey # +# Copyright 2019-2022,2024 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -30,7 +30,7 @@ # Author: Juergen Pfeifer, 1996 # and: Thomas E. Dickey, 1997 # -# $Id: Makefile.in,v 1.101 2022/12/03 19:45:12 Nicolas.Boulenguez Exp $ +# $Id: Makefile.in,v 1.103 2024/01/19 16:51:56 tom Exp $ # .SUFFIXES: @@ -183,7 +183,8 @@ $(ADA_SRCDIR)/$(ABASE)_constants.ads: $(PROG_GENERATE) $(WRAPPER) "$(GENERATE) $@" ################################################################################ $(ADA_SRCDIR)/$(ABASE).ads: $(srcdir)/$(ABASE).ads.m4 \ - $(srcdir)/normal.m4 + $(srcdir)/normal.m4 \ + options.m4 $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \ $(srcdir)/$(ABASE).ads.m4 |\ $(DEL_ADAMODE) >$@ @@ -284,6 +285,7 @@ mostlyclean :: -rm -f a.out core $(PROG_GENERATE) *.o clean :: mostlyclean + -rm -f options.m4 -rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp distclean :: clean @@ -294,6 +296,15 @@ realclean :: distclean HTML_DIR = @ADAHTML_DIR@ +options.m4 : + $(SHELL) -c "if [ @cf_cv_enable_sigwinch@ = 0 ]; \ + then \ + dashes=' --'; \ + else \ + dashes='';\ + fi; \ + echo \"define(OPT_KEY_RESIZE,\\\`\$$dashes')dnl\" > $@" + instab.tmp : table.m4 $(GEN_SRC) @rm -f $@ @for f in $(GEN_SRC) ; do \ diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c index d92fa68e..b37de1b0 100644 --- a/Ada95/gen/gen.c +++ b/Ada95/gen/gen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2014,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ /* Version Control - $Id: gen.c,v 1.78 2021/12/11 21:03:21 tom Exp $ + $Id: gen.c,v 1.79 2024/01/19 13:41:45 tom Exp $ --------------------------------------------------------------------------*/ /* This program prints on its standard output the source for the @@ -424,7 +424,9 @@ main(int argc, const char *argv[]) PRINT_NAMED_CONSTANT(KEY_SUSPEND); PRINT_NAMED_CONSTANT(KEY_UNDO); PRINT_NAMED_CONSTANT(KEY_MOUSE); +#ifdef KEY_RESIZE PRINT_NAMED_CONSTANT(KEY_RESIZE); +#endif print_comment(fp, "alternate character codes (ACS) from addch(3NCURSES)"); #define PRINT_ACS(name) print_size_of (fp, #name, (size_t)(&name - &acs_map[0])) diff --git a/Ada95/gen/terminal_interface-curses.ads.m4 b/Ada95/gen/terminal_interface-curses.ads.m4 index a5e91036..d6b18e58 100644 --- a/Ada95/gen/terminal_interface-curses.ads.m4 +++ b/Ada95/gen/terminal_interface-curses.ads.m4 @@ -1,6 +1,6 @@ -- -*- ada -*- define(`HTMLNAME',`terminal_interface-curses__ads.htm')dnl -include(M4MACRO)------------------------------------------------------------------------------ +include(M4MACRO)include(options.m4)------------------------------------------------------------------------------ -- -- -- GNAT ncurses Binding -- -- -- @@ -9,7 +9,7 @@ include(M4MACRO)---------------------------------------------------------------- -- S P E C -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2024 Thomas E. Dickey -- -- Copyright 1998-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -38,8 +38,8 @@ include(M4MACRO)---------------------------------------------------------------- ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.48 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.49 $ +-- $Date: 2024/01/19 16:51:30 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System.Storage_Elements; @@ -377,8 +377,8 @@ package Terminal_Interface.Curses is := Curses_Constants.KEY_UNDO; Key_Mouse : constant Special_Key_Code := Curses_Constants.KEY_MOUSE; - Key_Resize : constant Special_Key_Code - := Curses_Constants.KEY_RESIZE; +OPT_KEY_RESIZE Key_Resize : constant Special_Key_Code +OPT_KEY_RESIZE := Curses_Constants.KEY_RESIZE; Key_Max : constant Special_Key_Code := Special_Key_Code'Last; diff --git a/NEWS b/NEWS index 49bbd33c..819868ec 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4064 2024/01/13 22:02:10 tom Exp $ +-- $Id: NEWS,v 1.4069 2024/01/20 19:46:10 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,15 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20240120 + + improve formatting/style of manpages (patches by Branden Robinson). + + amend discussion of aliases in tput.1 + + use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs + ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit + xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD + + modify configure scripts/makefiles to omit KEY_RESIZE if the + corresponding SIGWINCH feature is disabled. + 20240113 + improve formatting/style of manpages (patches by Branden Robinson). + modify dist.mk to avoid passing developer's comments in manpages into diff --git a/VERSION b/VERSION index 4b0762cf..1c4709a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20240113 +5:0:10 6.4 20240120 diff --git a/configure b/configure index 655c5f22..814eb2fc 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.773 . +# From configure.in Revision: 1.774 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20230903. +# Generated by Autoconf 2.52.20231210. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -949,7 +949,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20230903. Invocation command line was +generated by GNU Autoconf 2.52.20231210. Invocation command line was $ $0 $@ @@ -6150,7 +6150,7 @@ int main (void) { #ifndef exit - char *p = (char *) exit; (void) p; + (void) exit; #endif ; @@ -6253,7 +6253,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -6307,7 +6307,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -7537,7 +7537,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -7693,7 +7693,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dlsym (); +char dlsym (void); int main (void) { @@ -7952,7 +7952,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Wgetch (); +char Gpm_Wgetch (void); int main (void) { @@ -8226,7 +8226,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -8294,7 +8294,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -14150,25 +14150,28 @@ else #line 14150 "configure" #include "confdefs.h" #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14162: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14165: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14165: \$? = $ac_status" >&5 + echo "$as_me:14168: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14168: \"$ac_try\"") >&5 + { (eval echo "$as_me:14171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14171: \$? = $ac_status" >&5 + echo "$as_me:14174: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14177,29 +14180,32 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14180 "configure" +#line 14183 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14199: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14196: \$? = $ac_status" >&5 + echo "$as_me:14202: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14199: \"$ac_try\"") >&5 + { (eval echo "$as_me:14205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14202: \$? = $ac_status" >&5 + echo "$as_me:14208: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14210,7 +14216,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14213: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:14219: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -14224,34 +14230,36 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:14227: checking for fseeko" >&5 +echo "$as_me:14233: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14233 "configure" +#line 14239 "configure" #include "confdefs.h" #include + #include int main (void) { -return fseeko && fseeko (stdin, 0, 0); +int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko && my_fseeko (stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14245: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14253: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14248: \$? = $ac_status" >&5 + echo "$as_me:14256: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14251: \"$ac_try\"") >&5 + { (eval echo "$as_me:14259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14254: \$? = $ac_status" >&5 + echo "$as_me:14262: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -14261,7 +14269,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14264: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:14272: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -14300,14 +14308,14 @@ fi fi - echo "$as_me:14303: checking whether to use struct dirent64" >&5 + echo "$as_me:14311: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14310 "configure" +#line 14318 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -14334,16 +14342,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14337: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14340: \$? = $ac_status" >&5 + echo "$as_me:14348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14343: \"$ac_try\"") >&5 + { (eval echo "$as_me:14351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14346: \$? = $ac_status" >&5 + echo "$as_me:14354: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -14354,7 +14362,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14357: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:14365: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -14364,7 +14372,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:14367: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:14375: checking if you want tparm not to use X/Open fixed-parameter list" >&5 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. @@ -14374,14 +14382,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:14377: result: $with_tparm_varargs" >&5 +echo "$as_me:14385: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:14384: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:14392: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 # Check whether --enable-tic-depends or --disable-tic-depends was given. @@ -14391,14 +14399,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:14394: result: $with_tic_depends" >&5 +echo "$as_me:14402: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --enable-wattr-macros to enable wattr* macros in curses.h -echo "$as_me:14401: checking if you want to enable wattr* macros" >&5 +echo "$as_me:14409: checking if you want to enable wattr* macros" >&5 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6 # Check whether --enable-wattr-macros or --disable-wattr-macros was given. @@ -14410,15 +14418,15 @@ else fi; if [ "x$with_wattr_macros" != xyes ]; then NCURSES_WATTR_MACROS=0 - echo "$as_me:14413: result: no" >&5 + echo "$as_me:14421: result: no" >&5 echo "${ECHO_T}no" >&6 else NCURSES_WATTR_MACROS=1 - echo "$as_me:14417: result: yes" >&5 + echo "$as_me:14425: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi -echo "$as_me:14421: checking for X11 rgb file" >&5 +echo "$as_me:14429: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -14482,7 +14490,7 @@ case ".$cf_path" in cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:14485: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:14493: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -14490,7 +14498,7 @@ esac fi -echo "$as_me:14493: result: $RGB_PATH" >&5 +echo "$as_me:14501: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 +echo "$as_me:14516: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 # Check whether --with-bool or --without-bool was given. @@ -14515,17 +14523,17 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:14518: result: $NCURSES_BOOL" >&5 +echo "$as_me:14526: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 case x$NCURSES_BOOL in (x|xyes|xno) - { { echo "$as_me:14522: error: expected a type name for bool" >&5 + { { echo "$as_me:14530: error: expected a type name for bool" >&5 echo "$as_me: error: expected a type name for bool" >&2;} { (exit 1); exit 1; }; } ;; esac -echo "$as_me:14528: checking for alternate terminal capabilities file" >&5 +echo "$as_me:14536: checking for alternate terminal capabilities file" >&5 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 # Check whether --with-caps or --without-caps was given. @@ -14537,16 +14545,16 @@ else fi; if test ! -f "${srcdir}/include/${TERMINFO_CAPS}" then - { echo "$as_me:14540: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5 + { echo "$as_me:14548: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;} TERMINFO_CAPS=Caps fi -echo "$as_me:14544: result: $TERMINFO_CAPS" >&5 +echo "$as_me:14552: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:14549: checking for type of chtype" >&5 +echo "$as_me:14557: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 # Check whether --with-chtype or --without-chtype was given. @@ -14556,11 +14564,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=$cf_dft_chtype fi; -echo "$as_me:14559: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:14567: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 case x$NCURSES_CHTYPE in (x|xyes|xno) - { { echo "$as_me:14563: error: expected a type name for chtype" >&5 + { { echo "$as_me:14571: error: expected a type name for chtype" >&5 echo "$as_me: error: expected a type name for chtype" >&2;} { (exit 1); exit 1; }; } ;; @@ -14568,7 +14576,7 @@ esac ### use option --with-ospeed to override ospeed's type -echo "$as_me:14571: checking for type of ospeed" >&5 +echo "$as_me:14579: checking for type of ospeed" >&5 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 # Check whether --with-ospeed or --without-ospeed was given. @@ -14578,11 +14586,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:14581: result: $NCURSES_OSPEED" >&5 +echo "$as_me:14589: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 case x$NCURSES_OSPEED in (x|xyes|xno) - { { echo "$as_me:14585: error: expected a type name for ospeed" >&5 + { { echo "$as_me:14593: error: expected a type name for ospeed" >&5 echo "$as_me: error: expected a type name for ospeed" >&2;} { (exit 1); exit 1; }; } ;; @@ -14590,7 +14598,7 @@ esac ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:14593: checking for type of mmask-t" >&5 +echo "$as_me:14601: checking for type of mmask-t" >&5 echo $ECHO_N "checking for type of mmask-t... $ECHO_C" >&6 # Check whether --with-mmask-t or --without-mmask-t was given. @@ -14600,18 +14608,18 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=$cf_dft_mmask_t fi; -echo "$as_me:14603: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:14611: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 case x$NCURSES_MMASK_T in (x|xyes|xno) - { { echo "$as_me:14607: error: expected a type name for mmask-t" >&5 + { { echo "$as_me:14615: error: expected a type name for mmask-t" >&5 echo "$as_me: error: expected a type name for mmask-t" >&2;} { (exit 1); exit 1; }; } ;; esac ### use option --with-ccharw-max to override CCHARW_MAX size -echo "$as_me:14614: checking for size CCHARW_MAX" >&5 +echo "$as_me:14622: checking for size CCHARW_MAX" >&5 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 # Check whether --with-ccharw-max or --without-ccharw-max was given. @@ -14621,16 +14629,16 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=$cf_dft_ccharw_max fi; -echo "$as_me:14624: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:14632: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 -echo "$as_me:14627: checking for signed char" >&5 +echo "$as_me:14635: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14633 "configure" +#line 14641 "configure" #include "confdefs.h" $ac_includes_default int @@ -14645,16 +14653,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14648: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14651: \$? = $ac_status" >&5 + echo "$as_me:14659: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14654: \"$ac_try\"") >&5 + { (eval echo "$as_me:14662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14657: \$? = $ac_status" >&5 + echo "$as_me:14665: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -14664,10 +14672,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14667: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:14675: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:14670: checking size of signed char" >&5 +echo "$as_me:14678: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14676,7 +14684,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 14679 "configure" +#line 14687 "configure" #include "confdefs.h" $ac_includes_default int @@ -14688,21 +14696,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14691: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14699: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14694: \$? = $ac_status" >&5 + echo "$as_me:14702: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14697: \"$ac_try\"") >&5 + { (eval echo "$as_me:14705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14700: \$? = $ac_status" >&5 + echo "$as_me:14708: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 14705 "configure" +#line 14713 "configure" #include "confdefs.h" $ac_includes_default int @@ -14714,16 +14722,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14720: \$? = $ac_status" >&5 + echo "$as_me:14728: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14723: \"$ac_try\"") >&5 + { (eval echo "$as_me:14731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14726: \$? = $ac_status" >&5 + echo "$as_me:14734: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -14739,7 +14747,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 14742 "configure" +#line 14750 "configure" #include "confdefs.h" $ac_includes_default int @@ -14751,16 +14759,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14757: \$? = $ac_status" >&5 + echo "$as_me:14765: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14760: \"$ac_try\"") >&5 + { (eval echo "$as_me:14768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14763: \$? = $ac_status" >&5 + echo "$as_me:14771: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -14776,7 +14784,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 14779 "configure" +#line 14787 "configure" #include "confdefs.h" $ac_includes_default int @@ -14788,16 +14796,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14791: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14799: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14794: \$? = $ac_status" >&5 + echo "$as_me:14802: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14797: \"$ac_try\"") >&5 + { (eval echo "$as_me:14805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14800: \$? = $ac_status" >&5 + echo "$as_me:14808: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -14810,12 +14818,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:14813: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:14821: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 14818 "configure" +#line 14826 "configure" #include "confdefs.h" $ac_includes_default int @@ -14831,15 +14839,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:14834: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14842: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14837: \$? = $ac_status" >&5 + echo "$as_me:14845: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:14839: \"$ac_try\"") >&5 + { (eval echo "$as_me:14847: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14842: \$? = $ac_status" >&5 + echo "$as_me:14850: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -14855,7 +14863,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:14858: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:14866: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:14877: checking whether to use signed chars for Boolean array in term.h" >&5 echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -14876,13 +14884,13 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=$cf_dft_signed_char fi; -echo "$as_me:14879: result: $with_signed_char" >&5 +echo "$as_me:14887: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --with-tparm-arg to override tparm's argument type -echo "$as_me:14885: checking for type of tparm-arg" >&5 +echo "$as_me:14893: checking for type of tparm-arg" >&5 echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6 # Check whether --with-tparm-arg or --without-tparm-arg was given. @@ -14892,18 +14900,18 @@ if test "${with_tparm_arg+set}" = set; then else NCURSES_TPARM_ARG=$cf_dft_tparm_arg fi; -echo "$as_me:14895: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:14903: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 case x$NCURSES_TPARM_ARG in (x|xyes|xno) - { { echo "$as_me:14899: error: expected a type name for tparm-arg" >&5 + { { echo "$as_me:14907: error: expected a type name for tparm-arg" >&5 echo "$as_me: error: expected a type name for tparm-arg" >&2;} { (exit 1); exit 1; }; } ;; esac ### Enable compiling-in rcs id's -echo "$as_me:14906: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:14914: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -14913,7 +14921,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:14916: result: $with_rcs_ids" >&5 +echo "$as_me:14924: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "x$with_rcs_ids" = xyes && cat >>confdefs.h <<\EOF @@ -14922,7 +14930,7 @@ EOF ############################################################################### -echo "$as_me:14925: checking format of man-pages" >&5 +echo "$as_me:14933: checking format of man-pages" >&5 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 # Check whether --with-manpage-format or --without-manpage-format was given. @@ -15013,10 +15021,10 @@ case "$MANPAGE_FORMAT" in ;; esac -echo "$as_me:15016: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:15024: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:15019: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:15027: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi @@ -15055,7 +15063,7 @@ case "$cf_item" in esac done -echo "$as_me:15058: checking for manpage renaming" >&5 +echo "$as_me:15066: checking for manpage renaming" >&5 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 # Check whether --with-manpage-renames or --without-manpage-renames was given. @@ -15084,15 +15092,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then elif test "$MANPAGE_RENAMES" = no ; then : elif test ! -f "$MANPAGE_RENAMES" ; then - { { echo "$as_me:15087: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:15095: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:15092: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:15100: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:15095: checking if manpage aliases will be installed" >&5 +echo "$as_me:15103: checking if manpage aliases will be installed" >&5 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. @@ -15103,7 +15111,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:15106: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:15114: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 case "x$LN_S" in @@ -15117,7 +15125,7 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:15120: checking if manpage symlinks should be used" >&5 +echo "$as_me:15128: checking if manpage symlinks should be used" >&5 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. @@ -15130,17 +15138,17 @@ fi; if test "$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:15133: WARNING: cannot make symlinks" >&5 + { echo "$as_me:15141: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:15139: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:15147: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:15143: checking for manpage tbl" >&5 +echo "$as_me:15151: checking for manpage tbl" >&5 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. @@ -15151,7 +15159,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:15154: result: $MANPAGE_TBL" >&5 +echo "$as_me:15162: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -15469,7 +15477,7 @@ chmod 755 "$cf_edit_man" ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:15472: checking if you want to build with function extensions" >&5 +echo "$as_me:15480: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -15479,7 +15487,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:15482: result: $with_ext_funcs" >&5 +echo "$as_me:15490: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 @@ -15535,7 +15543,7 @@ else GENERATED_EXT_FUNCS= fi -echo "$as_me:15538: checking if you want to build with SCREEN extensions" >&5 +echo "$as_me:15546: checking if you want to build with SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -15545,7 +15553,7 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=$cf_dft_ext_spfuncs fi; -echo "$as_me:15548: result: $with_sp_funcs" >&5 +echo "$as_me:15556: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 @@ -15564,7 +15572,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:15567: checking if you want to build with terminal-driver" >&5 +echo "$as_me:15575: checking if you want to build with terminal-driver" >&5 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -15574,7 +15582,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:15577: result: $with_term_driver" >&5 +echo "$as_me:15585: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "x$with_term_driver" = xyes ; then @@ -15583,19 +15591,19 @@ cat >>confdefs.h <<\EOF EOF if test "x$with_termlib" != xno ; then - { { echo "$as_me:15586: error: The term-driver option conflicts with the termlib option" >&5 + { { echo "$as_me:15594: error: The term-driver option conflicts with the termlib option" >&5 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_sp_funcs" != xyes ; then - { { echo "$as_me:15591: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:15599: error: The term-driver option relies upon sp-funcs" >&5 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} { (exit 1); exit 1; }; } fi fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:15598: checking for extended use of const keyword" >&5 +echo "$as_me:15606: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -15605,7 +15613,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:15608: result: $with_ext_const" >&5 +echo "$as_me:15616: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "x$with_ext_const" = xyes ; then @@ -15613,7 +15621,7 @@ if test "x$with_ext_const" = xyes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:15616: checking if you want to use extended colors" >&5 +echo "$as_me:15624: checking if you want to use extended colors" >&5 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -15623,12 +15631,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:15626: result: $with_ext_colors" >&5 +echo "$as_me:15634: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "x$with_ext_colors" = xyes ; then if test "x$with_widec" != xyes ; then - { echo "$as_me:15631: WARNING: This option applies only to wide-character library" >&5 + { echo "$as_me:15639: WARNING: This option applies only to wide-character library" >&5 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} else # cannot be ABI 5 since it changes sizeof(cchar_t) @@ -15639,7 +15647,7 @@ if test "${with_abi_version+set}" != set; then cf_cv_rel_version=6.0 cf_cv_abi_version=6 cf_cv_abi_default=6 - { echo "$as_me:15642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + { echo "$as_me:15650: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} ;; esac @@ -15667,7 +15675,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:15670: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:15678: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -15677,7 +15685,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:15680: result: $with_ext_mouse" >&5 +echo "$as_me:15688: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 if test "x$with_ext_mouse" = xyes ; then @@ -15687,7 +15695,7 @@ if test "${with_abi_version+set}" != set; then cf_cv_rel_version=6.0 cf_cv_abi_version=6 cf_cv_abi_default=6 - { echo "$as_me:15690: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + { echo "$as_me:15698: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} ;; esac @@ -15704,7 +15712,7 @@ else fi ### use option --enable-ext-putwin to turn on extended screendumps -echo "$as_me:15707: checking if you want to use extended putwin/screendump" >&5 +echo "$as_me:15715: checking if you want to use extended putwin/screendump" >&5 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 # Check whether --enable-ext-putwin or --disable-ext-putwin was given. @@ -15714,7 +15722,7 @@ if test "${enable_ext_putwin+set}" = set; then else with_ext_putwin=$cf_dft_ext_putwin fi; -echo "$as_me:15717: result: $with_ext_putwin" >&5 +echo "$as_me:15725: result: $with_ext_putwin" >&5 echo "${ECHO_T}$with_ext_putwin" >&6 if test "x$with_ext_putwin" = xyes ; then @@ -15724,7 +15732,7 @@ EOF fi -echo "$as_me:15727: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:15735: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -15734,7 +15742,7 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:15737: result: $with_no_padding" >&5 +echo "$as_me:15745: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF @@ -15742,7 +15750,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:15745: checking if you want SIGWINCH handler" >&5 +echo "$as_me:15753: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -15752,15 +15760,22 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:15755: result: $with_sigwinch" >&5 +echo "$as_me:15763: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 -test "x$with_sigwinch" = xyes && +if test "x$with_sigwinch" = xyes +then + cat >>confdefs.h <<\EOF #define USE_SIGWINCH 1 EOF + cf_cv_enable_sigwinch=1 +else + cf_cv_enable_sigwinch=0 +fi + ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:15763: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:15778: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -15770,7 +15785,7 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:15773: result: $with_tcap_names" >&5 +echo "$as_me:15788: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 if test "x$with_tcap_names" = xyes; then @@ -15784,7 +15799,7 @@ fi ############################################################################## -echo "$as_me:15787: checking if you want to link with the pthread library" >&5 +echo "$as_me:15802: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -15794,27 +15809,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:15797: result: $with_pthread" >&5 +echo "$as_me:15812: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:15801: checking for pthread.h" >&5 + echo "$as_me:15816: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15807 "configure" +#line 15822 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15811: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:15826: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15817: \$? = $ac_status" >&5 + echo "$as_me:15832: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15833,7 +15848,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15836: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:15851: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -15843,7 +15858,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:15846: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:15861: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -15864,7 +15879,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15867 "configure" +#line 15882 "configure" #include "confdefs.h" #include @@ -15881,16 +15896,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15884: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15899: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15887: \$? = $ac_status" >&5 + echo "$as_me:15902: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15890: \"$ac_try\"") >&5 + { (eval echo "$as_me:15905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15893: \$? = $ac_status" >&5 + echo "$as_me:15908: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -15900,7 +15915,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:15903: result: $with_pthread" >&5 + echo "$as_me:15918: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -15928,7 +15943,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:15931: error: Cannot link with pthread library" >&5 + { { echo "$as_me:15946: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -15938,13 +15953,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:15941: checking for pthread_kill" >&5 + echo "$as_me:15956: checking for pthread_kill" >&5 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 if test "${ac_cv_func_pthread_kill+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15947 "configure" +#line 15962 "configure" #include "confdefs.h" #define pthread_kill autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15975,16 +15990,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15978: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15993: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15981: \$? = $ac_status" >&5 + echo "$as_me:15996: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15984: \"$ac_try\"") >&5 + { (eval echo "$as_me:15999: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15987: \$? = $ac_status" >&5 + echo "$as_me:16002: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_pthread_kill=yes else @@ -15994,11 +16009,11 @@ ac_cv_func_pthread_kill=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15997: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:16012: result: $ac_cv_func_pthread_kill" >&5 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 if test "$ac_cv_func_pthread_kill" = yes; then - echo "$as_me:16001: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:16016: checking if you want to allow EINTR in wgetch with pthreads" >&5 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. @@ -16008,7 +16023,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:16011: result: $use_pthreads_eintr" >&5 + echo "$as_me:16026: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -16019,7 +16034,7 @@ EOF fi fi - echo "$as_me:16022: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:16037: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -16029,18 +16044,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:16032: result: $use_weak_symbols" >&5 + echo "$as_me:16047: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:16036: checking if $CC supports weak symbols" >&5 +echo "$as_me:16051: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16043 "configure" +#line 16058 "configure" #include "confdefs.h" #include @@ -16066,16 +16081,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16069: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16084: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16072: \$? = $ac_status" >&5 + echo "$as_me:16087: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16075: \"$ac_try\"") >&5 + { (eval echo "$as_me:16090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16078: \$? = $ac_status" >&5 + echo "$as_me:16093: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -16086,7 +16101,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16089: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:16104: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -16136,7 +16151,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:16139: checking if you want reentrant code" >&5 +echo "$as_me:16154: checking if you want reentrant code" >&5 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -16146,7 +16161,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:16149: result: $with_reentrant" >&5 +echo "$as_me:16164: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 @@ -16235,7 +16250,7 @@ if test "${with_abi_version+set}" != set; then cf_cv_rel_version=6.0 cf_cv_abi_version=6 cf_cv_abi_default=6 - { echo "$as_me:16238: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + { echo "$as_me:16253: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} ;; esac @@ -16247,7 +16262,7 @@ else NCURSES_SIZE_T=$cf_dft_ordinate_type fi -echo "$as_me:16250: checking whether curses library structures should be opaque" >&5 +echo "$as_me:16265: checking whether curses library structures should be opaque" >&5 echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-curses or --disable-opaque-curses was given. @@ -16269,16 +16284,16 @@ else test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses fi; -echo "$as_me:16272: result: $enable_opaque_curses" >&5 +echo "$as_me:16287: result: $enable_opaque_curses" >&5 echo "${ECHO_T}$enable_opaque_curses" >&6 test "$cf_cv_enable_reentrant" = 1 && \ test "$enable_opaque_curses" = no && \ -{ { echo "$as_me:16277: error: reentrant configuration requires opaque library" >&5 +{ { echo "$as_me:16292: error: reentrant configuration requires opaque library" >&5 echo "$as_me: error: reentrant configuration requires opaque library" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:16281: checking whether form library structures should be opaque" >&5 +echo "$as_me:16296: checking whether form library structures should be opaque" >&5 echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-form or --disable-opaque-form was given. @@ -16288,10 +16303,10 @@ if test "${enable_opaque_form+set}" = set; then else enable_opaque_form=$cf_dft_opaque_curses fi; -echo "$as_me:16291: result: $enable_opaque_form" >&5 +echo "$as_me:16306: result: $enable_opaque_form" >&5 echo "${ECHO_T}$enable_opaque_form" >&6 -echo "$as_me:16294: checking whether menu library structures should be opaque" >&5 +echo "$as_me:16309: checking whether menu library structures should be opaque" >&5 echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-menu or --disable-opaque-menu was given. @@ -16301,10 +16316,10 @@ if test "${enable_opaque_menu+set}" = set; then else enable_opaque_menu=$cf_dft_opaque_curses fi; -echo "$as_me:16304: result: $enable_opaque_menu" >&5 +echo "$as_me:16319: result: $enable_opaque_menu" >&5 echo "${ECHO_T}$enable_opaque_menu" >&6 -echo "$as_me:16307: checking whether panel library structures should be opaque" >&5 +echo "$as_me:16322: checking whether panel library structures should be opaque" >&5 echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-panel or --disable-opaque-panel was given. @@ -16314,7 +16329,7 @@ if test "${enable_opaque_panel+set}" = set; then else enable_opaque_panel=$cf_dft_opaque_curses fi; -echo "$as_me:16317: result: $enable_opaque_panel" >&5 +echo "$as_me:16332: result: $enable_opaque_panel" >&5 echo "${ECHO_T}$enable_opaque_panel" >&6 NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -16324,7 +16339,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel" = yes && NCURSES_OPAQUE_PAN ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:16327: checking for prefix used to wrap public variables" >&5 + echo "$as_me:16342: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -16334,7 +16349,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:16337: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:16352: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -16347,7 +16362,7 @@ EOF ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:16350: checking if you want all development code" >&5 +echo "$as_me:16365: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -16357,11 +16372,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:16360: result: $with_develop" >&5 +echo "$as_me:16375: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:16364: checking if you want hard-tabs code" >&5 +echo "$as_me:16379: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -16371,7 +16386,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:16374: result: $enable_hard_tabs" >&5 +echo "$as_me:16389: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -16379,7 +16394,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:16382: checking if you want limited support for xmc" >&5 +echo "$as_me:16397: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -16389,7 +16404,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:16392: result: $enable_xmc_glitch" >&5 +echo "$as_me:16407: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -16399,7 +16414,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:16402: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:16417: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -16409,7 +16424,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:16412: result: $with_assumed_color" >&5 +echo "$as_me:16427: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -16417,7 +16432,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:16420: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:16435: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -16427,7 +16442,7 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:16430: result: $with_hashmap" >&5 +echo "$as_me:16445: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF @@ -16435,7 +16450,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:16438: checking if you want code to check screensize" >&5 +echo "$as_me:16453: checking if you want code to check screensize" >&5 echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6 # Check whether --enable-check-size or --disable-check-size was given. @@ -16445,7 +16460,7 @@ if test "${enable_check_size+set}" = set; then else with_check_size=no fi; -echo "$as_me:16448: result: $with_check_size" >&5 +echo "$as_me:16463: result: $with_check_size" >&5 echo "${ECHO_T}$with_check_size" >&6 test "x$with_check_size" = xyes && cat >>confdefs.h <<\EOF @@ -16453,7 +16468,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:16456: checking if you want colorfgbg code" >&5 +echo "$as_me:16471: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -16463,7 +16478,7 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:16466: result: $with_colorfgbg" >&5 +echo "$as_me:16481: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "x$with_colorfgbg" = xyes && cat >>confdefs.h <<\EOF @@ -16471,7 +16486,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-fvisibility to turn on use of gcc-specific feature -echo "$as_me:16474: checking if you want to use gcc -fvisibility option" >&5 +echo "$as_me:16489: checking if you want to use gcc -fvisibility option" >&5 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 # Check whether --enable-fvisibility or --disable-fvisibility was given. @@ -16481,14 +16496,14 @@ if test "${enable_fvisibility+set}" = set; then else cf_with_fvisibility=no fi; -echo "$as_me:16484: result: $cf_with_fvisibility" >&5 +echo "$as_me:16499: result: $cf_with_fvisibility" >&5 echo "${ECHO_T}$cf_with_fvisibility" >&6 NCURSES_IMPEXP= NCURSES_CXX_IMPEXP= if test "x$cf_with_fvisibility" = xyes; then -echo "$as_me:16491: checking if $CC -fvisibility=hidden option works" >&5 +echo "$as_me:16506: checking if $CC -fvisibility=hidden option works" >&5 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 if test "${cf_cv_fvisibility_hidden+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16497,7 +16512,7 @@ else cf_save_cflags="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" cat >"conftest.$ac_ext" <<_ACEOF -#line 16500 "configure" +#line 16515 "configure" #include "confdefs.h" __attribute__ ((visibility("default"))) int somefunc() {return 42;} @@ -16513,16 +16528,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16516: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16519: \$? = $ac_status" >&5 + echo "$as_me:16534: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16522: \"$ac_try\"") >&5 + { (eval echo "$as_me:16537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16525: \$? = $ac_status" >&5 + echo "$as_me:16540: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fvisibility_hidden=yes else @@ -16534,7 +16549,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CFLAGS=$cf_save_cflags fi -echo "$as_me:16537: result: $cf_cv_fvisibility_hidden" >&5 +echo "$as_me:16552: result: $cf_cv_fvisibility_hidden" >&5 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 if test "x$cf_cv_fvisibility_hidden" = xyes @@ -16649,7 +16664,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" -echo "$as_me:16652: checking if $CXX -fvisibility=hidden option works" >&5 +echo "$as_me:16667: checking if $CXX -fvisibility=hidden option works" >&5 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 if test "${cf_cv_fvisibility_hidden2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16658,7 +16673,7 @@ else cf_save_cflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fvisibility=hidden" cat >"conftest.$ac_ext" <<_ACEOF -#line 16661 "configure" +#line 16676 "configure" #include "confdefs.h" __attribute__ ((visibility("default"))) int somefunc() {return 42;} @@ -16674,16 +16689,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16677: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16692: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16680: \$? = $ac_status" >&5 + echo "$as_me:16695: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16683: \"$ac_try\"") >&5 + { (eval echo "$as_me:16698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16686: \$? = $ac_status" >&5 + echo "$as_me:16701: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fvisibility_hidden2=yes else @@ -16695,7 +16710,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CXXFLAGS=$cf_save_cflags fi -echo "$as_me:16698: result: $cf_cv_fvisibility_hidden2" >&5 +echo "$as_me:16713: result: $cf_cv_fvisibility_hidden2" >&5 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 if test "x$cf_cv_fvisibility_hidden2" = xyes @@ -16818,7 +16833,7 @@ ac_main_return="return" fi ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:16821: checking if you want interop bindings" >&5 +echo "$as_me:16836: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -16828,13 +16843,13 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=$cf_dft_interop fi; -echo "$as_me:16831: result: $with_exp_interop" >&5 +echo "$as_me:16846: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 -echo "$as_me:16837: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:16852: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -16844,13 +16859,13 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:16847: result: $with_safe_sprintf" >&5 +echo "$as_me:16862: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:16853: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:16868: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -16860,7 +16875,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:16863: result: $with_scroll_hints" >&5 +echo "$as_me:16878: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -16869,7 +16884,7 @@ EOF fi -echo "$as_me:16872: checking if you want wgetch-events code" >&5 +echo "$as_me:16887: checking if you want wgetch-events code" >&5 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -16879,7 +16894,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:16882: result: $with_wgetch_events" >&5 +echo "$as_me:16897: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 if test "x$with_wgetch_events" = xyes ; then @@ -16894,7 +16909,7 @@ fi case "$cf_cv_system_name" in (*mingw32*|*mingw64*|*-msvc*) - echo "$as_me:16897: checking if you want experimental-Windows driver" >&5 + echo "$as_me:16912: checking if you want experimental-Windows driver" >&5 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 # Check whether --enable-exp-win32 or --disable-exp-win32 was given. @@ -16904,7 +16919,7 @@ if test "${enable_exp_win32+set}" = set; then else with_exp_win32=no fi; - echo "$as_me:16907: result: $with_exp_win32" >&5 + echo "$as_me:16922: result: $with_exp_win32" >&5 echo "${ECHO_T}$with_exp_win32" >&6 if test "x$with_exp_win32" = xyes then @@ -16930,7 +16945,7 @@ esac ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:16933: checking if you want to see long compiling messages" >&5 +echo "$as_me:16948: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -16964,7 +16979,7 @@ else ECHO_CC='' fi; -echo "$as_me:16967: result: $enableval" >&5 +echo "$as_me:16982: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -16977,7 +16992,7 @@ fi # --disable-stripping is used for debugging -echo "$as_me:16980: checking if you want to install stripped executables" >&5 +echo "$as_me:16995: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -16994,7 +17009,7 @@ else enable_stripping=yes fi; -echo "$as_me:16997: result: $enable_stripping" >&5 +echo "$as_me:17012: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -17005,7 +17020,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:17008: checking if install accepts -p option" >&5 +echo "$as_me:17023: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17036,10 +17051,10 @@ else rm -rf ./conftest* fi -echo "$as_me:17039: result: $cf_cv_install_p" >&5 +echo "$as_me:17054: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:17042: checking if install needs to be told about ownership" >&5 +echo "$as_me:17057: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -17050,7 +17065,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:17053: result: $with_install_o" >&5 +echo "$as_me:17068: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -17061,7 +17076,7 @@ fi if test -n "$INSTALL_OPT_S" then - echo "$as_me:17064: checking if you want to specify strip-program" >&5 + echo "$as_me:17079: checking if you want to specify strip-program" >&5 echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 # Check whether --with-strip-program or --without-strip-program was given. @@ -17071,11 +17086,11 @@ if test "${with_strip_program+set}" = set; then else with_strip_program=no fi; - echo "$as_me:17074: result: $with_strip_program" >&5 + echo "$as_me:17089: result: $with_strip_program" >&5 echo "${ECHO_T}$with_strip_program" >&6 if test "$with_strip_program" != no then - echo "$as_me:17078: checking if strip-program is supported with this installer" >&5 + echo "$as_me:17093: checking if strip-program is supported with this installer" >&5 echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` check_install_strip=no @@ -17096,11 +17111,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH done fi fi - echo "$as_me:17099: result: $check_install_strip" >&5 + echo "$as_me:17114: result: $check_install_strip" >&5 echo "${ECHO_T}$check_install_strip" >&6 case "$check_install_strip" in (no) - { echo "$as_me:17103: WARNING: $cf_install_program does not support strip program option" >&5 + { echo "$as_me:17118: WARNING: $cf_install_program does not support strip program option" >&5 echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} with_strip_program=no ;; @@ -17115,7 +17130,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option chmod +x "$INSTALL" test -n "$verbose" && echo " created $INSTALL" 1>&6 -echo "${as_me:-configure}:17118: testing created $INSTALL ..." 1>&5 +echo "${as_me:-configure}:17133: testing created $INSTALL ..." 1>&5 ;; (option) @@ -17141,7 +17156,7 @@ fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:17144: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:17159: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -17158,17 +17173,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:17161: result: $enable_stdnoreturn" >&5 +echo "$as_me:17176: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:17165: checking for C11 _Noreturn feature" >&5 +echo "$as_me:17180: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17171 "configure" +#line 17186 "configure" #include "confdefs.h" $ac_includes_default @@ -17184,16 +17199,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17187: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17202: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17190: \$? = $ac_status" >&5 + echo "$as_me:17205: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17193: \"$ac_try\"") >&5 + { (eval echo "$as_me:17208: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17196: \$? = $ac_status" >&5 + echo "$as_me:17211: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -17204,7 +17219,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17207: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:17222: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -17260,16 +17275,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:17263: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17278: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:17268: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17283: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:17272: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17287: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -17308,16 +17323,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:17311: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17326: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:17316: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17331: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:17320: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17335: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -17356,23 +17371,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:17359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17374: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:17364: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17379: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:17368: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17383: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:17375: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:17390: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -17389,7 +17404,7 @@ else enable_warnings=no fi; -echo "$as_me:17392: result: $enable_warnings" >&5 +echo "$as_me:17407: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -17413,7 +17428,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 17416 "configure" +#line 17431 "configure" #include "confdefs.h" #include @@ -17428,26 +17443,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17431: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17434: \$? = $ac_status" >&5 + echo "$as_me:17449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17437: \"$ac_try\"") >&5 + { (eval echo "$as_me:17452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17440: \$? = $ac_status" >&5 + echo "$as_me:17455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:17443: checking for X11/Xt const-feature" >&5 +echo "$as_me:17458: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17450 "configure" +#line 17465 "configure" #include "confdefs.h" #undef _CONST_X_STRING @@ -17465,16 +17480,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17468: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17483: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17471: \$? = $ac_status" >&5 + echo "$as_me:17486: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17474: \"$ac_try\"") >&5 + { (eval echo "$as_me:17489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17477: \$? = $ac_status" >&5 + echo "$as_me:17492: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -17489,7 +17504,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17492: result: $cf_cv_const_x_string" >&5 +echo "$as_me:17507: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -17518,7 +17533,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:17552: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -17550,12 +17565,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17553: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17556: \$? = $ac_status" >&5 + echo "$as_me:17571: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17558: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17573: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -17563,7 +17578,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:17566: checking for $CC warning options..." >&5 + { echo "$as_me:17581: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -17586,12 +17601,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17589: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17592: \$? = $ac_status" >&5 + echo "$as_me:17607: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17594: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17609: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -17599,7 +17614,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:17602: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17617: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17609,7 +17624,7 @@ echo "${as_me:-configure}:17602: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:17612: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17627: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17642,10 +17657,10 @@ cat > conftest.i <&5 + { echo "$as_me:17660: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -17695,12 +17710,12 @@ EOF ;; esac - if { (eval echo "$as_me:17698: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17713: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17701: \$? = $ac_status" >&5 + echo "$as_me:17716: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17703: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:17718: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -17772,12 +17787,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:17775: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:17790: checking if this is really Intel C++ compiler" >&5 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 17780 "configure" +#line 17795 "configure" #include "confdefs.h" int @@ -17794,16 +17809,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17797: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17812: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17800: \$? = $ac_status" >&5 + echo "$as_me:17815: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17803: \"$ac_try\"") >&5 + { (eval echo "$as_me:17818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17806: \$? = $ac_status" >&5 + echo "$as_me:17821: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -17814,7 +17829,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:17817: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:17832: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -17823,11 +17838,11 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:17826: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:17841: checking if this is really Clang C++ compiler" >&5 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17830 "configure" +#line 17845 "configure" #include "confdefs.h" int @@ -17844,16 +17859,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17847: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17862: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17850: \$? = $ac_status" >&5 + echo "$as_me:17865: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17853: \"$ac_try\"") >&5 + { (eval echo "$as_me:17868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17856: \$? = $ac_status" >&5 + echo "$as_me:17871: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_CPLUSPLUS=yes @@ -17863,7 +17878,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:17866: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:17881: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -17872,30 +17887,30 @@ CLANG_VERSION=none if test "x$CLANG_CPLUSPLUS" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:17875: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:17890: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:17882: checking version of $CC" >&5 + echo "$as_me:17897: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:17886: result: $CLANG_VERSION" >&5 + echo "$as_me:17901: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:17893: checking if option $cf_clang_opt works" >&5 + echo "$as_me:17908: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 17898 "configure" +#line 17913 "configure" #include "confdefs.h" #include @@ -17909,16 +17924,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17912: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17927: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17915: \$? = $ac_status" >&5 + echo "$as_me:17930: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17918: \"$ac_try\"") >&5 + { (eval echo "$as_me:17933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17921: \$? = $ac_status" >&5 + echo "$as_me:17936: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -17929,13 +17944,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17932: result: $cf_clang_optok" >&5 + echo "$as_me:17947: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:17938: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:17953: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -17952,7 +17967,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" cat > conftest.$ac_ext <&5 + { echo "$as_me:17988: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -17987,12 +18002,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:17990: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17993: \$? = $ac_status" >&5 + echo "$as_me:18008: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17995: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18010: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -18001,7 +18016,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:18004: checking for $CXX warning options..." >&5 + { echo "$as_me:18019: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -18031,16 +18046,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18049: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18037: \$? = $ac_status" >&5 + echo "$as_me:18052: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:18039: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18054: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:18043: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18058: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -18058,7 +18073,7 @@ ac_main_return="return" fi fi -echo "$as_me:18061: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:18076: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -18068,7 +18083,7 @@ if test "${enable_string_hacks+set}" = set; then else enable_string_hacks=no fi; -echo "$as_me:18071: result: $enable_string_hacks" >&5 +echo "$as_me:18086: result: $enable_string_hacks" >&5 echo "${ECHO_T}$enable_string_hacks" >&6 if test "x$enable_string_hacks" = "xyes"; then @@ -18077,15 +18092,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:18080: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:18095: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:18082: checking for strlcat" >&5 + echo "$as_me:18097: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18088 "configure" +#line 18103 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18116,16 +18131,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18119: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18134: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18122: \$? = $ac_status" >&5 + echo "$as_me:18137: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18125: \"$ac_try\"") >&5 + { (eval echo "$as_me:18140: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18128: \$? = $ac_status" >&5 + echo "$as_me:18143: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else @@ -18135,7 +18150,7 @@ ac_cv_func_strlcat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18138: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:18153: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test "$ac_cv_func_strlcat" = yes; then @@ -18145,7 +18160,7 @@ EOF else - echo "$as_me:18148: checking for strlcat in -lbsd" >&5 + echo "$as_me:18163: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18153,7 +18168,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18156 "configure" +#line 18171 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18162,7 +18177,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char strlcat (); +char strlcat (void); int main (void) { @@ -18172,16 +18187,16 @@ strlcat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18175: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18190: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18178: \$? = $ac_status" >&5 + echo "$as_me:18193: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18181: \"$ac_try\"") >&5 + { (eval echo "$as_me:18196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18184: \$? = $ac_status" >&5 + echo "$as_me:18199: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -18192,7 +18207,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18195: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:18210: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test "$ac_cv_lib_bsd_strlcat" = yes; then @@ -18215,23 +18230,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18218: checking for $ac_header" >&5 +echo "$as_me:18233: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18224 "configure" +#line 18239 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18228: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18243: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18234: \$? = $ac_status" >&5 + echo "$as_me:18249: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18250,7 +18265,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18253: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18268: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18289: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18280 "configure" +#line 18295 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18308,16 +18323,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18326: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18314: \$? = $ac_status" >&5 + echo "$as_me:18329: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18317: \"$ac_try\"") >&5 + { (eval echo "$as_me:18332: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18320: \$? = $ac_status" >&5 + echo "$as_me:18335: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18327,7 +18342,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18330: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18345: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18358: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -18350,7 +18365,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:18353: result: $with_assertions" >&5 +echo "$as_me:18368: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -18366,7 +18381,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:18369: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:18384: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -18388,7 +18403,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:18391: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:18406: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -18502,23 +18517,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:18505: checking for dmalloc.h" >&5 + echo "$as_me:18520: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18511 "configure" +#line 18526 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18515: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18530: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18521: \$? = $ac_status" >&5 + echo "$as_me:18536: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18537,11 +18552,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18540: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:18555: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:18544: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:18559: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18549,7 +18564,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18552 "configure" +#line 18567 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18558,7 +18573,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dmalloc_debug (); +char dmalloc_debug (void); int main (void) { @@ -18568,16 +18583,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18571: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18586: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18574: \$? = $ac_status" >&5 + echo "$as_me:18589: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18577: \"$ac_try\"") >&5 + { (eval echo "$as_me:18592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18580: \$? = $ac_status" >&5 + echo "$as_me:18595: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -18588,7 +18603,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18591: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:18606: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18621: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -18625,7 +18640,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:18628: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:18643: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -18739,23 +18754,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:18742: checking for dbmalloc.h" >&5 + echo "$as_me:18757: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18748 "configure" +#line 18763 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18752: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18767: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18758: \$? = $ac_status" >&5 + echo "$as_me:18773: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18774,11 +18789,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18777: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:18792: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:18781: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:18796: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18786,7 +18801,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18789 "configure" +#line 18804 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18795,7 +18810,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char debug_malloc (); +char debug_malloc (void); int main (void) { @@ -18805,16 +18820,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18808: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18823: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18811: \$? = $ac_status" >&5 + echo "$as_me:18826: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18814: \"$ac_try\"") >&5 + { (eval echo "$as_me:18829: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18817: \$? = $ac_status" >&5 + echo "$as_me:18832: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -18825,7 +18840,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18828: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:18843: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18858: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -18862,7 +18877,7 @@ EOF else with_valgrind= fi; -echo "$as_me:18865: result: ${with_valgrind:-no}" >&5 +echo "$as_me:18880: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -18975,7 +18990,7 @@ fi ;; esac -echo "$as_me:18978: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:18993: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -18986,7 +19001,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:18989: result: $with_no_leaks" >&5 +echo "$as_me:19004: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -19038,7 +19053,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:19041: checking whether to add trace feature to all models" >&5 +echo "$as_me:19056: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -19048,7 +19063,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:19051: result: $cf_with_trace" >&5 +echo "$as_me:19066: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -19162,7 +19177,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:19165: checking if we want to use GNAT projects" >&5 +echo "$as_me:19180: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -19179,7 +19194,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:19182: result: $enable_gnat_projects" >&5 +echo "$as_me:19197: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -19192,14 +19207,14 @@ case "$cf_cv_system_name" in CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" fi -echo "$as_me:19195: checking if ssp library is needed" >&5 +echo "$as_me:19210: checking if ssp library is needed" >&5 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 if test "${cf_cv_need_libssp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19202 "configure" +#line 19217 "configure" #include "confdefs.h" #include @@ -19216,16 +19231,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19219: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19234: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19222: \$? = $ac_status" >&5 + echo "$as_me:19237: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19225: \"$ac_try\"") >&5 + { (eval echo "$as_me:19240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19228: \$? = $ac_status" >&5 + echo "$as_me:19243: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=no else @@ -19235,7 +19250,7 @@ cat "conftest.$ac_ext" >&5 cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" cat >"conftest.$ac_ext" <<_ACEOF -#line 19238 "configure" +#line 19253 "configure" #include "confdefs.h" #include @@ -19252,16 +19267,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19255: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19270: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19258: \$? = $ac_status" >&5 + echo "$as_me:19273: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19261: \"$ac_try\"") >&5 + { (eval echo "$as_me:19276: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19264: \$? = $ac_status" >&5 + echo "$as_me:19279: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=yes else @@ -19275,7 +19290,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19278: result: $cf_cv_need_libssp" >&5 +echo "$as_me:19293: result: $cf_cv_need_libssp" >&5 echo "${ECHO_T}$cf_cv_need_libssp" >&6 if test "x$cf_cv_need_libssp" = xyes @@ -19304,14 +19319,14 @@ fi ;; esac -echo "$as_me:19307: checking if -lm needed for math functions" >&5 +echo "$as_me:19322: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19314 "configure" +#line 19329 "configure" #include "confdefs.h" #include @@ -19327,16 +19342,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19330: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19333: \$? = $ac_status" >&5 + echo "$as_me:19348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19336: \"$ac_try\"") >&5 + { (eval echo "$as_me:19351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19339: \$? = $ac_status" >&5 + echo "$as_me:19354: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libm=no else @@ -19346,7 +19361,7 @@ cf_cv_need_libm=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19349: result: $cf_cv_need_libm" >&5 +echo "$as_me:19364: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes @@ -19354,14 +19369,14 @@ then cf_save_LIBS="$LIBS" LIBS="$LIBS -lm" - echo "$as_me:19357: checking if -lm is available for math functions" >&5 + echo "$as_me:19372: checking if -lm is available for math functions" >&5 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 if test "${cf_cv_have_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19364 "configure" +#line 19379 "configure" #include "confdefs.h" #include @@ -19377,16 +19392,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19380: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19395: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19383: \$? = $ac_status" >&5 + echo "$as_me:19398: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19386: \"$ac_try\"") >&5 + { (eval echo "$as_me:19401: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19389: \$? = $ac_status" >&5 + echo "$as_me:19404: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_libm=yes else @@ -19396,7 +19411,7 @@ cf_cv_have_libm=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19399: result: $cf_cv_have_libm" >&5 +echo "$as_me:19414: result: $cf_cv_have_libm" >&5 echo "${ECHO_T}$cf_cv_have_libm" >&6 LIBS="$cf_save_LIBS" @@ -19418,13 +19433,13 @@ EOF fi ### Checks for header files. -echo "$as_me:19421: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:19436: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19427 "configure" +#line 19442 "configure" #include "confdefs.h" #include #include @@ -19440,16 +19455,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19443: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19458: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19446: \$? = $ac_status" >&5 + echo "$as_me:19461: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19449: \"$ac_try\"") >&5 + { (eval echo "$as_me:19464: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19452: \$? = $ac_status" >&5 + echo "$as_me:19467: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -19459,7 +19474,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19462: result: $ac_cv_header_time" >&5 +echo "$as_me:19477: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -19474,7 +19489,7 @@ cf_regex_libs= case "$host_os" in (mingw*) # -lsystre -ltre -lintl -liconv - echo "$as_me:19477: checking for regcomp in -lsystre" >&5 + echo "$as_me:19492: checking for regcomp in -lsystre" >&5 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 if test "${ac_cv_lib_systre_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19482,7 +19497,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsystre $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19485 "configure" +#line 19500 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19491,7 +19506,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -19501,16 +19516,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19504: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19519: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19507: \$? = $ac_status" >&5 + echo "$as_me:19522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19510: \"$ac_try\"") >&5 + { (eval echo "$as_me:19525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19513: \$? = $ac_status" >&5 + echo "$as_me:19528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_systre_regcomp=yes else @@ -19521,11 +19536,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19524: result: $ac_cv_lib_systre_regcomp" >&5 +echo "$as_me:19539: result: $ac_cv_lib_systre_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 if test "$ac_cv_lib_systre_regcomp" = yes; then - echo "$as_me:19528: checking for libiconv_open in -liconv" >&5 + echo "$as_me:19543: checking for libiconv_open in -liconv" >&5 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19533,7 +19548,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-liconv $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19536 "configure" +#line 19551 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19542,7 +19557,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char libiconv_open (); +char libiconv_open (void); int main (void) { @@ -19552,16 +19567,16 @@ libiconv_open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19555: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19558: \$? = $ac_status" >&5 + echo "$as_me:19573: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19561: \"$ac_try\"") >&5 + { (eval echo "$as_me:19576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19564: \$? = $ac_status" >&5 + echo "$as_me:19579: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_iconv_libiconv_open=yes else @@ -19572,7 +19587,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19575: result: $ac_cv_lib_iconv_libiconv_open" >&5 +echo "$as_me:19590: result: $ac_cv_lib_iconv_libiconv_open" >&5 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then @@ -19594,7 +19609,7 @@ LIBS="$cf_add_libs" fi - echo "$as_me:19597: checking for libintl_gettext in -lintl" >&5 + echo "$as_me:19612: checking for libintl_gettext in -lintl" >&5 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19602,7 +19617,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19605 "configure" +#line 19620 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19611,7 +19626,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char libintl_gettext (); +char libintl_gettext (void); int main (void) { @@ -19621,16 +19636,16 @@ libintl_gettext (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19627: \$? = $ac_status" >&5 + echo "$as_me:19642: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19630: \"$ac_try\"") >&5 + { (eval echo "$as_me:19645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19633: \$? = $ac_status" >&5 + echo "$as_me:19648: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_intl_libintl_gettext=yes else @@ -19641,7 +19656,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19644: result: $ac_cv_lib_intl_libintl_gettext" >&5 +echo "$as_me:19659: result: $ac_cv_lib_intl_libintl_gettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then @@ -19663,7 +19678,7 @@ LIBS="$cf_add_libs" fi - echo "$as_me:19666: checking for tre_regcomp in -ltre" >&5 + echo "$as_me:19681: checking for tre_regcomp in -ltre" >&5 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19671,7 +19686,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ltre $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19674 "configure" +#line 19689 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19680,7 +19695,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tre_regcomp (); +char tre_regcomp (void); int main (void) { @@ -19690,16 +19705,16 @@ tre_regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19693: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19708: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19696: \$? = $ac_status" >&5 + echo "$as_me:19711: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19699: \"$ac_try\"") >&5 + { (eval echo "$as_me:19714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19702: \$? = $ac_status" >&5 + echo "$as_me:19717: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_tre_tre_regcomp=yes else @@ -19710,7 +19725,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19713: result: $ac_cv_lib_tre_tre_regcomp" >&5 +echo "$as_me:19728: result: $ac_cv_lib_tre_tre_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then @@ -19752,7 +19767,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:19755: checking for regcomp in -lgnurx" >&5 + echo "$as_me:19770: checking for regcomp in -lgnurx" >&5 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19760,7 +19775,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnurx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19763 "configure" +#line 19778 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19769,7 +19784,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -19779,16 +19794,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19782: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19797: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19785: \$? = $ac_status" >&5 + echo "$as_me:19800: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19788: \"$ac_try\"") >&5 + { (eval echo "$as_me:19803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19791: \$? = $ac_status" >&5 + echo "$as_me:19806: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gnurx_regcomp=yes else @@ -19799,7 +19814,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19802: result: $ac_cv_lib_gnurx_regcomp" >&5 +echo "$as_me:19817: result: $ac_cv_lib_gnurx_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 if test "$ac_cv_lib_gnurx_regcomp" = yes; then @@ -19827,13 +19842,13 @@ fi ;; (*) cf_regex_libs="regex re" - echo "$as_me:19830: checking for regcomp" >&5 + echo "$as_me:19845: checking for regcomp" >&5 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 if test "${ac_cv_func_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19836 "configure" +#line 19851 "configure" #include "confdefs.h" #define regcomp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19864,16 +19879,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19867: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19882: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19870: \$? = $ac_status" >&5 + echo "$as_me:19885: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19873: \"$ac_try\"") >&5 + { (eval echo "$as_me:19888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19876: \$? = $ac_status" >&5 + echo "$as_me:19891: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_regcomp=yes else @@ -19883,7 +19898,7 @@ ac_cv_func_regcomp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19886: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:19901: result: $ac_cv_func_regcomp" >&5 echo "${ECHO_T}$ac_cv_func_regcomp" >&6 if test "$ac_cv_func_regcomp" = yes; then cf_regex_func=regcomp @@ -19892,7 +19907,7 @@ else for cf_regex_lib in $cf_regex_libs do as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:19895: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:19910: checking for regcomp in -l$cf_regex_lib" >&5 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19900,7 +19915,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19903 "configure" +#line 19918 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19909,7 +19924,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -19919,16 +19934,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19922: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19925: \$? = $ac_status" >&5 + echo "$as_me:19940: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19928: \"$ac_try\"") >&5 + { (eval echo "$as_me:19943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19931: \$? = $ac_status" >&5 + echo "$as_me:19946: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -19939,7 +19954,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19942: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:19957: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -19971,13 +19986,13 @@ fi esac if test "$cf_regex_func" = no ; then - echo "$as_me:19974: checking for compile" >&5 + echo "$as_me:19989: checking for compile" >&5 echo $ECHO_N "checking for compile... $ECHO_C" >&6 if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19980 "configure" +#line 19995 "configure" #include "confdefs.h" #define compile autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20008,16 +20023,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20026: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20014: \$? = $ac_status" >&5 + echo "$as_me:20029: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20017: \"$ac_try\"") >&5 + { (eval echo "$as_me:20032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20020: \$? = $ac_status" >&5 + echo "$as_me:20035: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_compile=yes else @@ -20027,13 +20042,13 @@ ac_cv_func_compile=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20030: result: $ac_cv_func_compile" >&5 +echo "$as_me:20045: result: $ac_cv_func_compile" >&5 echo "${ECHO_T}$ac_cv_func_compile" >&6 if test "$ac_cv_func_compile" = yes; then cf_regex_func=compile else - echo "$as_me:20036: checking for compile in -lgen" >&5 + echo "$as_me:20051: checking for compile in -lgen" >&5 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20041,7 +20056,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20044 "configure" +#line 20059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20050,7 +20065,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char compile (); +char compile (void); int main (void) { @@ -20060,16 +20075,16 @@ compile (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20063: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20078: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20066: \$? = $ac_status" >&5 + echo "$as_me:20081: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20069: \"$ac_try\"") >&5 + { (eval echo "$as_me:20084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20072: \$? = $ac_status" >&5 + echo "$as_me:20087: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gen_compile=yes else @@ -20080,7 +20095,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20083: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:20098: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test "$ac_cv_lib_gen_compile" = yes; then @@ -20108,11 +20123,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:20111: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:20126: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:20115: checking for regular-expression headers" >&5 +echo "$as_me:20130: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20124,7 +20139,7 @@ case "$cf_regex_func" in for cf_regex_hdr in regexp.h regexpr.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20127 "configure" +#line 20142 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -20141,16 +20156,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20144: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20159: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20147: \$? = $ac_status" >&5 + echo "$as_me:20162: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20150: \"$ac_try\"") >&5 + { (eval echo "$as_me:20165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20153: \$? = $ac_status" >&5 + echo "$as_me:20168: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -20167,7 +20182,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" for cf_regex_hdr in regex.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20170 "configure" +#line 20185 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -20187,16 +20202,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20205: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20193: \$? = $ac_status" >&5 + echo "$as_me:20208: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20196: \"$ac_try\"") >&5 + { (eval echo "$as_me:20211: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20199: \$? = $ac_status" >&5 + echo "$as_me:20214: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -20212,11 +20227,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" esac fi -echo "$as_me:20215: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:20230: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case "$cf_cv_regex_hdrs" in - (no) { echo "$as_me:20219: WARNING: no regular expression header found" >&5 + (no) { echo "$as_me:20234: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; (regex.h) cat >>confdefs.h <<\EOF @@ -20254,23 +20269,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20257: checking for $ac_header" >&5 +echo "$as_me:20272: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20263 "configure" +#line 20278 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20267: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20282: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20273: \$? = $ac_status" >&5 + echo "$as_me:20288: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20289,7 +20304,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:20307: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20320: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20311 "configure" +#line 20326 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20315: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20330: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20321: \$? = $ac_status" >&5 + echo "$as_me:20336: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20337,7 +20352,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20340: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:20355: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20365: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20357,7 +20372,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20360 "configure" +#line 20375 "configure" #include "confdefs.h" #include <$cf_header> @@ -20370,16 +20385,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20373: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20388: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20376: \$? = $ac_status" >&5 + echo "$as_me:20391: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20379: \"$ac_try\"") >&5 + { (eval echo "$as_me:20394: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20382: \$? = $ac_status" >&5 + echo "$as_me:20397: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -20391,7 +20406,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:20394: result: $cf_cv_getopt_header" >&5 +echo "$as_me:20409: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -20408,14 +20423,14 @@ EOF fi -echo "$as_me:20411: checking if external environ is declared" >&5 +echo "$as_me:20426: checking if external environ is declared" >&5 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_environ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20418 "configure" +#line 20433 "configure" #include "confdefs.h" $ac_includes_default @@ -20428,16 +20443,16 @@ void* x = (void*) environ; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20431: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20434: \$? = $ac_status" >&5 + echo "$as_me:20449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20437: \"$ac_try\"") >&5 + { (eval echo "$as_me:20452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20440: \$? = $ac_status" >&5 + echo "$as_me:20455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_environ=yes else @@ -20448,7 +20463,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20451: result: $cf_cv_dcl_environ" >&5 +echo "$as_me:20466: result: $cf_cv_dcl_environ" >&5 echo "${ECHO_T}$cf_cv_dcl_environ" >&6 if test "$cf_cv_dcl_environ" = no ; then @@ -20463,14 +20478,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:20466: checking if external environ exists" >&5 +echo "$as_me:20481: checking if external environ exists" >&5 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 if test "${cf_cv_have_environ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20473 "configure" +#line 20488 "configure" #include "confdefs.h" #undef environ @@ -20485,16 +20500,16 @@ environ = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20488: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20503: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20491: \$? = $ac_status" >&5 + echo "$as_me:20506: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20494: \"$ac_try\"") >&5 + { (eval echo "$as_me:20509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20497: \$? = $ac_status" >&5 + echo "$as_me:20512: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_environ=yes else @@ -20505,7 +20520,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20508: result: $cf_cv_have_environ" >&5 +echo "$as_me:20523: result: $cf_cv_have_environ" >&5 echo "${ECHO_T}$cf_cv_have_environ" >&6 if test "$cf_cv_have_environ" = yes ; then @@ -20518,13 +20533,13 @@ EOF fi -echo "$as_me:20521: checking for getenv" >&5 +echo "$as_me:20536: checking for getenv" >&5 echo $ECHO_N "checking for getenv... $ECHO_C" >&6 if test "${ac_cv_func_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20527 "configure" +#line 20542 "configure" #include "confdefs.h" #define getenv autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20555,16 +20570,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20558: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20573: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20561: \$? = $ac_status" >&5 + echo "$as_me:20576: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20564: \"$ac_try\"") >&5 + { (eval echo "$as_me:20579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20567: \$? = $ac_status" >&5 + echo "$as_me:20582: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_getenv=yes else @@ -20574,19 +20589,19 @@ ac_cv_func_getenv=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20577: result: $ac_cv_func_getenv" >&5 +echo "$as_me:20592: result: $ac_cv_func_getenv" >&5 echo "${ECHO_T}$ac_cv_func_getenv" >&6 for ac_func in putenv setenv strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:20583: checking for $ac_func" >&5 +echo "$as_me:20598: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20589 "configure" +#line 20604 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20617,16 +20632,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20620: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20635: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20623: \$? = $ac_status" >&5 + echo "$as_me:20638: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20626: \"$ac_try\"") >&5 + { (eval echo "$as_me:20641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20629: \$? = $ac_status" >&5 + echo "$as_me:20644: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -20636,7 +20651,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20639: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:20654: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20664: checking if getenv returns consistent values" >&5 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 if test "${cf_cv_consistent_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20656,7 +20671,7 @@ if test "$cross_compiling" = yes; then cf_cv_consistent_getenv=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 20659 "configure" +#line 20674 "configure" #include "confdefs.h" $ac_includes_default @@ -20761,15 +20776,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20764: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20779: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20767: \$? = $ac_status" >&5 + echo "$as_me:20782: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20769: \"$ac_try\"") >&5 + { (eval echo "$as_me:20784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20772: \$? = $ac_status" >&5 + echo "$as_me:20787: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_consistent_getenv=yes else @@ -20782,7 +20797,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:20785: result: $cf_cv_consistent_getenv" >&5 +echo "$as_me:20800: result: $cf_cv_consistent_getenv" >&5 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 if test "x$cf_cv_consistent_getenv" = xno @@ -20797,18 +20812,18 @@ fi if test "x$cf_cv_consistent_getenv" = xno && \ test "x$cf_with_trace" = xyes then - { echo "$as_me:20800: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + { echo "$as_me:20815: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} fi -echo "$as_me:20804: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:20819: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20811 "configure" +#line 20826 "configure" #include "confdefs.h" #include @@ -20828,16 +20843,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20846: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20834: \$? = $ac_status" >&5 + echo "$as_me:20849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20837: \"$ac_try\"") >&5 + { (eval echo "$as_me:20852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20840: \$? = $ac_status" >&5 + echo "$as_me:20855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -20849,7 +20864,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20852: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:20867: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -20864,13 +20879,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:20867: checking for an ANSI C-conforming const" >&5 +echo "$as_me:20882: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20873 "configure" +#line 20888 "configure" #include "confdefs.h" int @@ -20880,13 +20895,13 @@ main (void) #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset x; (void)x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; - static struct point const zero = {0,0}; + static struct point const zero = {0,0}; (void)zero; /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant @@ -20902,16 +20917,19 @@ main (void) char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + (void)s; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; const int *foo = &x[0]; ++foo; + (void)foo; } { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ typedef const int *iptr; iptr p = 0; ++p; + (void)p; } { /* AIX XL C 1.02.0.0 rejects this saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ @@ -20920,6 +20938,7 @@ main (void) } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + (void)foo; } #endif @@ -20928,16 +20947,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20931: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20950: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20934: \$? = $ac_status" >&5 + echo "$as_me:20953: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20937: \"$ac_try\"") >&5 + { (eval echo "$as_me:20956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20940: \$? = $ac_status" >&5 + echo "$as_me:20959: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -20947,7 +20966,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20950: result: $ac_cv_c_const" >&5 +echo "$as_me:20969: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -20957,7 +20976,7 @@ EOF fi -echo "$as_me:20960: checking for inline" >&5 +echo "$as_me:20979: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20965,25 +20984,25 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >"conftest.$ac_ext" <<_ACEOF -#line 20968 "configure" +#line 20987 "configure" #include "confdefs.h" #ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } +static $ac_kw int static_foo (void) {return 0; } +$ac_kw int foo (void) {return 0; } #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20996: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20980: \$? = $ac_status" >&5 + echo "$as_me:20999: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20983: \"$ac_try\"") >&5 + { (eval echo "$as_me:21002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20986: \$? = $ac_status" >&5 + echo "$as_me:21005: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -20994,7 +21013,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:20997: result: $ac_cv_c_inline" >&5 +echo "$as_me:21016: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -21020,7 +21039,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:21023: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:21042: checking if $CC supports options to tune inlining" >&5 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21029,7 +21048,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >"conftest.$ac_ext" <<_ACEOF -#line 21032 "configure" +#line 21051 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -21041,16 +21060,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21044: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21047: \$? = $ac_status" >&5 + echo "$as_me:21066: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21050: \"$ac_try\"") >&5 + { (eval echo "$as_me:21069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21053: \$? = $ac_status" >&5 + echo "$as_me:21072: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gcc_inline=yes else @@ -21062,7 +21081,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:21065: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:21084: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -21168,7 +21187,7 @@ fi fi fi -echo "$as_me:21171: checking for signal global datatype" >&5 +echo "$as_me:21190: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21180,7 +21199,7 @@ else "int" do cat >"conftest.$ac_ext" <<_ACEOF -#line 21183 "configure" +#line 21202 "configure" #include "confdefs.h" #include @@ -21204,16 +21223,16 @@ signal(SIGINT, handler); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21207: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21210: \$? = $ac_status" >&5 + echo "$as_me:21229: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21213: \"$ac_try\"") >&5 + { (eval echo "$as_me:21232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21216: \$? = $ac_status" >&5 + echo "$as_me:21235: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -21227,7 +21246,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21230: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:21249: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:21258: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21246,7 +21265,7 @@ else cf_cv_typeof_chtype=long else cat >"conftest.$ac_ext" <<_ACEOF -#line 21249 "configure" +#line 21268 "configure" #include "confdefs.h" $ac_includes_default @@ -21281,15 +21300,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21284: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21303: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21287: \$? = $ac_status" >&5 + echo "$as_me:21306: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21289: \"$ac_try\"") >&5 + { (eval echo "$as_me:21308: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21292: \$? = $ac_status" >&5 + echo "$as_me:21311: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -21304,7 +21323,7 @@ fi fi -echo "$as_me:21307: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:21326: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:21338: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21326 "configure" +#line 21345 "configure" #include "confdefs.h" int @@ -21335,16 +21354,16 @@ long x = 1L + 1UL + 1U + 1; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21338: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21341: \$? = $ac_status" >&5 + echo "$as_me:21360: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21344: \"$ac_try\"") >&5 + { (eval echo "$as_me:21363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21347: \$? = $ac_status" >&5 + echo "$as_me:21366: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unsigned_literals=yes else @@ -21356,7 +21375,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21359: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:21378: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -21372,14 +21391,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:21375: checking if external errno is declared" >&5 +echo "$as_me:21394: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21382 "configure" +#line 21401 "configure" #include "confdefs.h" $ac_includes_default @@ -21393,16 +21412,16 @@ int x = (int) errno; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21396: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21415: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21399: \$? = $ac_status" >&5 + echo "$as_me:21418: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21402: \"$ac_try\"") >&5 + { (eval echo "$as_me:21421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21405: \$? = $ac_status" >&5 + echo "$as_me:21424: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_errno=yes else @@ -21413,7 +21432,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21416: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:21435: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -21428,14 +21447,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:21431: checking if external errno exists" >&5 +echo "$as_me:21450: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21438 "configure" +#line 21457 "configure" #include "confdefs.h" #undef errno @@ -21450,16 +21469,16 @@ errno = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21453: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21472: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21456: \$? = $ac_status" >&5 + echo "$as_me:21475: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21459: \"$ac_try\"") >&5 + { (eval echo "$as_me:21478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21462: \$? = $ac_status" >&5 + echo "$as_me:21481: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_errno=yes else @@ -21470,7 +21489,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21473: result: $cf_cv_have_errno" >&5 +echo "$as_me:21492: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -21483,7 +21502,7 @@ EOF fi -echo "$as_me:21486: checking if data-only library module links" >&5 +echo "$as_me:21505: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21491,20 +21510,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21500: \$? = $ac_status" >&5 + echo "$as_me:21519: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:21543: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21527: \$? = $ac_status" >&5 + echo "$as_me:21546: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -21537,7 +21556,7 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 21540 "configure" +#line 21559 "configure" #include "confdefs.h" extern int testfunc(void); @@ -21548,15 +21567,15 @@ else _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21551: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21554: \$? = $ac_status" >&5 + echo "$as_me:21573: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21556: \"$ac_try\"") >&5 + { (eval echo "$as_me:21575: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21559: \$? = $ac_status" >&5 + echo "$as_me:21578: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -21571,7 +21590,7 @@ fi fi -echo "$as_me:21574: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:21593: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -21585,14 +21604,14 @@ fi ### Checks for library functions. -echo "$as_me:21588: checking for clock_gettime" >&5 +echo "$as_me:21607: checking for clock_gettime" >&5 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 if test "${cf_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21595 "configure" +#line 21614 "configure" #include "confdefs.h" #include int @@ -21605,16 +21624,16 @@ struct timespec ts; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21608: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21627: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21611: \$? = $ac_status" >&5 + echo "$as_me:21630: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21614: \"$ac_try\"") >&5 + { (eval echo "$as_me:21633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21617: \$? = $ac_status" >&5 + echo "$as_me:21636: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -21625,7 +21644,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21628: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:21647: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 if test "$cf_cv_func_clock_gettime" = yes @@ -21636,13 +21655,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:21639: checking for gettimeofday" >&5 +echo "$as_me:21658: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21645 "configure" +#line 21664 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21673,16 +21692,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21676: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21695: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21679: \$? = $ac_status" >&5 + echo "$as_me:21698: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21682: \"$ac_try\"") >&5 + { (eval echo "$as_me:21701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21685: \$? = $ac_status" >&5 + echo "$as_me:21704: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -21692,7 +21711,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21695: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:21714: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -21702,7 +21721,7 @@ EOF else -echo "$as_me:21705: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:21724: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21710,7 +21729,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21713 "configure" +#line 21732 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21719,7 +21738,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettimeofday (); +char gettimeofday (void); int main (void) { @@ -21729,16 +21748,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21732: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21751: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21735: \$? = $ac_status" >&5 + echo "$as_me:21754: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21738: \"$ac_try\"") >&5 + { (eval echo "$as_me:21757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21741: \$? = $ac_status" >&5 + echo "$as_me:21760: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -21749,7 +21768,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21752: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:21771: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -21810,13 +21829,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:21813: checking for $ac_func" >&5 +echo "$as_me:21832: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21819 "configure" +#line 21838 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21847,16 +21866,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21850: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21869: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21853: \$? = $ac_status" >&5 + echo "$as_me:21872: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21856: \"$ac_try\"") >&5 + { (eval echo "$as_me:21875: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21859: \$? = $ac_status" >&5 + echo "$as_me:21878: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -21866,7 +21885,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21869: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:21888: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:21898: checking if _PATH_TTYS is defined in ttyent.h" >&5 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6 if test "${cf_cv_PATH_TTYS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21886 "configure" +#line 21905 "configure" #include "confdefs.h" #include @@ -21898,16 +21917,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21920: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21904: \$? = $ac_status" >&5 + echo "$as_me:21923: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21907: \"$ac_try\"") >&5 + { (eval echo "$as_me:21926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21910: \$? = $ac_status" >&5 + echo "$as_me:21929: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_PATH_TTYS=yes else @@ -21917,7 +21936,7 @@ cf_cv_PATH_TTYS=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21920: result: $cf_cv_PATH_TTYS" >&5 +echo "$as_me:21939: result: $cf_cv_PATH_TTYS" >&5 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6 if test $cf_cv_PATH_TTYS = no @@ -21939,7 +21958,7 @@ fi if test $cf_cv_PATH_TTYS != no then - echo "$as_me:21942: checking if _PATH_TTYS file exists" >&5 + echo "$as_me:21961: checking if _PATH_TTYS file exists" >&5 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6 if test "${cf_cv_have_PATH_TTYS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21949,7 +21968,7 @@ else cf_cv_have_PATH_TTYS=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 21952 "configure" +#line 21971 "configure" #include "confdefs.h" $ac_includes_default @@ -21962,15 +21981,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21984: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21968: \$? = $ac_status" >&5 + echo "$as_me:21987: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21970: \"$ac_try\"") >&5 + { (eval echo "$as_me:21989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21973: \$? = $ac_status" >&5 + echo "$as_me:21992: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_PATH_TTYS=yes else @@ -21982,7 +22001,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:21985: result: $cf_cv_have_PATH_TTYS" >&5 +echo "$as_me:22004: result: $cf_cv_have_PATH_TTYS" >&5 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6 test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no fi @@ -21994,14 +22013,14 @@ cat >>confdefs.h <<\EOF #define HAVE_PATH_TTYS 1 EOF - echo "$as_me:21997: checking for getttynam" >&5 + echo "$as_me:22016: checking for getttynam" >&5 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6 if test "${cf_cv_func_getttynam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22004 "configure" +#line 22023 "configure" #include "confdefs.h" #include int @@ -22013,16 +22032,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22019: \$? = $ac_status" >&5 + echo "$as_me:22038: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22022: \"$ac_try\"") >&5 + { (eval echo "$as_me:22041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22025: \$? = $ac_status" >&5 + echo "$as_me:22044: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_getttynam=yes else @@ -22032,7 +22051,7 @@ cf_cv_func_getttynam=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22035: result: $cf_cv_func_getttynam" >&5 +echo "$as_me:22054: result: $cf_cv_func_getttynam" >&5 echo "${ECHO_T}$cf_cv_func_getttynam" >&6 test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF #define HAVE_GETTTYNAM 1 @@ -22042,7 +22061,7 @@ fi if test "x$ac_cv_func_getopt" = xno && \ test "x$cf_with_progs$cf_with_tests" != xnono; then - { { echo "$as_me:22045: error: getopt is required for building programs" >&5 + { { echo "$as_me:22064: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -22051,7 +22070,7 @@ if test "x$with_safe_sprintf" = xyes then if test "x$ac_cv_func_vsnprintf" = xyes then - { echo "$as_me:22054: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + { echo "$as_me:22073: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} else @@ -22064,14 +22083,14 @@ fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:22067: checking for terminal-capability database functions" >&5 +echo "$as_me:22086: checking for terminal-capability database functions" >&5 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 if test "${cf_cv_cgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22074 "configure" +#line 22093 "configure" #include "confdefs.h" $ac_includes_default @@ -22091,16 +22110,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22113: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22097: \$? = $ac_status" >&5 + echo "$as_me:22116: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22100: \"$ac_try\"") >&5 + { (eval echo "$as_me:22119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22103: \$? = $ac_status" >&5 + echo "$as_me:22122: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cgetent=yes else @@ -22111,7 +22130,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22114: result: $cf_cv_cgetent" >&5 +echo "$as_me:22133: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -22121,14 +22140,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:22124: checking if cgetent uses const parameter" >&5 +echo "$as_me:22143: checking if cgetent uses const parameter" >&5 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 if test "${cf_cv_cgetent_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22131 "configure" +#line 22150 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -22151,16 +22170,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22154: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22173: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22157: \$? = $ac_status" >&5 + echo "$as_me:22176: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22160: \"$ac_try\"") >&5 + { (eval echo "$as_me:22179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22163: \$? = $ac_status" >&5 + echo "$as_me:22182: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cgetent_const=yes else @@ -22171,7 +22190,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22174: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:22193: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -22185,14 +22204,14 @@ fi fi -echo "$as_me:22188: checking for isascii" >&5 +echo "$as_me:22207: checking for isascii" >&5 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 if test "${cf_cv_have_isascii+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22195 "configure" +#line 22214 "configure" #include "confdefs.h" #include int @@ -22204,16 +22223,16 @@ int x = isascii(' '); (void)x } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22207: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22226: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22210: \$? = $ac_status" >&5 + echo "$as_me:22229: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22213: \"$ac_try\"") >&5 + { (eval echo "$as_me:22232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22216: \$? = $ac_status" >&5 + echo "$as_me:22235: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_isascii=yes else @@ -22224,7 +22243,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22227: result: $cf_cv_have_isascii" >&5 +echo "$as_me:22246: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -22232,10 +22251,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:22235: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:22254: checking whether sigaction needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 22238 "configure" +#line 22257 "configure" #include "confdefs.h" #include @@ -22249,16 +22268,16 @@ struct sigaction act; (void)act } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22252: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22255: \$? = $ac_status" >&5 + echo "$as_me:22274: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22258: \"$ac_try\"") >&5 + { (eval echo "$as_me:22277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22261: \$? = $ac_status" >&5 + echo "$as_me:22280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then sigact_bad=no else @@ -22266,7 +22285,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22269 "configure" +#line 22288 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -22281,16 +22300,16 @@ struct sigaction act; (void)act } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22303: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22287: \$? = $ac_status" >&5 + echo "$as_me:22306: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22290: \"$ac_try\"") >&5 + { (eval echo "$as_me:22309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22293: \$? = $ac_status" >&5 + echo "$as_me:22312: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then sigact_bad=yes @@ -22306,11 +22325,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:22309: result: $sigact_bad" >&5 +echo "$as_me:22328: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:22313: checking if nanosleep really works" >&5 +echo "$as_me:22332: checking if nanosleep really works" >&5 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 if test "${cf_cv_func_nanosleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22320,7 +22339,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 22323 "configure" +#line 22342 "configure" #include "confdefs.h" $ac_includes_default @@ -22346,15 +22365,15 @@ int main(void) { _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22349: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22368: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22352: \$? = $ac_status" >&5 + echo "$as_me:22371: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22354: \"$ac_try\"") >&5 + { (eval echo "$as_me:22373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22357: \$? = $ac_status" >&5 + echo "$as_me:22376: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_nanosleep=yes else @@ -22366,7 +22385,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:22369: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:22388: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -22383,23 +22402,23 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22386: checking for $ac_header" >&5 +echo "$as_me:22405: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22392 "configure" +#line 22411 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22396: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22415: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22402: \$? = $ac_status" >&5 + echo "$as_me:22421: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22418,7 +22437,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22421: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:22440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:22457: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 22441 "configure" +#line 22460 "configure" #include "confdefs.h" #include int @@ -22450,16 +22469,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22453: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22456: \$? = $ac_status" >&5 + echo "$as_me:22475: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22459: \"$ac_try\"") >&5 + { (eval echo "$as_me:22478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22462: \$? = $ac_status" >&5 + echo "$as_me:22481: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then termios_bad=no else @@ -22467,7 +22486,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22470 "configure" +#line 22489 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -22481,16 +22500,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22484: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22503: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22487: \$? = $ac_status" >&5 + echo "$as_me:22506: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22490: \"$ac_try\"") >&5 + { (eval echo "$as_me:22509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22493: \$? = $ac_status" >&5 + echo "$as_me:22512: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then termios_bad=unknown else @@ -22506,19 +22525,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:22509: result: $termios_bad" >&5 + echo "$as_me:22528: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:22514: checking for tcgetattr" >&5 +echo "$as_me:22533: checking for tcgetattr" >&5 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 if test "${cf_cv_have_tcgetattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22521 "configure" +#line 22540 "configure" #include "confdefs.h" #include @@ -22546,16 +22565,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22549: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22568: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22552: \$? = $ac_status" >&5 + echo "$as_me:22571: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22555: \"$ac_try\"") >&5 + { (eval echo "$as_me:22574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22558: \$? = $ac_status" >&5 + echo "$as_me:22577: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_tcgetattr=yes else @@ -22565,21 +22584,21 @@ cf_cv_have_tcgetattr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22568: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:22587: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:22575: checking for vsscanf function or workaround" >&5 +echo "$as_me:22594: checking for vsscanf function or workaround" >&5 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 if test "${cf_cv_func_vsscanf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22582 "configure" +#line 22601 "configure" #include "confdefs.h" #include @@ -22605,16 +22624,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22608: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22627: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22611: \$? = $ac_status" >&5 + echo "$as_me:22630: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22614: \"$ac_try\"") >&5 + { (eval echo "$as_me:22633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22617: \$? = $ac_status" >&5 + echo "$as_me:22636: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -22622,7 +22641,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22625 "configure" +#line 22644 "configure" #include "confdefs.h" #include @@ -22644,16 +22663,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22647: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22666: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22650: \$? = $ac_status" >&5 + echo "$as_me:22669: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22653: \"$ac_try\"") >&5 + { (eval echo "$as_me:22672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22656: \$? = $ac_status" >&5 + echo "$as_me:22675: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -22661,7 +22680,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22664 "configure" +#line 22683 "configure" #include "confdefs.h" #include @@ -22683,16 +22702,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22686: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22705: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22689: \$? = $ac_status" >&5 + echo "$as_me:22708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22692: \"$ac_try\"") >&5 + { (eval echo "$as_me:22711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22695: \$? = $ac_status" >&5 + echo "$as_me:22714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=_doscan else @@ -22707,7 +22726,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22710: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:22729: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case "$cf_cv_func_vsscanf" in @@ -22733,23 +22752,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22736: checking for $ac_header" >&5 +echo "$as_me:22755: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22742 "configure" +#line 22761 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22746: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22765: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22752: \$? = $ac_status" >&5 + echo "$as_me:22771: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22768,7 +22787,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22771: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:22790: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:22800: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22789,7 +22808,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 22792 "configure" +#line 22811 "configure" #include "confdefs.h" $ac_includes_default @@ -22824,15 +22843,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22827: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22830: \$? = $ac_status" >&5 + echo "$as_me:22849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22832: \"$ac_try\"") >&5 + { (eval echo "$as_me:22851: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22835: \$? = $ac_status" >&5 + echo "$as_me:22854: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -22847,16 +22866,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:22850: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:22869: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:22853: checking for mkstemp" >&5 + echo "$as_me:22872: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22859 "configure" +#line 22878 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22887,16 +22906,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22890: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22909: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22893: \$? = $ac_status" >&5 + echo "$as_me:22912: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22896: \"$ac_try\"") >&5 + { (eval echo "$as_me:22915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22899: \$? = $ac_status" >&5 + echo "$as_me:22918: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -22906,7 +22925,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22909: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:22928: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -22927,21 +22946,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:22930: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:22949: WARNING: cross compiling: assume setvbuf params not reversed" >&5 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} else - echo "$as_me:22933: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:22952: checking whether setvbuf arguments are reversed" >&5 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:22939: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22958: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 22944 "configure" +#line 22963 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -22958,15 +22977,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22961: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22964: \$? = $ac_status" >&5 + echo "$as_me:22983: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22966: \"$ac_try\"") >&5 + { (eval echo "$as_me:22985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22969: \$? = $ac_status" >&5 + echo "$as_me:22988: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -22979,7 +22998,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core ./core.* ./*.core fi -echo "$as_me:22982: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:23001: result: $ac_cv_func_setvbuf_reversed" >&5 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then @@ -22990,13 +23009,13 @@ EOF fi fi -echo "$as_me:22993: checking for intptr_t" >&5 +echo "$as_me:23012: checking for intptr_t" >&5 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22999 "configure" +#line 23018 "configure" #include "confdefs.h" $ac_includes_default int @@ -23011,16 +23030,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23014: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23017: \$? = $ac_status" >&5 + echo "$as_me:23036: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23020: \"$ac_try\"") >&5 + { (eval echo "$as_me:23039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23023: \$? = $ac_status" >&5 + echo "$as_me:23042: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_intptr_t=yes else @@ -23030,7 +23049,7 @@ ac_cv_type_intptr_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23033: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:23052: result: $ac_cv_type_intptr_t" >&5 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 if test "$ac_cv_type_intptr_t" = yes; then : @@ -23042,13 +23061,13 @@ EOF fi -echo "$as_me:23045: checking for ssize_t" >&5 +echo "$as_me:23064: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23051 "configure" +#line 23070 "configure" #include "confdefs.h" $ac_includes_default int @@ -23063,16 +23082,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23066: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23085: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23069: \$? = $ac_status" >&5 + echo "$as_me:23088: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23072: \"$ac_try\"") >&5 + { (eval echo "$as_me:23091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23075: \$? = $ac_status" >&5 + echo "$as_me:23094: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_ssize_t=yes else @@ -23082,7 +23101,7 @@ ac_cv_type_ssize_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23085: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:23104: result: $ac_cv_type_ssize_t" >&5 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 if test "$ac_cv_type_ssize_t" = yes; then : @@ -23094,14 +23113,14 @@ EOF fi -echo "$as_me:23097: checking for type sigaction_t" >&5 +echo "$as_me:23116: checking for type sigaction_t" >&5 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 if test "${cf_cv_type_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23104 "configure" +#line 23123 "configure" #include "confdefs.h" #include @@ -23114,16 +23133,16 @@ sigaction_t x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23117: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23136: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23120: \$? = $ac_status" >&5 + echo "$as_me:23139: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23123: \"$ac_try\"") >&5 + { (eval echo "$as_me:23142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23126: \$? = $ac_status" >&5 + echo "$as_me:23145: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_sigaction=yes else @@ -23134,14 +23153,14 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23137: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:23156: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:23144: checking declaration of size-change" >&5 +echo "$as_me:23163: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23162,7 +23181,7 @@ do fi cat >"conftest.$ac_ext" <<_ACEOF -#line 23165 "configure" +#line 23184 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -23212,16 +23231,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23215: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23218: \$? = $ac_status" >&5 + echo "$as_me:23237: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23221: \"$ac_try\"") >&5 + { (eval echo "$as_me:23240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23224: \$? = $ac_status" >&5 + echo "$as_me:23243: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sizechange=yes else @@ -23240,7 +23259,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:23243: result: $cf_cv_sizechange" >&5 +echo "$as_me:23262: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -23258,13 +23277,13 @@ EOF esac fi -echo "$as_me:23261: checking for memmove" >&5 +echo "$as_me:23280: checking for memmove" >&5 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 if test "${ac_cv_func_memmove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23267 "configure" +#line 23286 "configure" #include "confdefs.h" #define memmove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23295,16 +23314,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23298: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23317: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23301: \$? = $ac_status" >&5 + echo "$as_me:23320: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23304: \"$ac_try\"") >&5 + { (eval echo "$as_me:23323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23307: \$? = $ac_status" >&5 + echo "$as_me:23326: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_memmove=yes else @@ -23314,19 +23333,19 @@ ac_cv_func_memmove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23317: result: $ac_cv_func_memmove" >&5 +echo "$as_me:23336: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 if test "$ac_cv_func_memmove" = yes; then : else -echo "$as_me:23323: checking for bcopy" >&5 +echo "$as_me:23342: checking for bcopy" >&5 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23329 "configure" +#line 23348 "configure" #include "confdefs.h" #define bcopy autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23357,16 +23376,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23379: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23363: \$? = $ac_status" >&5 + echo "$as_me:23382: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23366: \"$ac_try\"") >&5 + { (eval echo "$as_me:23385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23369: \$? = $ac_status" >&5 + echo "$as_me:23388: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_bcopy=yes else @@ -23376,11 +23395,11 @@ ac_cv_func_bcopy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23379: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:23398: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 if test "$ac_cv_func_bcopy" = yes; then - echo "$as_me:23383: checking if bcopy does overlapping moves" >&5 + echo "$as_me:23402: checking if bcopy does overlapping moves" >&5 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 if test "${cf_cv_good_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23390,7 +23409,7 @@ else cf_cv_good_bcopy=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 23393 "configure" +#line 23412 "configure" #include "confdefs.h" $ac_includes_default @@ -23406,15 +23425,15 @@ int main(void) { _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23409: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23428: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23412: \$? = $ac_status" >&5 + echo "$as_me:23431: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23414: \"$ac_try\"") >&5 + { (eval echo "$as_me:23433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23417: \$? = $ac_status" >&5 + echo "$as_me:23436: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_good_bcopy=yes else @@ -23427,7 +23446,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:23430: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:23449: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -23454,13 +23473,13 @@ tty >/dev/null 2>&1 || { for ac_func in posix_openpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:23457: checking for $ac_func" >&5 +echo "$as_me:23476: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23463 "configure" +#line 23482 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23491,16 +23510,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23494: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23513: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23497: \$? = $ac_status" >&5 + echo "$as_me:23516: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23500: \"$ac_try\"") >&5 + { (eval echo "$as_me:23519: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23503: \$? = $ac_status" >&5 + echo "$as_me:23522: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -23510,7 +23529,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23513: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:23532: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23542: checking if poll really works" >&5 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 if test "${cf_cv_working_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23530,7 +23549,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 23533 "configure" +#line 23552 "configure" #include "confdefs.h" $ac_includes_default @@ -23583,15 +23602,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23586: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23605: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23589: \$? = $ac_status" >&5 + echo "$as_me:23608: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23591: \"$ac_try\"") >&5 + { (eval echo "$as_me:23610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23594: \$? = $ac_status" >&5 + echo "$as_me:23613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_working_poll=yes else @@ -23603,21 +23622,21 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:23606: result: $cf_cv_working_poll" >&5 +echo "$as_me:23625: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:23613: checking for va_copy" >&5 +echo "$as_me:23632: checking for va_copy" >&5 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 if test "${cf_cv_have_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23620 "configure" +#line 23639 "configure" #include "confdefs.h" #include @@ -23634,16 +23653,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23637: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23656: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23640: \$? = $ac_status" >&5 + echo "$as_me:23659: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23643: \"$ac_try\"") >&5 + { (eval echo "$as_me:23662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23646: \$? = $ac_status" >&5 + echo "$as_me:23665: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_va_copy=yes else @@ -23653,7 +23672,7 @@ cf_cv_have_va_copy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23656: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:23675: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 if test "$cf_cv_have_va_copy" = yes; @@ -23665,14 +23684,14 @@ EOF else # !cf_cv_have_va_copy -echo "$as_me:23668: checking for __va_copy" >&5 +echo "$as_me:23687: checking for __va_copy" >&5 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 if test "${cf_cv_have___va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23675 "configure" +#line 23694 "configure" #include "confdefs.h" #include @@ -23689,16 +23708,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23692: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23695: \$? = $ac_status" >&5 + echo "$as_me:23714: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23698: \"$ac_try\"") >&5 + { (eval echo "$as_me:23717: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23701: \$? = $ac_status" >&5 + echo "$as_me:23720: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have___va_copy=yes else @@ -23708,7 +23727,7 @@ cf_cv_have___va_copy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23711: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:23730: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 if test "$cf_cv_have___va_copy" = yes @@ -23720,14 +23739,14 @@ EOF else # !cf_cv_have___va_copy -echo "$as_me:23723: checking for __builtin_va_copy" >&5 +echo "$as_me:23742: checking for __builtin_va_copy" >&5 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 if test "${cf_cv_have___builtin_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23730 "configure" +#line 23749 "configure" #include "confdefs.h" #include @@ -23744,16 +23763,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23766: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23750: \$? = $ac_status" >&5 + echo "$as_me:23769: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23753: \"$ac_try\"") >&5 + { (eval echo "$as_me:23772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23756: \$? = $ac_status" >&5 + echo "$as_me:23775: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have___builtin_va_copy=yes else @@ -23763,7 +23782,7 @@ cf_cv_have___builtin_va_copy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23766: result: $cf_cv_have___builtin_va_copy" >&5 +echo "$as_me:23785: result: $cf_cv_have___builtin_va_copy" >&5 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 test "$cf_cv_have___builtin_va_copy" = yes && @@ -23781,14 +23800,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy ;; (*) - echo "$as_me:23784: checking if we can simply copy va_list" >&5 + echo "$as_me:23803: checking if we can simply copy va_list" >&5 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 if test "${cf_cv_pointer_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23791 "configure" +#line 23810 "configure" #include "confdefs.h" #include @@ -23805,16 +23824,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23808: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23827: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23811: \$? = $ac_status" >&5 + echo "$as_me:23830: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23814: \"$ac_try\"") >&5 + { (eval echo "$as_me:23833: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23817: \$? = $ac_status" >&5 + echo "$as_me:23836: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_pointer_va_list=yes else @@ -23824,19 +23843,19 @@ cf_cv_pointer_va_list=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23827: result: $cf_cv_pointer_va_list" >&5 +echo "$as_me:23846: result: $cf_cv_pointer_va_list" >&5 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 if test "$cf_cv_pointer_va_list" = no then - echo "$as_me:23832: checking if we can copy va_list indirectly" >&5 + echo "$as_me:23851: checking if we can copy va_list indirectly" >&5 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 if test "${cf_cv_array_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23839 "configure" +#line 23858 "configure" #include "confdefs.h" #include @@ -23853,16 +23872,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23856: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23859: \$? = $ac_status" >&5 + echo "$as_me:23878: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23862: \"$ac_try\"") >&5 + { (eval echo "$as_me:23881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23865: \$? = $ac_status" >&5 + echo "$as_me:23884: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_array_va_list=yes else @@ -23872,7 +23891,7 @@ cf_cv_array_va_list=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23875: result: $cf_cv_array_va_list" >&5 +echo "$as_me:23894: result: $cf_cv_array_va_list" >&5 echo "${ECHO_T}$cf_cv_array_va_list" >&6 test "$cf_cv_array_va_list" = yes && cat >>confdefs.h <<\EOF @@ -23883,13 +23902,13 @@ EOF ;; esac -echo "$as_me:23886: checking for pid_t" >&5 +echo "$as_me:23905: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23892 "configure" +#line 23911 "configure" #include "confdefs.h" $ac_includes_default int @@ -23904,16 +23923,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23907: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23926: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23910: \$? = $ac_status" >&5 + echo "$as_me:23929: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23913: \"$ac_try\"") >&5 + { (eval echo "$as_me:23932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23916: \$? = $ac_status" >&5 + echo "$as_me:23935: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_pid_t=yes else @@ -23923,7 +23942,7 @@ ac_cv_type_pid_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23926: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:23945: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test "$ac_cv_type_pid_t" = yes; then : @@ -23938,23 +23957,23 @@ fi for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23941: checking for $ac_header" >&5 +echo "$as_me:23960: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23947 "configure" +#line 23966 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23951: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23970: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23957: \$? = $ac_status" >&5 + echo "$as_me:23976: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23973,7 +23992,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:23995: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:24008: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23995 "configure" +#line 24014 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -24023,16 +24042,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24026: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24029: \$? = $ac_status" >&5 + echo "$as_me:24048: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24032: \"$ac_try\"") >&5 + { (eval echo "$as_me:24051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24035: \$? = $ac_status" >&5 + echo "$as_me:24054: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -24042,7 +24061,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:24045: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:24064: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:24076: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24077,15 +24096,15 @@ else } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24080: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24099: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24083: \$? = $ac_status" >&5 + echo "$as_me:24102: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24085: \"$ac_try\"") >&5 + { (eval echo "$as_me:24104: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24088: \$? = $ac_status" >&5 + echo "$as_me:24107: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fork_works=yes else @@ -24097,7 +24116,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:24100: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:24119: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -24111,12 +24130,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:24114: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:24133: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:24119: checking for working vfork" >&5 + echo "$as_me:24138: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24125,7 +24144,7 @@ else ac_cv_func_vfork_works=cross else cat >"conftest.$ac_ext" <<_ACEOF -#line 24128 "configure" +#line 24147 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -24218,15 +24237,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24221: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24240: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24224: \$? = $ac_status" >&5 + echo "$as_me:24243: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24226: \"$ac_try\"") >&5 + { (eval echo "$as_me:24245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24229: \$? = $ac_status" >&5 + echo "$as_me:24248: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_vfork_works=yes else @@ -24238,13 +24257,13 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:24241: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:24260: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:24247: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:24266: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} fi @@ -24269,7 +24288,7 @@ EOF fi -echo "$as_me:24272: checking if fopen accepts explicit binary mode" >&5 +echo "$as_me:24291: checking if fopen accepts explicit binary mode" >&5 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 if test "${cf_cv_fopen_bin_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24279,7 +24298,7 @@ else cf_cv_fopen_bin_r=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 24282 "configure" +#line 24301 "configure" #include "confdefs.h" $ac_includes_default @@ -24314,15 +24333,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24336: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24320: \$? = $ac_status" >&5 + echo "$as_me:24339: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24322: \"$ac_try\"") >&5 + { (eval echo "$as_me:24341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24325: \$? = $ac_status" >&5 + echo "$as_me:24344: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fopen_bin_r=yes else @@ -24335,7 +24354,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:24338: result: $cf_cv_fopen_bin_r" >&5 +echo "$as_me:24357: result: $cf_cv_fopen_bin_r" >&5 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF @@ -24344,7 +24363,7 @@ EOF # special check for test/ditto.c -echo "$as_me:24347: checking for openpty in -lutil" >&5 +echo "$as_me:24366: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24352,7 +24371,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 24355 "configure" +#line 24374 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -24361,7 +24380,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char openpty (); +char openpty (void); int main (void) { @@ -24371,16 +24390,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24393: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24377: \$? = $ac_status" >&5 + echo "$as_me:24396: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24380: \"$ac_try\"") >&5 + { (eval echo "$as_me:24399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24383: \$? = $ac_status" >&5 + echo "$as_me:24402: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -24391,7 +24410,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:24394: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:24413: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes @@ -24399,7 +24418,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:24402: checking for openpty header" >&5 +echo "$as_me:24421: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24426,7 +24445,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 24429 "configure" +#line 24448 "configure" #include "confdefs.h" #include <$cf_header> @@ -24444,16 +24463,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24447: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24466: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24450: \$? = $ac_status" >&5 + echo "$as_me:24469: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24453: \"$ac_try\"") >&5 + { (eval echo "$as_me:24472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24456: \$? = $ac_status" >&5 + echo "$as_me:24475: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -24471,7 +24490,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:24474: result: $cf_cv_func_openpty" >&5 +echo "$as_me:24493: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -24544,7 +24563,7 @@ if test -n "$with_hashed_db/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 24547 "configure" +#line 24566 "configure" #include "confdefs.h" #include int @@ -24556,16 +24575,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24559: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24562: \$? = $ac_status" >&5 + echo "$as_me:24581: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24565: \"$ac_try\"") >&5 + { (eval echo "$as_me:24584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24568: \$? = $ac_status" >&5 + echo "$as_me:24587: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24582,7 +24601,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24585: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:24604: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24618,7 +24637,7 @@ if test -n "$with_hashed_db/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:24621: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:24640: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -24629,7 +24648,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:24632: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:24651: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -24701,7 +24720,7 @@ if test -n "$cf_item" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 24704 "configure" +#line 24723 "configure" #include "confdefs.h" #include int @@ -24713,16 +24732,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24716: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24735: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24719: \$? = $ac_status" >&5 + echo "$as_me:24738: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24722: \"$ac_try\"") >&5 + { (eval echo "$as_me:24741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24725: \$? = $ac_status" >&5 + echo "$as_me:24744: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24739,7 +24758,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24742: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:24761: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24819,7 +24838,7 @@ if test -n "$cf_item" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:24822: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:24841: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -24836,23 +24855,23 @@ fi fi esac -echo "$as_me:24839: checking for db.h" >&5 +echo "$as_me:24858: checking for db.h" >&5 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 24845 "configure" +#line 24864 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:24849: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:24868: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:24855: \$? = $ac_status" >&5 + echo "$as_me:24874: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -24871,11 +24890,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:24874: result: $ac_cv_header_db_h" >&5 +echo "$as_me:24893: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6 if test "$ac_cv_header_db_h" = yes; then -echo "$as_me:24878: checking for version of db" >&5 +echo "$as_me:24897: checking for version of db" >&5 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 if test "${cf_cv_hashed_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24886,10 +24905,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:24889: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:24908: testing checking for db version $cf_db_version ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 24892 "configure" +#line 24911 "configure" #include "confdefs.h" $ac_includes_default @@ -24919,16 +24938,16 @@ DBT *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24922: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24925: \$? = $ac_status" >&5 + echo "$as_me:24944: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24928: \"$ac_try\"") >&5 + { (eval echo "$as_me:24947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24931: \$? = $ac_status" >&5 + echo "$as_me:24950: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -24942,16 +24961,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:24945: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:24964: result: $cf_cv_hashed_db_version" >&5 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 if test "$cf_cv_hashed_db_version" = unknown ; then - { { echo "$as_me:24949: error: Cannot determine version of db" >&5 + { { echo "$as_me:24968: error: Cannot determine version of db" >&5 echo "$as_me: error: Cannot determine version of db" >&2;} { (exit 1); exit 1; }; } else -echo "$as_me:24954: checking for db libraries" >&5 +echo "$as_me:24973: checking for db libraries" >&5 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 if test "${cf_cv_hashed_db_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24981,10 +25000,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:24984: testing checking for library $cf_db_libs ..." 1>&5 +echo "${as_me:-configure}:25003: testing checking for library $cf_db_libs ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 24987 "configure" +#line 25006 "configure" #include "confdefs.h" $ac_includes_default @@ -25039,16 +25058,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25042: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25061: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25045: \$? = $ac_status" >&5 + echo "$as_me:25064: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25048: \"$ac_try\"") >&5 + { (eval echo "$as_me:25067: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25051: \$? = $ac_status" >&5 + echo "$as_me:25070: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test -n "$cf_db_libs" ; then @@ -25068,11 +25087,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:25071: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:25090: result: $cf_cv_hashed_db_libs" >&5 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 if test "$cf_cv_hashed_db_libs" = unknown ; then - { { echo "$as_me:25075: error: Cannot determine library for db" >&5 + { { echo "$as_me:25094: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then @@ -25098,7 +25117,7 @@ fi else - { { echo "$as_me:25101: error: Cannot find db.h" >&5 + { { echo "$as_me:25120: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -25113,7 +25132,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:25116: checking if we should include stdbool.h" >&5 +echo "$as_me:25135: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -25121,7 +25140,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >"conftest.$ac_ext" <<_ACEOF -#line 25124 "configure" +#line 25143 "configure" #include "confdefs.h" int @@ -25133,23 +25152,23 @@ bool foo = false; (void)foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25155: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25139: \$? = $ac_status" >&5 + echo "$as_me:25158: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25142: \"$ac_try\"") >&5 + { (eval echo "$as_me:25161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25145: \$? = $ac_status" >&5 + echo "$as_me:25164: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 25152 "configure" +#line 25171 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -25165,16 +25184,16 @@ bool foo = false; (void)foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25168: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25187: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25171: \$? = $ac_status" >&5 + echo "$as_me:25190: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25174: \"$ac_try\"") >&5 + { (eval echo "$as_me:25193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25177: \$? = $ac_status" >&5 + echo "$as_me:25196: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=1 else @@ -25188,13 +25207,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:25191: result: yes" >&5 +then echo "$as_me:25210: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:25193: result: no" >&5 +else echo "$as_me:25212: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:25197: checking for builtin bool type" >&5 +echo "$as_me:25216: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_cc_bool_type+set}" = set; then @@ -25202,7 +25221,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >"conftest.$ac_ext" <<_ACEOF -#line 25205 "configure" +#line 25224 "configure" #include "confdefs.h" #include @@ -25217,16 +25236,16 @@ bool x = false; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25220: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25223: \$? = $ac_status" >&5 + echo "$as_me:25242: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25226: \"$ac_try\"") >&5 + { (eval echo "$as_me:25245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25229: \$? = $ac_status" >&5 + echo "$as_me:25248: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cc_bool_type=1 else @@ -25239,9 +25258,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:25242: result: yes" >&5 +then echo "$as_me:25261: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:25244: result: no" >&5 +else echo "$as_me:25263: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -25258,10 +25277,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:25261: checking if we already have C++ library" >&5 + echo "$as_me:25280: checking if we already have C++ library" >&5 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 25264 "configure" +#line 25283 "configure" #include "confdefs.h" #include @@ -25275,16 +25294,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25278: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25297: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25281: \$? = $ac_status" >&5 + echo "$as_me:25300: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25284: \"$ac_try\"") >&5 + { (eval echo "$as_me:25303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25287: \$? = $ac_status" >&5 + echo "$as_me:25306: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_libstdcpp=yes else @@ -25293,7 +25312,7 @@ cat "conftest.$ac_ext" >&5 cf_have_libstdcpp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:25296: result: $cf_have_libstdcpp" >&5 + echo "$as_me:25315: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -25312,7 +25331,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:25315: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:25334: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25338,7 +25357,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 25341 "configure" +#line 25360 "configure" #include "confdefs.h" #include @@ -25352,16 +25371,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25355: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25374: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25358: \$? = $ac_status" >&5 + echo "$as_me:25377: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25361: \"$ac_try\"") >&5 + { (eval echo "$as_me:25380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25364: \$? = $ac_status" >&5 + echo "$as_me:25383: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_libstdcpp=yes else @@ -25373,7 +25392,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save" fi -echo "$as_me:25376: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:25395: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="$CXXLIBS" @@ -25395,7 +25414,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:25398: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:25417: checking whether $CXX understands -c and -o together" >&5 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CXX_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25410,15 +25429,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:25413: \"$ac_try\"") >&5 +if { (eval echo "$as_me:25432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25416: \$? = $ac_status" >&5 + echo "$as_me:25435: \$? = $ac_status" >&5 (exit "$ac_status"); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:25418: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:25437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25421: \$? = $ac_status" >&5 + echo "$as_me:25440: \$? = $ac_status" >&5 (exit "$ac_status"); }; then eval cf_cv_prog_CXX_c_o=yes @@ -25429,10 +25448,10 @@ rm -rf ./conftest* fi if test "$cf_cv_prog_CXX_c_o" = yes; then - echo "$as_me:25432: result: yes" >&5 + echo "$as_me:25451: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:25435: result: no" >&5 + echo "$as_me:25454: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -25452,7 +25471,7 @@ case "$cf_cv_system_name" in ;; esac if test "$GXX" = yes; then - echo "$as_me:25455: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:25474: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -25473,7 +25492,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 25476 "configure" +#line 25495 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -25487,16 +25506,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25490: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25509: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25493: \$? = $ac_status" >&5 + echo "$as_me:25512: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25496: \"$ac_try\"") >&5 + { (eval echo "$as_me:25515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25499: \$? = $ac_status" >&5 + echo "$as_me:25518: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cxx_library=yes @@ -25533,7 +25552,7 @@ else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 25536 "configure" +#line 25555 "configure" #include "confdefs.h" #include @@ -25547,16 +25566,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25550: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25569: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25553: \$? = $ac_status" >&5 + echo "$as_me:25572: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25556: \"$ac_try\"") >&5 + { (eval echo "$as_me:25575: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25559: \$? = $ac_status" >&5 + echo "$as_me:25578: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cxx_library=yes @@ -25589,7 +25608,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save" - echo "$as_me:25592: result: $cf_cxx_library" >&5 + echo "$as_me:25611: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -25605,7 +25624,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" -echo "$as_me:25608: checking how to run the C++ preprocessor" >&5 +echo "$as_me:25627: checking how to run the C++ preprocessor" >&5 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then @@ -25622,18 +25641,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 25625 "configure" +#line 25644 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:25630: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25649: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25636: \$? = $ac_status" >&5 + echo "$as_me:25655: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25656,17 +25675,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 25659 "configure" +#line 25678 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:25663: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25682: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25669: \$? = $ac_status" >&5 + echo "$as_me:25688: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25703,7 +25722,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:25706: result: $CXXCPP" >&5 +echo "$as_me:25725: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -25713,18 +25732,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 25716 "configure" +#line 25735 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:25721: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25740: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25727: \$? = $ac_status" >&5 + echo "$as_me:25746: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25747,17 +25766,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 25750 "configure" +#line 25769 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:25754: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25773: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25760: \$? = $ac_status" >&5 + echo "$as_me:25779: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25785,7 +25804,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:25788: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:25807: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -25800,23 +25819,23 @@ ac_main_return="return" for ac_header in typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:25803: checking for $ac_header" >&5 +echo "$as_me:25822: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25809 "configure" +#line 25828 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:25813: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25832: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25819: \$? = $ac_status" >&5 + echo "$as_me:25838: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25835,7 +25854,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:25838: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:25857: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:25870: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25857 "configure" +#line 25876 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:25861: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25880: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25867: \$? = $ac_status" >&5 + echo "$as_me:25886: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25883,7 +25902,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:25886: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:25905: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:25916: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 25900 "configure" +#line 25919 "configure" #include "confdefs.h" #include @@ -25914,16 +25933,16 @@ cerr << "testing" << endl; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25917: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25920: \$? = $ac_status" >&5 + echo "$as_me:25939: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25923: \"$ac_try\"") >&5 + { (eval echo "$as_me:25942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25926: \$? = $ac_status" >&5 + echo "$as_me:25945: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_iostream_namespace=yes else @@ -25932,7 +25951,7 @@ cat "conftest.$ac_ext" >&5 cf_iostream_namespace=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:25935: result: $cf_iostream_namespace" >&5 + echo "$as_me:25954: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -25943,7 +25962,7 @@ EOF fi fi -echo "$as_me:25946: checking if we should include stdbool.h" >&5 +echo "$as_me:25965: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -25951,7 +25970,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >"conftest.$ac_ext" <<_ACEOF -#line 25954 "configure" +#line 25973 "configure" #include "confdefs.h" int @@ -25963,23 +25982,23 @@ bool foo = false; (void)foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25985: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25969: \$? = $ac_status" >&5 + echo "$as_me:25988: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25972: \"$ac_try\"") >&5 + { (eval echo "$as_me:25991: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25975: \$? = $ac_status" >&5 + echo "$as_me:25994: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 25982 "configure" +#line 26001 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -25995,16 +26014,16 @@ bool foo = false; (void)foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25998: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26001: \$? = $ac_status" >&5 + echo "$as_me:26020: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26004: \"$ac_try\"") >&5 + { (eval echo "$as_me:26023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26007: \$? = $ac_status" >&5 + echo "$as_me:26026: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=1 else @@ -26018,13 +26037,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:26021: result: yes" >&5 +then echo "$as_me:26040: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:26023: result: no" >&5 +else echo "$as_me:26042: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:26027: checking for builtin bool type" >&5 +echo "$as_me:26046: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_builtin_bool+set}" = set; then @@ -26032,7 +26051,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >"conftest.$ac_ext" <<_ACEOF -#line 26035 "configure" +#line 26054 "configure" #include "confdefs.h" #include @@ -26047,16 +26066,16 @@ bool x = false; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26050: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26069: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26053: \$? = $ac_status" >&5 + echo "$as_me:26072: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26056: \"$ac_try\"") >&5 + { (eval echo "$as_me:26075: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26059: \$? = $ac_status" >&5 + echo "$as_me:26078: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_builtin_bool=1 else @@ -26069,19 +26088,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:26072: result: yes" >&5 +then echo "$as_me:26091: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:26074: result: no" >&5 +else echo "$as_me:26093: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:26078: checking for bool" >&5 +echo "$as_me:26097: checking for bool" >&5 echo $ECHO_N "checking for bool... $ECHO_C" >&6 if test "${ac_cv_type_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 26084 "configure" +#line 26103 "configure" #include "confdefs.h" $ac_includes_default @@ -26116,16 +26135,16 @@ if (sizeof (bool)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26119: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26138: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26122: \$? = $ac_status" >&5 + echo "$as_me:26141: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26125: \"$ac_try\"") >&5 + { (eval echo "$as_me:26144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26128: \$? = $ac_status" >&5 + echo "$as_me:26147: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_bool=yes else @@ -26135,10 +26154,10 @@ ac_cv_type_bool=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:26138: result: $ac_cv_type_bool" >&5 +echo "$as_me:26157: result: $ac_cv_type_bool" >&5 echo "${ECHO_T}$ac_cv_type_bool" >&6 -echo "$as_me:26141: checking size of bool" >&5 +echo "$as_me:26160: checking size of bool" >&5 echo $ECHO_N "checking size of bool... $ECHO_C" >&6 if test "${ac_cv_sizeof_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26147,7 +26166,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 26150 "configure" +#line 26169 "configure" #include "confdefs.h" $ac_includes_default @@ -26179,21 +26198,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26201: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26185: \$? = $ac_status" >&5 + echo "$as_me:26204: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26188: \"$ac_try\"") >&5 + { (eval echo "$as_me:26207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26191: \$? = $ac_status" >&5 + echo "$as_me:26210: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26196 "configure" +#line 26215 "configure" #include "confdefs.h" $ac_includes_default @@ -26225,16 +26244,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26228: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26231: \$? = $ac_status" >&5 + echo "$as_me:26250: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26234: \"$ac_try\"") >&5 + { (eval echo "$as_me:26253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26237: \$? = $ac_status" >&5 + echo "$as_me:26256: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -26250,7 +26269,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26253 "configure" +#line 26272 "configure" #include "confdefs.h" $ac_includes_default @@ -26282,16 +26301,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26285: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26304: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26288: \$? = $ac_status" >&5 + echo "$as_me:26307: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26291: \"$ac_try\"") >&5 + { (eval echo "$as_me:26310: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26294: \$? = $ac_status" >&5 + echo "$as_me:26313: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -26307,7 +26326,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 26310 "configure" +#line 26329 "configure" #include "confdefs.h" $ac_includes_default @@ -26339,16 +26358,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26342: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26361: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26345: \$? = $ac_status" >&5 + echo "$as_me:26364: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26348: \"$ac_try\"") >&5 + { (eval echo "$as_me:26367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26351: \$? = $ac_status" >&5 + echo "$as_me:26370: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -26361,12 +26380,12 @@ done ac_cv_sizeof_bool=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:26364: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:26383: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 26369 "configure" +#line 26388 "configure" #include "confdefs.h" $ac_includes_default @@ -26402,15 +26421,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26405: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26424: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26408: \$? = $ac_status" >&5 + echo "$as_me:26427: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26410: \"$ac_try\"") >&5 + { (eval echo "$as_me:26429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26413: \$? = $ac_status" >&5 + echo "$as_me:26432: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_bool=`cat conftest.val` else @@ -26426,13 +26445,13 @@ else ac_cv_sizeof_bool=0 fi fi -echo "$as_me:26429: result: $ac_cv_sizeof_bool" >&5 +echo "$as_me:26448: result: $ac_cv_sizeof_bool" >&5 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 cat >>confdefs.h <&5 +echo "$as_me:26454: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26451,7 +26470,7 @@ else else cat >"conftest.$ac_ext" <<_ACEOF -#line 26454 "configure" +#line 26473 "configure" #include "confdefs.h" $ac_includes_default @@ -26492,15 +26511,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26495: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26514: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26498: \$? = $ac_status" >&5 + echo "$as_me:26517: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26500: \"$ac_try\"") >&5 + { (eval echo "$as_me:26519: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26503: \$? = $ac_status" >&5 + echo "$as_me:26522: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -26517,19 +26536,19 @@ fi rm -f cf_test.out fi -echo "$as_me:26520: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:26539: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:26527: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:26546: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi -echo "$as_me:26532: checking for special defines needed for etip.h" >&5 +echo "$as_me:26551: checking for special defines needed for etip.h" >&5 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 cf_save_CXXFLAGS="$CXXFLAGS" cf_result="none" @@ -26547,7 +26566,7 @@ do test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" cat >"conftest.$ac_ext" <<_ACEOF -#line 26550 "configure" +#line 26569 "configure" #include "confdefs.h" #include @@ -26561,16 +26580,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26567: \$? = $ac_status" >&5 + echo "$as_me:26586: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26570: \"$ac_try\"") >&5 + { (eval echo "$as_me:26589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26573: \$? = $ac_status" >&5 + echo "$as_me:26592: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:26613: result: ${cf_result:-(none)}" >&5 echo "${ECHO_T}${cf_result:-(none)}" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:26599: checking if $CXX accepts override keyword" >&5 +echo "$as_me:26618: checking if $CXX accepts override keyword" >&5 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6 if test "${cf_cv_cpp_override+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26613,7 +26632,7 @@ ac_main_return="return" cf_cv_cpp_override=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 26616 "configure" +#line 26635 "configure" #include "confdefs.h" class base @@ -26632,15 +26651,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26635: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26654: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26638: \$? = $ac_status" >&5 + echo "$as_me:26657: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26640: \"$ac_try\"") >&5 + { (eval echo "$as_me:26659: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26643: \$? = $ac_status" >&5 + echo "$as_me:26662: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_override=yes else @@ -26659,7 +26678,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26662: result: $cf_cv_cpp_override" >&5 +echo "$as_me:26681: result: $cf_cv_cpp_override" >&5 echo "${ECHO_T}$cf_cv_cpp_override" >&6 fi test "$cf_cv_cpp_override" = yes && @@ -26668,7 +26687,7 @@ cat >>confdefs.h <<\EOF EOF if test -n "$CXX"; then -echo "$as_me:26671: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:26690: checking if $CXX accepts parameter initialization" >&5 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 if test "${cf_cv_cpp_param_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26685,7 +26704,7 @@ ac_main_return="return" cf_cv_cpp_param_init=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 26688 "configure" +#line 26707 "configure" #include "confdefs.h" class TEST { @@ -26704,15 +26723,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26707: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26726: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26710: \$? = $ac_status" >&5 + echo "$as_me:26729: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26712: \"$ac_try\"") >&5 + { (eval echo "$as_me:26731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26715: \$? = $ac_status" >&5 + echo "$as_me:26734: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_param_init=yes else @@ -26731,7 +26750,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26734: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:26753: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -26741,7 +26760,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:26744: checking if $CXX accepts static_cast" >&5 +echo "$as_me:26763: checking if $CXX accepts static_cast" >&5 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 if test "${cf_cv_cpp_static_cast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26755,7 +26774,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" cat >"conftest.$ac_ext" <<_ACEOF -#line 26758 "configure" +#line 26777 "configure" #include "confdefs.h" class NCursesPanel @@ -26799,16 +26818,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26805: \$? = $ac_status" >&5 + echo "$as_me:26824: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26808: \"$ac_try\"") >&5 + { (eval echo "$as_me:26827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26811: \$? = $ac_status" >&5 + echo "$as_me:26830: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_static_cast=yes else @@ -26826,7 +26845,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26829: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:26848: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -26875,13 +26894,13 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:26878: checking for bool" >&5 +echo "$as_me:26897: checking for bool" >&5 echo $ECHO_N "checking for bool... $ECHO_C" >&6 if test "${ac_cv_type_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 26884 "configure" +#line 26903 "configure" #include "confdefs.h" $ac_includes_default @@ -26916,16 +26935,16 @@ if (sizeof (bool)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26919: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26938: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26922: \$? = $ac_status" >&5 + echo "$as_me:26941: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26925: \"$ac_try\"") >&5 + { (eval echo "$as_me:26944: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26928: \$? = $ac_status" >&5 + echo "$as_me:26947: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_bool=yes else @@ -26935,10 +26954,10 @@ ac_cv_type_bool=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:26938: result: $ac_cv_type_bool" >&5 +echo "$as_me:26957: result: $ac_cv_type_bool" >&5 echo "${ECHO_T}$ac_cv_type_bool" >&6 -echo "$as_me:26941: checking size of bool" >&5 +echo "$as_me:26960: checking size of bool" >&5 echo $ECHO_N "checking size of bool... $ECHO_C" >&6 if test "${ac_cv_sizeof_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26947,7 +26966,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 26950 "configure" +#line 26969 "configure" #include "confdefs.h" $ac_includes_default @@ -26979,21 +26998,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26982: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26985: \$? = $ac_status" >&5 + echo "$as_me:27004: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26988: \"$ac_try\"") >&5 + { (eval echo "$as_me:27007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26991: \$? = $ac_status" >&5 + echo "$as_me:27010: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26996 "configure" +#line 27015 "configure" #include "confdefs.h" $ac_includes_default @@ -27025,16 +27044,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27047: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27031: \$? = $ac_status" >&5 + echo "$as_me:27050: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27034: \"$ac_try\"") >&5 + { (eval echo "$as_me:27053: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27037: \$? = $ac_status" >&5 + echo "$as_me:27056: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -27050,7 +27069,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 27053 "configure" +#line 27072 "configure" #include "confdefs.h" $ac_includes_default @@ -27082,16 +27101,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27085: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27104: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27088: \$? = $ac_status" >&5 + echo "$as_me:27107: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27091: \"$ac_try\"") >&5 + { (eval echo "$as_me:27110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27094: \$? = $ac_status" >&5 + echo "$as_me:27113: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -27107,7 +27126,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 27110 "configure" +#line 27129 "configure" #include "confdefs.h" $ac_includes_default @@ -27139,16 +27158,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27142: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27161: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27145: \$? = $ac_status" >&5 + echo "$as_me:27164: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27148: \"$ac_try\"") >&5 + { (eval echo "$as_me:27167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27151: \$? = $ac_status" >&5 + echo "$as_me:27170: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -27161,12 +27180,12 @@ done ac_cv_sizeof_bool=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:27164: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:27183: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 27169 "configure" +#line 27188 "configure" #include "confdefs.h" $ac_includes_default @@ -27202,15 +27221,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27205: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27224: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27208: \$? = $ac_status" >&5 + echo "$as_me:27227: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27210: \"$ac_try\"") >&5 + { (eval echo "$as_me:27229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27213: \$? = $ac_status" >&5 + echo "$as_me:27232: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_bool=`cat conftest.val` else @@ -27226,13 +27245,13 @@ else ac_cv_sizeof_bool=0 fi fi -echo "$as_me:27229: result: $ac_cv_sizeof_bool" >&5 +echo "$as_me:27248: result: $ac_cv_sizeof_bool" >&5 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 cat >>confdefs.h <&5 +echo "$as_me:27254: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27251,7 +27270,7 @@ else else cat >"conftest.$ac_ext" <<_ACEOF -#line 27254 "configure" +#line 27273 "configure" #include "confdefs.h" $ac_includes_default @@ -27292,15 +27311,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27314: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27298: \$? = $ac_status" >&5 + echo "$as_me:27317: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27300: \"$ac_try\"") >&5 + { (eval echo "$as_me:27319: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27303: \$? = $ac_status" >&5 + echo "$as_me:27322: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -27317,26 +27336,26 @@ fi rm -f cf_test.out fi -echo "$as_me:27320: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:27339: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:27327: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:27346: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi else - echo "$as_me:27333: checking for fallback type of bool" >&5 + echo "$as_me:27352: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in (i?86) cf_cv_type_of_bool=char ;; (*) cf_cv_type_of_bool=int ;; esac - echo "$as_me:27339: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:27358: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -27365,7 +27384,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:27368: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:27387: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -27382,7 +27401,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:27385: checking for $ac_word" >&5 +echo "$as_me:27404: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27399,7 +27418,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:27402: found $ac_dir/$ac_word" >&5 + echo "$as_me:27421: found $ac_dir/$ac_word" >&5 break fi done @@ -27411,10 +27430,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:27414: result: $cf_TEMP_gnat" >&5 + echo "$as_me:27433: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:27417: result: no" >&5 + echo "$as_me:27436: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -27424,7 +27443,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:27427: checking for $cf_prog_gnat version" >&5 +echo "$as_me:27446: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27435,7 +27454,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:27438: result: $cf_cv_gnat_version" >&5 +echo "$as_me:27457: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -27464,7 +27483,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:27467: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:27486: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test "$cf_gprconfig" = C then @@ -27483,10 +27502,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:27486: result: $cf_gprconfig_value" >&5 + echo "$as_me:27505: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:27489: result: missing" >&5 + echo "$as_me:27508: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -27499,7 +27518,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:27502: checking for gnat version" >&5 +echo "$as_me:27521: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27510,7 +27529,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:27513: result: $cf_cv_gnat_version" >&5 +echo "$as_me:27532: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -27519,7 +27538,7 @@ case "$cf_cv_gnat_version" in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:27522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:27541: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -27527,7 +27546,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:27530: checking for $ac_word" >&5 +echo "$as_me:27549: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27542,7 +27561,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:27545: found $ac_dir/$ac_word" >&5 +echo "$as_me:27564: found $ac_dir/$ac_word" >&5 break done @@ -27551,20 +27570,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:27554: result: $M4_exists" >&5 + echo "$as_me:27573: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:27557: result: no" >&5 + echo "$as_me:27576: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:27563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:27582: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:27567: checking if GNAT works" >&5 + echo "$as_me:27586: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf ./conftest* ./*~conftest* @@ -27592,7 +27611,7 @@ else fi rm -rf ./conftest* ./*~conftest* - echo "$as_me:27595: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:27614: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -27604,7 +27623,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:27607: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:27626: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -27621,10 +27640,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:27624: result: $ADAFLAGS" >&5 + echo "$as_me:27643: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:27627: checking if GNATPREP supports -T option" >&5 +echo "$as_me:27646: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27634,11 +27653,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:27637: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:27656: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:27641: checking if GNAT supports generics" >&5 +echo "$as_me:27660: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -27648,7 +27667,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:27651: result: $cf_gnat_generics" >&5 +echo "$as_me:27670: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -27660,7 +27679,7 @@ else cf_generic_objects= fi -echo "$as_me:27663: checking if GNAT supports SIGINT" >&5 +echo "$as_me:27682: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27708,7 +27727,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:27711: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:27730: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -27721,7 +27740,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:27724: checking if GNAT supports project files" >&5 +echo "$as_me:27743: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -27784,15 +27803,15 @@ CF_EOF esac ;; esac -echo "$as_me:27787: result: $cf_gnat_projects" >&5 +echo "$as_me:27806: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:27793: checking if GNAT supports libraries" >&5 + echo "$as_me:27812: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:27795: result: $cf_gnat_libraries" >&5 + echo "$as_me:27814: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -27812,7 +27831,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:27815: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:27834: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -27824,7 +27843,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:27827: checking for Ada95 compiler" >&5 +echo "$as_me:27846: checking for Ada95 compiler" >&5 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -27835,12 +27854,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:27838: result: $cf_ada_compiler" >&5 +echo "$as_me:27857: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:27843: checking for Ada95 include directory" >&5 +echo "$as_me:27862: checking for Ada95 include directory" >&5 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -27876,7 +27895,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:27879: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:27898: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -27885,10 +27904,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:27888: result: $ADA_INCLUDE" >&5 +echo "$as_me:27907: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:27891: checking for Ada95 object directory" >&5 +echo "$as_me:27910: checking for Ada95 object directory" >&5 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -27924,7 +27943,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:27927: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:27946: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -27933,10 +27952,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:27936: result: $ADA_OBJECTS" >&5 +echo "$as_me:27955: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:27939: checking whether to build an Ada95 shared library" >&5 +echo "$as_me:27958: checking whether to build an Ada95 shared library" >&5 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -27957,11 +27976,11 @@ then fi fi -echo "$as_me:27960: result: $with_ada_sharedlib" >&5 +echo "$as_me:27979: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$cf_ada_sharedlib_warn" != xno then - { echo "$as_me:27964: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 + { echo "$as_me:27983: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} fi @@ -27979,7 +27998,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:27982: checking for Ada95 curses library name" >&5 +echo "$as_me:28001: checking for Ada95 curses library name" >&5 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -27995,7 +28014,7 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:27998: result: $ADA_LIBNAME" >&5 +echo "$as_me:28017: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 fi @@ -28006,13 +28025,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:28009: checking for wchar_t" >&5 + echo "$as_me:28028: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 28015 "configure" +#line 28034 "configure" #include "confdefs.h" $ac_includes_default int @@ -28027,16 +28046,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28030: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28049: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28033: \$? = $ac_status" >&5 + echo "$as_me:28052: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28036: \"$ac_try\"") >&5 + { (eval echo "$as_me:28055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28039: \$? = $ac_status" >&5 + echo "$as_me:28058: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_wchar_t=yes else @@ -28046,10 +28065,10 @@ ac_cv_type_wchar_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:28049: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:28068: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:28052: checking size of wchar_t" >&5 +echo "$as_me:28071: checking size of wchar_t" >&5 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28058,7 +28077,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 28061 "configure" +#line 28080 "configure" #include "confdefs.h" $ac_includes_default int @@ -28070,21 +28089,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28073: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28092: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28076: \$? = $ac_status" >&5 + echo "$as_me:28095: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28079: \"$ac_try\"") >&5 + { (eval echo "$as_me:28098: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28082: \$? = $ac_status" >&5 + echo "$as_me:28101: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 28087 "configure" +#line 28106 "configure" #include "confdefs.h" $ac_includes_default int @@ -28096,16 +28115,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28099: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28102: \$? = $ac_status" >&5 + echo "$as_me:28121: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28105: \"$ac_try\"") >&5 + { (eval echo "$as_me:28124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28108: \$? = $ac_status" >&5 + echo "$as_me:28127: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -28121,7 +28140,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 28124 "configure" +#line 28143 "configure" #include "confdefs.h" $ac_includes_default int @@ -28133,16 +28152,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28155: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28139: \$? = $ac_status" >&5 + echo "$as_me:28158: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28142: \"$ac_try\"") >&5 + { (eval echo "$as_me:28161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28145: \$? = $ac_status" >&5 + echo "$as_me:28164: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -28158,7 +28177,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 28161 "configure" +#line 28180 "configure" #include "confdefs.h" $ac_includes_default int @@ -28170,16 +28189,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28173: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28192: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28176: \$? = $ac_status" >&5 + echo "$as_me:28195: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28179: \"$ac_try\"") >&5 + { (eval echo "$as_me:28198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28182: \$? = $ac_status" >&5 + echo "$as_me:28201: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -28192,12 +28211,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:28195: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:28214: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 28200 "configure" +#line 28219 "configure" #include "confdefs.h" $ac_includes_default int @@ -28213,15 +28232,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:28216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28235: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28219: \$? = $ac_status" >&5 + echo "$as_me:28238: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:28221: \"$ac_try\"") >&5 + { (eval echo "$as_me:28240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28224: \$? = $ac_status" >&5 + echo "$as_me:28243: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -28237,7 +28256,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:28240: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:28259: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&6 -echo "${as_me:-configure}:28253: testing test failed (assume 2) ..." 1>&5 +echo "${as_me:-configure}:28272: testing test failed (assume 2) ..." 1>&5 sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -28268,7 +28287,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:28271: checking for library subsets" >&5 +echo "$as_me:28290: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -28322,7 +28341,7 @@ fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:28325: result: $LIB_SUBSETS" >&5 +echo "$as_me:28344: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -28353,7 +28372,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:28356: checking default library suffix" >&5 +echo "$as_me:28375: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -28364,10 +28383,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:28367: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:28386: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:28370: checking default library-dependency suffix" >&5 +echo "$as_me:28389: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -28450,10 +28469,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:28453: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:28472: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:28456: checking default object directory" >&5 +echo "$as_me:28475: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -28469,11 +28488,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:28472: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:28491: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:28476: checking c++ library-dependency suffix" >&5 +echo "$as_me:28495: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then # libtool thinks it can make c++ shared libraries (perhaps only g++) @@ -28566,7 +28585,7 @@ else fi fi -echo "$as_me:28569: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:28588: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -28742,19 +28761,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:28745: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:28764: checking if linker supports switching between static/dynamic" >&5 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 rm -f libconftest.a cat >conftest.$ac_ext < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:28754: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:28773: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28757: \$? = $ac_status" >&5 + echo "$as_me:28776: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null @@ -28765,10 +28784,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28768 "configure" +#line 28787 "configure" #include "confdefs.h" -#line 28771 "configure" +#line 28790 "configure" #include int cf_ldflags_static(FILE *fp); @@ -28783,16 +28802,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28786: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28789: \$? = $ac_status" >&5 + echo "$as_me:28808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28792: \"$ac_try\"") >&5 + { (eval echo "$as_me:28811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28795: \$? = $ac_status" >&5 + echo "$as_me:28814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then # some linkers simply ignore the -dynamic @@ -28815,7 +28834,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:28818: result: $cf_ldflags_static" >&5 + echo "$as_me:28837: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test "$cf_ldflags_static" != yes @@ -28831,7 +28850,7 @@ fi ;; esac -echo "$as_me:28834: checking where we will install curses.h" >&5 +echo "$as_me:28853: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -28841,7 +28860,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:28844: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:28863: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -28849,7 +28868,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:28852: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:28871: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi @@ -28874,7 +28893,7 @@ EOF # pkgsrc uses these -echo "$as_me:28877: checking for desired basename for form library" >&5 +echo "$as_me:28896: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -28894,10 +28913,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:28897: result: $FORM_NAME" >&5 +echo "$as_me:28916: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:28900: checking for desired basename for menu library" >&5 +echo "$as_me:28919: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -28917,10 +28936,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:28920: result: $MENU_NAME" >&5 +echo "$as_me:28939: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:28923: checking for desired basename for panel library" >&5 +echo "$as_me:28942: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -28940,10 +28959,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:28943: result: $PANEL_NAME" >&5 +echo "$as_me:28962: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:28946: checking for desired basename for cxx library" >&5 +echo "$as_me:28965: checking for desired basename for cxx library" >&5 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 # Check whether --with-cxx-libname or --without-cxx-libname was given. @@ -28963,13 +28982,13 @@ case "x$CXX_NAME" in ;; esac -echo "$as_me:28966: result: $CXX_NAME" >&5 +echo "$as_me:28985: result: $CXX_NAME" >&5 echo "${ECHO_T}$CXX_NAME" >&6 ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:28972: checking for src modules" >&5 +echo "$as_me:28991: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -29028,7 +29047,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME" fi fi done -echo "$as_me:29031: result: $cf_cv_src_modules" >&5 +echo "$as_me:29050: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -29189,7 +29208,7 @@ case "$cf_cv_system_name" in (*-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:29192: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:29211: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -29200,7 +29219,7 @@ esac # Help to automatically enable the extended curses features when using either # the *-config or the ".pc" files by adding defines. -echo "$as_me:29203: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 +echo "$as_me:29222: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6 PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN @@ -29216,7 +29235,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:29219: result: $PKG_CFLAGS" >&5 +echo "$as_me:29238: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -29277,7 +29296,7 @@ then cf_filter_syms=$cf_dft_filter_syms test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_default" 1>&6 -echo "${as_me:-configure}:29280: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 +echo "${as_me:-configure}:29299: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 fi @@ -29304,7 +29323,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:29307: checking for linker search path" >&5 +echo "$as_me:29326: checking for linker search path" >&5 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 if test "${cf_cv_ld_searchpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -29352,7 +29371,7 @@ then cf_pathlist="$cf_pathlist /lib /usr/lib" ;; (*) - { echo "$as_me:29355: WARNING: problem with Solaris architecture" >&5 + { echo "$as_me:29374: WARNING: problem with Solaris architecture" >&5 echo "$as_me: WARNING: problem with Solaris architecture" >&2;} ;; esac @@ -29393,7 +29412,7 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:29396: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:29415: result: $cf_cv_ld_searchpath" >&5 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` @@ -29410,7 +29429,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -29479,7 +29498,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:29482: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:29501: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -29615,7 +29634,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:29663: error: ambiguous option: $1 + { { echo "$as_me:29682: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -29679,7 +29698,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:29682: error: unrecognized option: $1 + -*) { { echo "$as_me:29701: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -29698,7 +29717,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20230903, executed with +This file was extended by $as_me 2.52.20231210, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -29809,7 +29828,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:29812: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:29831: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -30074,6 +30093,7 @@ s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t s,@NCURSES_CONST@,$NCURSES_CONST,;t t s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t +s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t s,@PTHREAD@,$PTHREAD,;t t s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t @@ -30328,7 +30348,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:30331: creating $ac_file" >&5 + { echo "$as_me:30351: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -30346,7 +30366,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:30349: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30369: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -30359,7 +30379,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30362: error: cannot find input file: $f" >&5 + { { echo "$as_me:30382: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30375,7 +30395,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:30378: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:30398: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -30384,7 +30404,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:30387: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:30407: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -30429,7 +30449,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:30432: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:30452: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -30440,7 +30460,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:30443: WARNING: Some variables may not be substituted: + { echo "$as_me:30463: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -30489,7 +30509,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:30492: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:30512: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -30500,7 +30520,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:30503: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30523: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -30513,7 +30533,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30516: error: cannot find input file: $f" >&5 + { { echo "$as_me:30536: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30571,7 +30591,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f "$tmp"/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:30574: $ac_file is unchanged" >&5 + { echo "$as_me:30594: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -30958,7 +30978,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw|msvcdll) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:30961: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:30981: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index 565c909c..023df69d 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 Thomas E. Dickey * dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.773 2023/12/03 11:07:25 tom Exp $ +dnl $Id: configure.in,v 1.774 2024/01/19 11:22:46 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210101) -AC_REVISION($Revision: 1.773 $) +AC_REVISION($Revision: 1.774 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1288,7 +1288,14 @@ AC_ARG_ENABLE(sigwinch, [with_sigwinch=$enableval], [with_sigwinch=$with_ext_funcs]) AC_MSG_RESULT($with_sigwinch) -test "x$with_sigwinch" = xyes && AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler]) +if test "x$with_sigwinch" = xyes +then + AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler]) + cf_cv_enable_sigwinch=1 +else + cf_cv_enable_sigwinch=0 +fi +AC_SUBST(cf_cv_enable_sigwinch) ### use option --enable-tcap-names to allow user to define new capabilities AC_MSG_CHECKING(if you want user-definable terminal capabilities like termcap) diff --git a/dist.mk b/dist.mk index cd175e62..000fb9bf 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1593 2024/01/13 21:07:51 tom Exp $ +# $Id: dist.mk,v 1.1594 2024/01/20 11:52:33 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 4 -NCURSES_PATCH = 20240113 +NCURSES_PATCH = 20240120 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/ada/terminal_interface-curses__ads.htm b/doc/html/ada/terminal_interface-curses__ads.htm index c39b2f41..c506fdd5 100644 --- a/doc/html/ada/terminal_interface-curses__ads.htm +++ b/doc/html/ada/terminal_interface-curses__ads.htm @@ -24,7 +24,7 @@ -- S P E C -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2024 Thomas E. Dickey -- -- Copyright 1998-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -53,8 +53,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- @Revision: 1.48 @ --- @Date: 2020/02/02 23:34:34 @ +-- @Revision: 1.49 @ +-- @Date: 2024/01/19 16:51:30 @ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System.Storage_Elements; diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html index 4620cd72..bf7a2d76 100644 --- a/doc/html/man/form_hook.3x.html +++ b/doc/html/man/form_hook.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: form_hook.3x,v 1.34 2024/01/05 21:46:58 tom Exp @ + * @Id: form_hook.3x,v 1.35 2024/01/20 18:12:04 tom Exp @ --> -form_hook 3x 2024-01-05 ncurses 6.4 Library calls +form_hook 3x 2024-01-20 ncurses 6.4 Library calls -

form_hook 3x 2024-01-05 ncurses 6.4 Library calls

+

form_hook 3x 2024-01-20 ncurses 6.4 Library calls

 form_hook(3x)                    Library calls                   form_hook(3x)
 
@@ -107,7 +107,7 @@
        change once it is posted.
 
 
-

form_init

+

form_term

        returns the current form term hook, if any (NULL if there  is  no  such
        hook).
 
@@ -137,7 +137,7 @@
 
 
 
-ncurses 6.4                       2024-01-05                     form_hook(3x)
+ncurses 6.4                       2024-01-20                     form_hook(3x)
  • RETURN VALUE
    • diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index 1192282d..1e14fdc9 100644 --- a/doc/html/man/ncurses.3x.html +++ b/doc/html/man/ncurses.3x.html @@ -60,7 +60,7 @@ method of updating character screens with reasonable optimization. This implementation is "new curses" (ncurses) and is the approved replacement for 4.4BSD classic curses, which has been discontinued. - This describes ncurses version 6.4 (patch 20240113). + This describes ncurses version 6.4 (patch 20240120). The ncurses library emulates the curses library of System V Release 4 Unix ("SVr4"), and XPG4 (X/Open Portability Guide) curses (also known diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html index c279313b..1735f931 100644 --- a/doc/html/man/tabs.1.html +++ b/doc/html/man/tabs.1.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: tabs.1,v 1.52 2023/12/23 16:08:25 tom Exp @ + * @Id: tabs.1,v 1.54 2024/01/20 16:54:03 tom Exp @ --> -tabs 1 2023-12-23 ncurses 6.4 User commands +tabs 1 2024-01-20 ncurses 6.4 User commands -

    tabs 1 2023-12-23 ncurses 6.4 User commands

    +

    tabs 1 2024-01-20 ncurses 6.4 User commands

     tabs(1)                          User commands                         tabs(1)
 
@@ -164,30 +164,29 @@

    Margins

    -       A  few  terminals  provide the capability for changing their left/right
-       margins.  The tabs program has an option to use this feature:
+       A  few  terminals  expose  a  means  of  changing  their left and right
+       margins.  tabs supports this feature with an option.
 
        +m margin
             The  effect  depends  on  whether  the  terminal  has  the  margin
             capabilities:
 
             o   If  the  terminal provides the capability for setting the left
-                margin, tabs uses this, and adjusts the  available  width  for
-                tab-stops.
+                margin, tabs uses this, and adjusts  the  available  tab  stop
+                widths.
 
-            o   If the terminal does not provide the margin capabilities, tabs
-                imitates the effect, putting the tab stops at the  appropriate
-                place  on  each  line.   The  terminal's  left-margin  is  not
-                modified.
+            o   If the terminal does not provide the margin capabilities, tabs
+                imitates their effect, putting tab stops at appropriate places
+                on each line.  The terminal's left margin is not modified.
 
             If the margin parameter is omitted, the default is 10.  Use +m0 to
-            reset  the  left  margin, i.e., to the left edge of the terminal's
-            display.  Before setting a left-margin, tabs resets the margin  to
-            reduce  problems which might arise on moving the cursor before the
-            current left-margin.
+            reset the left margin, that is, to make it the left  edge  of  the
+            terminal's display.  Before setting a left margin, tabs resets the
+            margin to reduce problems that might arise from moving the  cursor
+            to the left of the current left margin.
 
-       When setting or resetting the left-margin, tabs may  reset  the  right-
-       margin.
+       When  setting  or  resetting  the  left margin, tabs may also reset the
+       right margin.

    FILES

    @@ -196,63 +195,63 @@

    PORTABILITY

    -       IEEE   Std   1003.1/The   Open   Group   Base  Specifications  Issue  7
-       (POSIX.1-2008) describes a tabs utility.  However
+       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
+       (POSIX.1-2008) describes a tabs utility.  However,
 
-       o   This standard describes a +m option,  to  set  a  terminal's  left-
-           margin.   Very  few of the entries in the terminal database provide
-           the  smgl   (set_left_margin)   or   smglp   (set_left_margin_parm)
-           capability needed to support the feature.
+       o   this  standard  describes  a  +m  option  to  set a terminal's left
+           margin.  Very few of the entries in the terminal  database  provide
+           the   set_left_margin   (smgl)   or   set_left_margin_parm  (smglp)
+           capabilities needed to support the feature.
 
-       o   There  is no counterpart in X/Open Curses Issue 7 for this utility,
+       o   There is no counterpart in X/Open Curses Issue 7 for this  utility,
            unlike tput(1).
 
-       The -d (debug) and -n (no-op) options are extensions  not  provided  by
-       other implementations.
+       The  -d  (debug)  and  -n  (no-op)  options  are ncurses extensions not
+       provided by other implementations.

    HISTORY

    -       A  tabs  utility  appeared  in  PWB/Unix 1.0 (1977).  A reduced version
-       shipped in Seventh Edition Unix (early 1979) and  in  3BSD  (later  the
+       A tabs utility appeared in PWB/Unix  1.0  (1977).   A  reduced  version
+       shipped  in  Seventh  Edition  Unix (early 1979) and in 3BSD (later the
        same year); it supported a "-n" option to set the first tab stop at the
        left margin.  That option is not documented by POSIX.
 
-       The PWB/Unix tabs utility returned  in  System  III  (1980),  and  used
-       built-in  tables  rather than the terminal database, to support a half-
+       The  PWB/Unix  tabs  utility  returned  in  System III (1980), and used
+       built-in tables, rather than the terminal database, to support a  half-
        dozen hardcopy terminal (printer) types.  It also had built-in logic to
-       support  setting  the left margin, as well as a feature for copying the
+       support setting the left margin, as well as a feature for  copying  the
        tab settings from a file.
 
-       Versions of the program in later releases of AT&T Unix, such  as  SVr4,
-       added  support  for  the  terminal database, but retained the tables to
-       support the printers.  In an earlier development effort, the  tab  stop
-       initialization  provided  by  tset(1)  (1982),  and  incorporated  into
-       tput(1) uses the terminal database,
-
-       The +m option was documented in the POSIX Base Specifications  Issue  5
-       (Unix98,  1997), then omitted in Issue 6 (Unix03, 2004) without express
-       motivation, though an introductory comment "and optionally adjusts  the
-       margin"   remains,   overlooked  in  the  removal.   The  tabs  utility
-       documented in Issues 6 and later has no mechanism for setting  margins.
-       The  +m  option  in ncurses tabs differs from the SVr4 feature by using
+       Versions  of  the program in later releases of AT&T Unix, such as SVr4,
+       added support for the terminal database, but  retained  the  tables  to
+       support the printers.  By this time, System V tput had incorporated the
+       tab stop initialization feature of BSD's tset from 1982,  but  employed
+       the terminfo database to do so.
+
+       The  +m  option was documented in the POSIX Base Specifications Issue 5
+       (Unix98, 1997), then omitted in Issue 6 (Unix03, 2004) without  express
+       motivation,  though an introductory comment "and optionally adjusts the
+       margin"  remains,  overlooked  in  the  removal.   The   tabs   utility
+       documented  in Issues 6 and later has no mechanism for setting margins.
+       The +m option in ncurses tabs differs from the SVr4  feature  by  using
        terminal capabilities rather than built-in tables.
 
-       POSIX  documents  no  limit  on  the  number  of  tab   stops.    Other
+       POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
        implementations impose one; the limit is 20 in PWB/Unix's tabs utility.
-       While some terminals may not accept an arbitrary number of  tab  stops,
-       ncurses  tabs  attempts  to set tab stops up to the right margin if the
+       While  some  terminals may not accept an arbitrary number of tab stops,
+       ncurses tabs attempts to set tab stops up to the right  margin  if  the
        list thereof is sufficiently long.
 
-       The "Rationale" section of the Issue 6 tabs reference page details  how
-       the  committee  considered  redesigning  the  tabs  and tput utilities,
+       The  "Rationale" section of the Issue 6 tabs reference page details how
+       the committee considered  redesigning  the  tabs  and  tput  utilities,
        without settling on an improved solution.  It claims that
 
-            no known historical version of tabs  supports  the  capability  of
-            setting arbitrary tab stops.
+           "no  known  historical  version  of tabs supports the capability of
+           setting arbitrary tab stops."
 
-       Nevertheless,  the  feature  described  in  subsection "Explicit Lists"
-       above was implemented in PWB/Unix, and permits the setting of  abitrary
-       tab stops.
+       The  feature  described  in  subsection  "Explicit  Lists"  above   was
+       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
+       stops nevertheless.

    SEE ALSO

    @@ -260,7 +259,7 @@
 
 
 
-ncurses 6.4                       2023-12-23                           tabs(1)
+ncurses 6.4                       2024-01-20                           tabs(1)
      diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html index 5c8bc28b..f12c3e60 100644 --- a/doc/html/man/terminfo.5.html +++ b/doc/html/man/terminfo.5.html @@ -71,7 +71,7 @@ have, by specifying how to perform screen operations, and by specifying padding requirements and initialization sequences. - This manual describes ncurses version 6.4 (patch 20240113). + This manual describes ncurses version 6.4 (patch 20240120).

      terminfo Entry Syntax

      @@ -247,661 +247,656 @@
 
        (#i)   indicates the ith parameter.
 
-                                     Code
-       Boolean Capability Name    TI      TC   Description
+                                      Code
+       Boolean Capability Name    TI        TC  Description
        ------------------------------------------------------------------------
 
-       auto_left_margin           bw      bw   cub1 wraps from column 0 to
-                                               last column
-       auto_right_margin          am      am   terminal has automatic margins
-       no_esc_ctlc                xsb     xb   beehive (f1=escape, f2=ctrl C)
-       ceol_standout_glitch       xhp     xs   standout not erased by
-                                               overwriting (hp)
-       eat_newline_glitch         xenl    xn   newline ignored after 80 cols
-                                               (concept)
-       erase_overstrike           eo      eo   can erase overstrikes with a
-                                               blank
-       generic_type               gn      gn   generic line type
-       hard_copy                  hc      hc   hardcopy terminal
-       has_meta_key               km      km   Has a meta key (i.e., sets 8th-
-                                               bit)
-       has_status_line            hs      hs   has extra status line
-       insert_null_glitch         in      in   insert mode distinguishes nulls
-       memory_above               da      da   display may be retained above
-                                               the screen
-       memory_below               db      db   display may be retained below
-                                               the screen
-       move_insert_mode           mir     mi   safe to move while in insert
-                                               mode
-       move_standout_mode         msgr    ms   safe to move while in standout
-                                               mode
-       over_strike                os      os   terminal can overstrike
-       status_line_esc_ok         eslok   es   escape can be used on the
-                                               status line
-       dest_tabs_magic_smso       xt      xt   tabs destructive, magic so char
-                                               (t1061)
-       tilde_glitch               hz      hz   cannot print ~'s (Hazeltine)
-       transparent_underline      ul      ul   underline character overstrikes
-       xon_xoff                   xon     xo   terminal uses xon/xoff
-                                               handshaking
-       needs_xon_xoff             nxon    nx   padding will not work, xon/xoff
-                                               required
-       prtr_silent                mc5i    5i   printer will not echo on screen
-       hard_cursor                chts    HC   cursor is hard to see
-       non_rev_rmcup              nrrmc   NR   smcup does not reverse rmcup
-       no_pad_char                npc     NP   pad character does not exist
-       non_dest_scroll_region     ndscr   ND   scrolling region is non-
-                                               destructive
-       can_change                 ccc     cc   terminal can re-define existing
-                                               colors
-       back_color_erase           bce     ut   screen erased with background
-                                               color
-       hue_lightness_saturation   hls     hl   terminal uses only HLS color
-                                               notation (Tektronix)
-       col_addr_glitch            xhpa    YA   only positive motion for
-                                               hpa/mhpa caps
-       cr_cancels_micro_mode      crxm    YB   using cr turns off micro mode
-       has_print_wheel            daisy   YC   printer needs operator to
-                                               change character set
-       row_addr_glitch            xvpa    YD   only positive motion for
-                                               vpa/mvpa caps
-       semi_auto_right_margin     sam     YE   printing in last column causes
-                                               cr
-       cpi_changes_res            cpix    YF   changing character pitch
-                                               changes resolution
-       lpi_changes_res            lpix    YG   changing line pitch changes
-                                               resolution
-
-                                    Code
-       Numeric Capability Name   TI       TC   Description
+       auto_left_margin           bw        bw  cub1 wraps from column 0 to
+                                                last column
+       auto_right_margin          am        am  terminal has automatic margins
+       no_esc_ctlc                xsb       xb  beehive (f1=escape, f2=ctrl C)
+       ceol_standout_glitch       xhp       xs  standout not erased by
+                                                overwriting (hp)
+       eat_newline_glitch         xenl      xn  newline ignored after 80 cols
+                                                (concept)
+       erase_overstrike           eo        eo  can erase overstrikes with a
+                                                blank
+       generic_type               gn        gn  generic line type
+       hard_copy                  hc        hc  hardcopy terminal
+       has_meta_key               km        km  Has a meta key (i.e., sets
+                                                8th-bit)
+       has_status_line            hs        hs  has extra status line
+       insert_null_glitch         in        in  insert mode distinguishes
+                                                nulls
+       memory_above               da        da  display may be retained above
+                                                the screen
+       memory_below               db        db  display may be retained below
+                                                the screen
+       move_insert_mode           mir       mi  safe to move while in insert
+                                                mode
+       move_standout_mode         msgr      ms  safe to move while in standout
+                                                mode
+       over_strike                os        os  terminal can overstrike
+       status_line_esc_ok         eslok     es  escape can be used on the
+                                                status line
+       dest_tabs_magic_smso       xt        xt  tabs destructive, magic so
+                                                char (t1061)
+       tilde_glitch               hz        hz  cannot print ~'s (Hazeltine)
+       transparent_underline      ul        ul  underline character
+                                                overstrikes
+       xon_xoff                   xon       xo  terminal uses xon/xoff
+                                                handshaking
+       needs_xon_xoff             nxon      nx  padding will not work,
+                                                xon/xoff required
+       prtr_silent                mc5i      5i  printer will not echo on
+                                                screen
+       hard_cursor                chts      HC  cursor is hard to see
+       non_rev_rmcup              nrrmc     NR  smcup does not reverse rmcup
+       no_pad_char                npc       NP  pad character does not exist
+       non_dest_scroll_region     ndscr     ND  scrolling region is non-
+                                                destructive
+       can_change                 ccc       cc  terminal can re-define
+                                                existing colors
+       back_color_erase           bce       ut  screen erased with background
+                                                color
+       hue_lightness_saturation   hls       hl  terminal uses only HLS color
+                                                notation (Tektronix)
+       col_addr_glitch            xhpa      YA  only positive motion for
+                                                hpa/mhpa caps
+       cr_cancels_micro_mode      crxm      YB  using cr turns off micro mode
+       has_print_wheel            daisy     YC  printer needs operator to
+                                                change character set
+       row_addr_glitch            xvpa      YD  only positive motion for
+                                                vpa/mvpa caps
+       semi_auto_right_margin     sam       YE  printing in last column causes
+                                                cr
+       cpi_changes_res            cpix      YF  changing character pitch
+                                                changes resolution
+       lpi_changes_res            lpix      YG  changing line pitch changes
+                                                resolution
+
+                                      Code
+
+       Numeric Capability Name    TI        TC  Description
        ------------------------------------------------------------------------
-       columns                   cols     co   number of columns in a line
-
-       init_tabs                 it       it   tabs initially every # spaces
-       lines                     lines    li   number of lines on screen or
-                                               page
-       lines_of_memory           lm       lm   lines of memory if > line. 0
-                                               means varies
-       magic_cookie_glitch       xmc      sg   number of blank characters left
-                                               by smso or rmso
-       padding_baud_rate         pb       pb   lowest baud rate where padding
-                                               needed
-       virtual_terminal          vt       vt   virtual terminal number
-                                               (CB/unix)
-       width_status_line         wsl      ws   number of columns in status
-                                               line
-       num_labels                nlab     Nl   number of labels on screen
-       label_height              lh       lh   rows in each label
-       label_width               lw       lw   columns in each label
-       max_attributes            ma       ma   maximum combined attributes
-                                               terminal can handle
-       maximum_windows           wnum     MW   maximum number of definable
-                                               windows
-       max_colors                colors   Co   maximum number of colors on
-                                               screen
-       max_pairs                 pairs    pa   maximum number of color-pairs
-                                               on the screen
-       no_color_video            ncv      NC   video attributes that cannot be
-                                               used with colors
-
-       The following numeric capabilities  are  present  in  the  SVr4.0  term
-       structure,  but  are  not yet documented in the man page.  They came in
+       columns                    cols      co  number of columns in a line
+       init_tabs                  it        it  tabs initially every # spaces
+       lines                      lines     li  number of lines on screen or
+                                                page
+       lines_of_memory            lm        lm  lines of memory if > line. 0
+                                                means varies
+       magic_cookie_glitch        xmc       sg  number of blank characters
+                                                left by smso or rmso
+       padding_baud_rate          pb        pb  lowest baud rate where padding
+                                                needed
+       virtual_terminal           vt        vt  virtual terminal number
+                                                (CB/unix)
+       width_status_line          wsl       ws  number of columns in status
+                                                line
+       num_labels                 nlab      Nl  number of labels on screen
+       label_height               lh        lh  rows in each label
+       label_width                lw        lw  columns in each label
+       max_attributes             ma        ma  maximum combined attributes
+                                                terminal can handle
+       maximum_windows            wnum      MW  maximum number of definable
+                                                windows
+       max_colors                 colors    Co  maximum number of colors on
+                                                screen
+       max_pairs                  pairs     pa  maximum number of color-pairs
+                                                on the screen
+       no_color_video             ncv       NC  video attributes that cannot
+                                                be used with colors
+
+       The  following  numeric  capabilities  are  present  in the SVr4.0 term
+       structure, but are not yet documented in the man page.   They  came  in
        with SVr4's printer support.
 
-                                    Code
-       Numeric Capability Name   TI       TC   Description
+                                      Code
+       Numeric Capability Name    TI        TC  Description
        ------------------------------------------------------------------------
-       buffer_capacity           bufsz    Ya   numbers of bytes buffered
-                                               before printing
-       dot_vert_spacing          spinv    Yb   spacing of pins vertically in
-                                               pins per inch
-       dot_horz_spacing          spinh    Yc   spacing of dots horizontally in
-                                               dots per inch
-       max_micro_address         maddr    Yd   maximum value in
-                                               micro_..._address
-       max_micro_jump            mjump    Ye   maximum value in parm_..._micro
-       micro_col_size            mcs      Yf   character step size when in
-                                               micro mode
-       micro_line_size           mls      Yg   line step size when in micro
-                                               mode
-       number_of_pins            npins    Yh   numbers of pins in print-head
-       output_res_char           orc      Yi   horizontal resolution in units
-                                               per line
-       output_res_line           orl      Yj   vertical resolution in units
-                                               per line
-       output_res_horz_inch      orhi     Yk   horizontal resolution in units
-                                               per inch
-       output_res_vert_inch      orvi     Yl   vertical resolution in units
-                                               per inch
-       print_rate                cps      Ym   print rate in characters per
-                                               second
-       wide_char_size            widcs    Yn   character step size when in
-                                               double wide mode
-       buttons                   btns     BT   number of buttons on mouse
-       bit_image_entwining       bitwin   Yo   number of passes for each bit-
-                                               image row
-       bit_image_type            bitype   Yp   type of bit-image device
+       buffer_capacity            bufsz     Ya  numbers of bytes buffered
+                                                before printing
+       dot_vert_spacing           spinv     Yb  spacing of pins vertically in
+                                                pins per inch
+       dot_horz_spacing           spinh     Yc  spacing of dots horizontally
+                                                in dots per inch
+       max_micro_address          maddr     Yd  maximum value in
+                                                micro_..._address
+       max_micro_jump             mjump     Ye  maximum value in
+                                                parm_..._micro
+       micro_col_size             mcs       Yf  character step size when in
+                                                micro mode
+       micro_line_size            mls       Yg  line step size when in micro
+                                                mode
+       number_of_pins             npins     Yh  numbers of pins in print-head
+       output_res_char            orc       Yi  horizontal resolution in units
+                                                per line
+       output_res_line            orl       Yj  vertical resolution in units
+                                                per line
+       output_res_horz_inch       orhi      Yk  horizontal resolution in units
+                                                per inch
+       output_res_vert_inch       orvi      Yl  vertical resolution in units
+                                                per inch
+       print_rate                 cps       Ym  print rate in characters per
+                                                second
+       wide_char_size             widcs     Yn  character step size when in
+                                                double wide mode
+       buttons                    btns      BT  number of buttons on mouse
+
+       bit_image_entwining        bitwin    Yo  number of passes for each bit-
+                                                image row
+       bit_image_type             bitype    Yp  type of bit-image device
 
                                       Code
-
-       String Capability Name      TI       TC   Description
+       String Capability Name     TI        TC  Description
        ------------------------------------------------------------------------
-       back_tab                    cbt      bt   back tab (P)
-       bell                        bel      bl   audible signal (bell) (P)
-       carriage_return             cr       cr   carriage return (P*) (P*)
-       change_scroll_region        csr      cs   change region to line #1 to
-                                                 line #2 (P)
-       clear_all_tabs              tbc      ct   clear all tab stops (P)
-       clear_screen                clear    cl   clear screen and home cursor
-                                                 (P*)
-       clr_eol                     el       ce   clear to end of line (P)
-       clr_eos                     ed       cd   clear to end of screen (P*)
-       column_address              hpa      ch   horizontal position #1,
-                                                 absolute (P)
-       command_character           cmdch    CC   terminal settable cmd
-                                                 character in prototype !?
-       cursor_address              cup      cm   move to row #1 columns #2
-       cursor_down                 cud1     do   down one line
-       cursor_home                 home     ho   home cursor (if no cup)
-       cursor_invisible            civis    vi   make cursor invisible
-       cursor_left                 cub1     le   move left one space
-       cursor_mem_address          mrcup    CM   memory relative cursor
-                                                 addressing, move to row #1
-                                                 columns #2
-       cursor_normal               cnorm    ve   make cursor appear normal
-                                                 (undo civis/cvvis)
-       cursor_right                cuf1     nd   non-destructive space (move
-                                                 right one space)
-       cursor_to_ll                ll       ll   last line, first column (if
-                                                 no cup)
-       cursor_up                   cuu1     up   up one line
-       cursor_visible              cvvis    vs   make cursor very visible
-       delete_character            dch1     dc   delete character (P*)
-       delete_line                 dl1      dl   delete line (P*)
-       dis_status_line             dsl      ds   disable status line
-       down_half_line              hd       hd   half a line down
-       enter_alt_charset_mode      smacs    as   start alternate character set
-                                                 (P)
-       enter_blink_mode            blink    mb   turn on blinking
-       enter_bold_mode             bold     md   turn on bold (extra bright)
-                                                 mode
-       enter_ca_mode               smcup    ti   string to start programs
-                                                 using cup
-       enter_delete_mode           smdc     dm   enter delete mode
-       enter_dim_mode              dim      mh   turn on half-bright mode
-       enter_insert_mode           smir     im   enter insert mode
-       enter_secure_mode           invis    mk   turn on blank mode
-                                                 (characters invisible)
-       enter_protected_mode        prot     mp   turn on protected mode
-       enter_reverse_mode          rev      mr   turn on reverse video mode
-       enter_standout_mode         smso     so   begin standout mode
-       enter_underline_mode        smul     us   begin underline mode
-       erase_chars                 ech      ec   erase #1 characters (P)
-       exit_alt_charset_mode       rmacs    ae   end alternate character set
-                                                 (P)
-       exit_attribute_mode         sgr0     me   turn off all attributes
-       exit_ca_mode                rmcup    te   strings to end programs using
-                                                 cup
-       exit_delete_mode            rmdc     ed   end delete mode
-       exit_insert_mode            rmir     ei   exit insert mode
-       exit_standout_mode          rmso     se   exit standout mode
-       exit_underline_mode         rmul     ue   exit underline mode
-       flash_screen                flash    vb   visible bell (may not move
-                                                 cursor)
-
-
-       form_feed                   ff       ff   hardcopy terminal page eject
-                                                 (P*)
-       from_status_line            fsl      fs   return from status line
-       init_1string                is1      i1   initialization string
-       init_2string                is2      is   initialization string
-       init_3string                is3      i3   initialization string
-       init_file                   if       if   name of initialization file
-       insert_character            ich1     ic   insert character (P)
-       insert_line                 il1      al   insert line (P*)
-       insert_padding              ip       ip   insert padding after inserted
-                                                 character
-       key_backspace               kbs      kb   backspace key
-       key_catab                   ktbc     ka   clear-all-tabs key
-       key_clear                   kclr     kC   clear-screen or erase key
-       key_ctab                    kctab    kt   clear-tab key
-       key_dc                      kdch1    kD   delete-character key
-       key_dl                      kdl1     kL   delete-line key
-       key_down                    kcud1    kd   down-arrow key
-       key_eic                     krmir    kM   sent by rmir or smir in
-                                                 insert mode
-       key_eol                     kel      kE   clear-to-end-of-line key
-       key_eos                     ked      kS   clear-to-end-of-screen key
-       key_f0                      kf0      k0   F0 function key
-       key_f1                      kf1      k1   F1 function key
-       key_f10                     kf10     k;   F10 function key
-       key_f2                      kf2      k2   F2 function key
-       key_f3                      kf3      k3   F3 function key
-       key_f4                      kf4      k4   F4 function key
-       key_f5                      kf5      k5   F5 function key
-       key_f6                      kf6      k6   F6 function key
-       key_f7                      kf7      k7   F7 function key
-       key_f8                      kf8      k8   F8 function key
-       key_f9                      kf9      k9   F9 function key
-       key_home                    khome    kh   home key
-       key_ic                      kich1    kI   insert-character key
-       key_il                      kil1     kA   insert-line key
-       key_left                    kcub1    kl   left-arrow key
-       key_ll                      kll      kH   lower-left key (home down)
-       key_npage                   knp      kN   next-page key
-       key_ppage                   kpp      kP   previous-page key
-       key_right                   kcuf1    kr   right-arrow key
-       key_sf                      kind     kF   scroll-forward key
-       key_sr                      kri      kR   scroll-backward key
-       key_stab                    khts     kT   set-tab key
-       key_up                      kcuu1    ku   up-arrow key
-       keypad_local                rmkx     ke   leave keyboard transmit mode
-       keypad_xmit                 smkx     ks   enter keyboard transmit mode
-       lab_f0                      lf0      l0   label on function key f0 if
-                                                 not f0
-       lab_f1                      lf1      l1   label on function key f1 if
-                                                 not f1
-       lab_f10                     lf10     la   label on function key f10 if
-                                                 not f10
-       lab_f2                      lf2      l2   label on function key f2 if
-                                                 not f2
-       lab_f3                      lf3      l3   label on function key f3 if
-                                                 not f3
-       lab_f4                      lf4      l4   label on function key f4 if
-                                                 not f4
-       lab_f5                      lf5      l5   label on function key f5 if
-                                                 not f5
-       lab_f6                      lf6      l6   label on function key f6 if
-                                                 not f6
-       lab_f7                      lf7      l7   label on function key f7 if
-                                                 not f7
-
-       lab_f8                      lf8      l8   label on function key f8 if
-                                                 not f8
-       lab_f9                      lf9      l9   label on function key f9 if
-                                                 not f9
-       meta_off                    rmm      mo   turn off meta mode
-       meta_on                     smm      mm   turn on meta mode (8th-bit
-                                                 on)
-       newline                     nel      nw   newline (behave like cr
-                                                 followed by lf)
-       pad_char                    pad      pc   padding char (instead of
-                                                 null)
-       parm_dch                    dch      DC   delete #1 characters (P*)
-       parm_delete_line            dl       DL   delete #1 lines (P*)
-       parm_down_cursor            cud      DO   down #1 lines (P*)
-       parm_ich                    ich      IC   insert #1 characters (P*)
-       parm_index                  indn     SF   scroll forward #1 lines (P)
-       parm_insert_line            il       AL   insert #1 lines (P*)
-       parm_left_cursor            cub      LE   move #1 characters to the
-                                                 left (P)
-       parm_right_cursor           cuf      RI   move #1 characters to the
-                                                 right (P*)
-       parm_rindex                 rin      SR   scroll back #1 lines (P)
-       parm_up_cursor              cuu      UP   up #1 lines (P*)
-       pkey_key                    pfkey    pk   program function key #1 to
-                                                 type string #2
-       pkey_local                  pfloc    pl   program function key #1 to
-                                                 execute string #2
-       pkey_xmit                   pfx      px   program function key #1 to
-                                                 transmit string #2
-       print_screen                mc0      ps   print contents of screen
-       prtr_off                    mc4      pf   turn off printer
-       prtr_on                     mc5      po   turn on printer
-       repeat_char                 rep      rp   repeat char #1 #2 times (P*)
-       reset_1string               rs1      r1   reset string
-       reset_2string               rs2      r2   reset string
-       reset_3string               rs3      r3   reset string
-       reset_file                  rf       rf   name of reset file
-       restore_cursor              rc       rc   restore cursor to position of
-                                                 last save_cursor
-       row_address                 vpa      cv   vertical position #1 absolute
-                                                 (P)
-       save_cursor                 sc       sc   save current cursor position
-                                                 (P)
-       scroll_forward              ind      sf   scroll text up (P)
-       scroll_reverse              ri       sr   scroll text down (P)
-       set_attributes              sgr      sa   define video attributes #1-#9
-                                                 (PG9)
-       set_tab                     hts      st   set a tab in every row,
-                                                 current columns
-       set_window                  wind     wi   current window is lines #1-#2
-                                                 cols #3-#4
-       tab                         ht       ta   tab to next 8-space hardware
-                                                 tab stop
-       to_status_line              tsl      ts   move to status line, column
-                                                 #1
-       underline_char              uc       uc   underline char and move past
-                                                 it
-       up_half_line                hu       hu   half a line up
-       init_prog                   iprog    iP   path name of program for
-                                                 initialization
-       key_a1                      ka1      K1   upper left of keypad
-       key_a3                      ka3      K3   upper right of keypad
-       key_b2                      kb2      K2   center of keypad
-       key_c1                      kc1      K4   lower left of keypad
-       key_c3                      kc3      K5   lower right of keypad
-
-       prtr_non                    mc5p     pO   turn on printer for #1 bytes
-       char_padding                rmp      rP   like ip but when in insert
-                                                 mode
-       acs_chars                   acsc     ac   graphics charset pairs, based
-                                                 on vt100
-       plab_norm                   pln      pn   program label #1 to show
-                                                 string #2
-       key_btab                    kcbt     kB   back-tab key
-       enter_xon_mode              smxon    SX   turn on xon/xoff handshaking
-       exit_xon_mode               rmxon    RX   turn off xon/xoff handshaking
-       enter_am_mode               smam     SA   turn on automatic margins
-       exit_am_mode                rmam     RA   turn off automatic margins
-       xon_character               xonc     XN   XON character
-       xoff_character              xoffc    XF   XOFF character
-       ena_acs                     enacs    eA   enable alternate char set
-       label_on                    smln     LO   turn on soft labels
-       label_off                   rmln     LF   turn off soft labels
-       key_beg                     kbeg     @1   begin key
-       key_cancel                  kcan     @2   cancel key
-       key_close                   kclo     @3   close key
-       key_command                 kcmd     @4   command key
-       key_copy                    kcpy     @5   copy key
-       key_create                  kcrt     @6   create key
-       key_end                     kend     @7   end key
-       key_enter                   kent     @8   enter/send key
-       key_exit                    kext     @9   exit key
-       key_find                    kfnd     @0   find key
-       key_help                    khlp     %1   help key
-       key_mark                    kmrk     %2   mark key
-       key_message                 kmsg     %3   message key
-       key_move                    kmov     %4   move key
-       key_next                    knxt     %5   next key
-       key_open                    kopn     %6   open key
-       key_options                 kopt     %7   options key
-       key_previous                kprv     %8   previous key
-       key_print                   kprt     %9   print key
-       key_redo                    krdo     %0   redo key
-       key_reference               kref     &1   reference key
-       key_refresh                 krfr     &2   refresh key
-       key_replace                 krpl     &3   replace key
-       key_restart                 krst     &4   restart key
-       key_resume                  kres     &5   resume key
-       key_save                    ksav     &6   save key
-       key_suspend                 kspd     &7   suspend key
-       key_undo                    kund     &8   undo key
-       key_sbeg                    kBEG     &9   shifted begin key
-       key_scancel                 kCAN     &0   shifted cancel key
-       key_scommand                kCMD     *1   shifted command key
-       key_scopy                   kCPY     *2   shifted copy key
-       key_screate                 kCRT     *3   shifted create key
-       key_sdc                     kDC      *4   shifted delete-character key
-       key_sdl                     kDL      *5   shifted delete-line key
-       key_select                  kslt     *6   select key
-       key_send                    kEND     *7   shifted end key
-       key_seol                    kEOL     *8   shifted clear-to-end-of-line
-                                                 key
-       key_sexit                   kEXT     *9   shifted exit key
-       key_sfind                   kFND     *0   shifted find key
-       key_shelp                   kHLP     #1   shifted help key
-       key_shome                   kHOM     #2   shifted home key
-       key_sic                     kIC      #3   shifted insert-character key
-       key_sleft                   kLFT     #4   shifted left-arrow key
-       key_smessage                kMSG     %a   shifted message key
-       key_smove                   kMOV     %b   shifted move key
-       key_snext                   kNXT     %c   shifted next key
-
-       key_soptions                kOPT     %d   shifted options key
-       key_sprevious               kPRV     %e   shifted previous key
-       key_sprint                  kPRT     %f   shifted print key
-       key_sredo                   kRDO     %g   shifted redo key
-       key_sreplace                kRPL     %h   shifted replace key
-       key_sright                  kRIT     %i   shifted right-arrow key
-       key_srsume                  kRES     %j   shifted resume key
-       key_ssave                   kSAV     !1   shifted save key
-       key_ssuspend                kSPD     !2   shifted suspend key
-       key_sundo                   kUND     !3   shifted undo key
-       req_for_input               rfi      RF   send next input char (for
-                                                 ptys)
-       key_f11                     kf11     F1   F11 function key
-       key_f12                     kf12     F2   F12 function key
-       key_f13                     kf13     F3   F13 function key
-       key_f14                     kf14     F4   F14 function key
-       key_f15                     kf15     F5   F15 function key
-       key_f16                     kf16     F6   F16 function key
-       key_f17                     kf17     F7   F17 function key
-       key_f18                     kf18     F8   F18 function key
-       key_f19                     kf19     F9   F19 function key
-       key_f20                     kf20     FA   F20 function key
-       key_f21                     kf21     FB   F21 function key
-       key_f22                     kf22     FC   F22 function key
-       key_f23                     kf23     FD   F23 function key
-       key_f24                     kf24     FE   F24 function key
-       key_f25                     kf25     FF   F25 function key
-       key_f26                     kf26     FG   F26 function key
-       key_f27                     kf27     FH   F27 function key
-       key_f28                     kf28     FI   F28 function key
-       key_f29                     kf29     FJ   F29 function key
-       key_f30                     kf30     FK   F30 function key
-       key_f31                     kf31     FL   F31 function key
-       key_f32                     kf32     FM   F32 function key
-       key_f33                     kf33     FN   F33 function key
-       key_f34                     kf34     FO   F34 function key
-       key_f35                     kf35     FP   F35 function key
-       key_f36                     kf36     FQ   F36 function key
-       key_f37                     kf37     FR   F37 function key
-       key_f38                     kf38     FS   F38 function key
-       key_f39                     kf39     FT   F39 function key
-       key_f40                     kf40     FU   F40 function key
-       key_f41                     kf41     FV   F41 function key
-       key_f42                     kf42     FW   F42 function key
-       key_f43                     kf43     FX   F43 function key
-       key_f44                     kf44     FY   F44 function key
-       key_f45                     kf45     FZ   F45 function key
-       key_f46                     kf46     Fa   F46 function key
-       key_f47                     kf47     Fb   F47 function key
-       key_f48                     kf48     Fc   F48 function key
-       key_f49                     kf49     Fd   F49 function key
-       key_f50                     kf50     Fe   F50 function key
-       key_f51                     kf51     Ff   F51 function key
-       key_f52                     kf52     Fg   F52 function key
-       key_f53                     kf53     Fh   F53 function key
-       key_f54                     kf54     Fi   F54 function key
-       key_f55                     kf55     Fj   F55 function key
-       key_f56                     kf56     Fk   F56 function key
-       key_f57                     kf57     Fl   F57 function key
-       key_f58                     kf58     Fm   F58 function key
-       key_f59                     kf59     Fn   F59 function key
-       key_f60                     kf60     Fo   F60 function key
-       key_f61                     kf61     Fp   F61 function key
-       key_f62                     kf62     Fq   F62 function key
-       key_f63                     kf63     Fr   F63 function key
-
-       clr_bol                     el1      cb   Clear to beginning of line
-       clear_margins               mgc      MC   clear right and left soft
-                                                 margins
-       set_left_margin             smgl     ML   set left soft margin at
-                                                 current column. (ML is not in
-                                                 BSD termcap).
-       set_right_margin            smgr     MR   set right soft margin at
-                                                 current column
-       label_format                fln      Lf   label format
-       set_clock                   sclk     SC   set clock, #1 hrs #2 mins #3
-                                                 secs
-       display_clock               dclk     DK   display clock
-       remove_clock                rmclk    RC   remove clock
-       create_window               cwin     CW   define a window #1 from #2,#3
-                                                 to #4,#5
-       goto_window                 wingo    WG   go to window #1
-       hangup                      hup      HU   hang-up phone
-       dial_phone                  dial     DI   dial number #1
-       quick_dial                  qdial    QD   dial number #1 without
-                                                 checking
-       tone                        tone     TO   select touch tone dialing
-       pulse                       pulse    PU   select pulse dialing
-       flash_hook                  hook     fh   flash switch hook
-       fixed_pause                 pause    PA   pause for 2-3 seconds
-       wait_tone                   wait     WA   wait for dial-tone
-       user0                       u0       u0   User string #0
-       user1                       u1       u1   User string #1
-       user2                       u2       u2   User string #2
-       user3                       u3       u3   User string #3
-       user4                       u4       u4   User string #4
-       user5                       u5       u5   User string #5
-       user6                       u6       u6   User string #6
-       user7                       u7       u7   User string #7
-       user8                       u8       u8   User string #8
-       user9                       u9       u9   User string #9
-       orig_pair                   op       op   Set default pair to its
-                                                 original value
-       orig_colors                 oc       oc   Set all color pairs to the
-                                                 original ones
-       initialize_color            initc    Ic   initialize color #1 to
-                                                 (#2,#3,#4)
-       initialize_pair             initp    Ip   Initialize color pair #1 to
-                                                 fg=(#2,#3,#4), bg=(#5,#6,#7)
-       set_color_pair              scp      sp   Set current color pair to #1
-       set_foreground              setf     Sf   Set foreground color #1
-       set_background              setb     Sb   Set background color #1
-       change_char_pitch           cpi      ZA   Change number of characters
-                                                 per inch to #1
-       change_line_pitch           lpi      ZB   Change number of lines per
-                                                 inch to #1
-       change_res_horz             chr      ZC   Change horizontal resolution
-                                                 to #1
-       change_res_vert             cvr      ZD   Change vertical resolution to
-                                                 #1
-       define_char                 defc     ZE   Define a character #1, #2
-                                                 dots wide, descender #3
-       enter_doublewide_mode       swidm    ZF   Enter double-wide mode
-       enter_draft_quality         sdrfq    ZG   Enter draft-quality mode
-       enter_italics_mode          sitm     ZH   Enter italic mode
-       enter_leftward_mode         slm      ZI   Start leftward carriage
-                                                 motion
-       enter_micro_mode            smicm    ZJ   Start micro-motion mode
-       enter_near_letter_quality   snlq     ZK   Enter NLQ mode
-       enter_normal_quality        snrmq    ZL   Enter normal-quality mode
-       enter_shadow_mode           sshm     ZM   Enter shadow-print mode
-
-       enter_subscript_mode        ssubm    ZN   Enter subscript mode
-       enter_superscript_mode      ssupm    ZO   Enter superscript mode
-       enter_upward_mode           sum      ZP   Start upward carriage motion
-       exit_doublewide_mode        rwidm    ZQ   End double-wide mode
-       exit_italics_mode           ritm     ZR   End italic mode
-       exit_leftward_mode          rlm      ZS   End left-motion mode
-       exit_micro_mode             rmicm    ZT   End micro-motion mode
-       exit_shadow_mode            rshm     ZU   End shadow-print mode
-       exit_subscript_mode         rsubm    ZV   End subscript mode
-       exit_superscript_mode       rsupm    ZW   End superscript mode
-       exit_upward_mode            rum      ZX   End reverse character motion
-       micro_column_address        mhpa     ZY   Like column_address in micro
-                                                 mode
-       micro_down                  mcud1    ZZ   Like cursor_down in micro
-                                                 mode
-       micro_left                  mcub1    Za   Like cursor_left in micro
-                                                 mode
-       micro_right                 mcuf1    Zb   Like cursor_right in micro
-                                                 mode
-       micro_row_address           mvpa     Zc   Like row_address #1 in micro
-                                                 mode
-       micro_up                    mcuu1    Zd   Like cursor_up in micro mode
-       order_of_pins               porder   Ze   Match software bits to print-
-                                                 head pins
-       parm_down_micro             mcud     Zf   Like parm_down_cursor in
-                                                 micro mode
-       parm_left_micro             mcub     Zg   Like parm_left_cursor in
-                                                 micro mode
-       parm_right_micro            mcuf     Zh   Like parm_right_cursor in
-                                                 micro mode
-       parm_up_micro               mcuu     Zi   Like parm_up_cursor in micro
-                                                 mode
-       select_char_set             scs      Zj   Select character set, #1
-       set_bottom_margin           smgb     Zk   Set bottom margin at current
-                                                 line
-       set_bottom_margin_parm      smgbp    Zl   Set bottom margin at line #1
-                                                 or (if smgtp is not given) #2
-                                                 lines from bottom
-       set_left_margin_parm        smglp    Zm   Set left (right) margin at
-                                                 column #1
-       set_right_margin_parm       smgrp    Zn   Set right margin at column #1
-       set_top_margin              smgt     Zo   Set top margin at current
-                                                 line
-       set_top_margin_parm         smgtp    Zp   Set top (bottom) margin at
-                                                 row #1
-       start_bit_image             sbim     Zq   Start printing bit image
-                                                 graphics
-       start_char_set_def          scsd     Zr   Start character set
-                                                 definition #1, with #2
-                                                 characters in the set
-       stop_bit_image              rbim     Zs   Stop printing bit image
-                                                 graphics
-       stop_char_set_def           rcsd     Zt   End definition of character
-                                                 set #1
-       subscript_characters        subcs    Zu   List of subscriptable
-                                                 characters
-       superscript_characters      supcs    Zv   List of superscriptable
-                                                 characters
-       these_cause_cr              docr     Zw   Printing any of these
-                                                 characters causes CR
-       zero_motion                 zerom    Zx   No motion for subsequent
-                                                 character
-
-       The following string  capabilities  are  present  in  the  SVr4.0  term
+       back_tab                   cbt       bt  back tab (P)
+       bell                       bel       bl  audible signal (bell) (P)
+       carriage_return            cr        cr  carriage return (P*) (P*)
+       change_scroll_region       csr       cs  change region to line #1 to
+                                                line #2 (P)
+       clear_all_tabs             tbc       ct  clear all tab stops (P)
+       clear_screen               clear     cl  clear screen and home cursor
+                                                (P*)
+       clr_eol                    el        ce  clear to end of line (P)
+       clr_eos                    ed        cd  clear to end of screen (P*)
+       column_address             hpa       ch  horizontal position #1,
+                                                absolute (P)
+       command_character          cmdch     CC  terminal settable cmd
+                                                character in prototype !?
+       cursor_address             cup       cm  move to row #1 columns #2
+       cursor_down                cud1      do  down one line
+       cursor_home                home      ho  home cursor (if no cup)
+       cursor_invisible           civis     vi  make cursor invisible
+       cursor_left                cub1      le  move left one space
+       cursor_mem_address         mrcup     CM  memory relative cursor
+                                                addressing, move to row #1
+                                                columns #2
+       cursor_normal              cnorm     ve  make cursor appear normal
+                                                (undo civis/cvvis)
+       cursor_right               cuf1      nd  non-destructive space (move
+                                                right one space)
+       cursor_to_ll               ll        ll  last line, first column (if no
+                                                cup)
+       cursor_up                  cuu1      up  up one line
+       cursor_visible             cvvis     vs  make cursor very visible
+       delete_character           dch1      dc  delete character (P*)
+       delete_line                dl1       dl  delete line (P*)
+       dis_status_line            dsl       ds  disable status line
+       down_half_line             hd        hd  half a line down
+       enter_alt_charset_mode     smacs     as  start alternate character set
+                                                (P)
+       enter_blink_mode           blink     mb  turn on blinking
+       enter_bold_mode            bold      md  turn on bold (extra bright)
+                                                mode
+       enter_ca_mode              smcup     ti  string to start programs using
+                                                cup
+       enter_delete_mode          smdc      dm  enter delete mode
+       enter_dim_mode             dim       mh  turn on half-bright mode
+       enter_insert_mode          smir      im  enter insert mode
+       enter_secure_mode          invis     mk  turn on blank mode (characters
+                                                invisible)
+       enter_protected_mode       prot      mp  turn on protected mode
+       enter_reverse_mode         rev       mr  turn on reverse video mode
+       enter_standout_mode        smso      so  begin standout mode
+       enter_underline_mode       smul      us  begin underline mode
+       erase_chars                ech       ec  erase #1 characters (P)
+       exit_alt_charset_mode      rmacs     ae  end alternate character set
+                                                (P)
+       exit_attribute_mode        sgr0      me  turn off all attributes
+       exit_ca_mode               rmcup     te  strings to end programs using
+                                                cup
+       exit_delete_mode           rmdc      ed  end delete mode
+       exit_insert_mode           rmir      ei  exit insert mode
+
+       exit_standout_mode         rmso      se  exit standout mode
+       exit_underline_mode        rmul      ue  exit underline mode
+       flash_screen               flash     vb  visible bell (may not move
+                                                cursor)
+       form_feed                  ff        ff  hardcopy terminal page eject
+                                                (P*)
+       from_status_line           fsl       fs  return from status line
+       init_1string               is1       i1  initialization string
+       init_2string               is2       is  initialization string
+       init_3string               is3       i3  initialization string
+       init_file                  if        if  name of initialization file
+       insert_character           ich1      ic  insert character (P)
+       insert_line                il1       al  insert line (P*)
+       insert_padding             ip        ip  insert padding after inserted
+                                                character
+       key_backspace              kbs       kb  backspace key
+       key_catab                  ktbc      ka  clear-all-tabs key
+       key_clear                  kclr      kC  clear-screen or erase key
+       key_ctab                   kctab     kt  clear-tab key
+       key_dc                     kdch1     kD  delete-character key
+       key_dl                     kdl1      kL  delete-line key
+       key_down                   kcud1     kd  down-arrow key
+       key_eic                    krmir     kM  sent by rmir or smir in insert
+                                                mode
+       key_eol                    kel       kE  clear-to-end-of-line key
+       key_eos                    ked       kS  clear-to-end-of-screen key
+       key_f0                     kf0       k0  F0 function key
+       key_f1                     kf1       k1  F1 function key
+       key_f10                    kf10      k;  F10 function key
+       key_f2                     kf2       k2  F2 function key
+       key_f3                     kf3       k3  F3 function key
+       key_f4                     kf4       k4  F4 function key
+       key_f5                     kf5       k5  F5 function key
+       key_f6                     kf6       k6  F6 function key
+       key_f7                     kf7       k7  F7 function key
+       key_f8                     kf8       k8  F8 function key
+       key_f9                     kf9       k9  F9 function key
+       key_home                   khome     kh  home key
+       key_ic                     kich1     kI  insert-character key
+       key_il                     kil1      kA  insert-line key
+       key_left                   kcub1     kl  left-arrow key
+       key_ll                     kll       kH  lower-left key (home down)
+       key_npage                  knp       kN  next-page key
+       key_ppage                  kpp       kP  previous-page key
+       key_right                  kcuf1     kr  right-arrow key
+       key_sf                     kind      kF  scroll-forward key
+       key_sr                     kri       kR  scroll-backward key
+       key_stab                   khts      kT  set-tab key
+       key_up                     kcuu1     ku  up-arrow key
+       keypad_local               rmkx      ke  leave keyboard transmit mode
+       keypad_xmit                smkx      ks  enter keyboard transmit mode
+       lab_f0                     lf0       l0  label on function key f0 if
+                                                not f0
+       lab_f1                     lf1       l1  label on function key f1 if
+                                                not f1
+       lab_f10                    lf10      la  label on function key f10 if
+                                                not f10
+       lab_f2                     lf2       l2  label on function key f2 if
+                                                not f2
+       lab_f3                     lf3       l3  label on function key f3 if
+                                                not f3
+       lab_f4                     lf4       l4  label on function key f4 if
+                                                not f4
+       lab_f5                     lf5       l5  label on function key f5 if
+                                                not f5
+
+       lab_f6                     lf6       l6  label on function key f6 if
+                                                not f6
+       lab_f7                     lf7       l7  label on function key f7 if
+                                                not f7
+       lab_f8                     lf8       l8  label on function key f8 if
+                                                not f8
+       lab_f9                     lf9       l9  label on function key f9 if
+                                                not f9
+       meta_off                   rmm       mo  turn off meta mode
+       meta_on                    smm       mm  turn on meta mode (8th-bit on)
+       newline                    nel       nw  newline (behave like cr
+                                                followed by lf)
+       pad_char                   pad       pc  padding char (instead of null)
+       parm_dch                   dch       DC  delete #1 characters (P*)
+       parm_delete_line           dl        DL  delete #1 lines (P*)
+       parm_down_cursor           cud       DO  down #1 lines (P*)
+       parm_ich                   ich       IC  insert #1 characters (P*)
+       parm_index                 indn      SF  scroll forward #1 lines (P)
+       parm_insert_line           il        AL  insert #1 lines (P*)
+       parm_left_cursor           cub       LE  move #1 characters to the left
+                                                (P)
+       parm_right_cursor          cuf       RI  move #1 characters to the
+                                                right (P*)
+       parm_rindex                rin       SR  scroll back #1 lines (P)
+       parm_up_cursor             cuu       UP  up #1 lines (P*)
+       pkey_key                   pfkey     pk  program function key #1 to
+                                                type string #2
+       pkey_local                 pfloc     pl  program function key #1 to
+                                                execute string #2
+       pkey_xmit                  pfx       px  program function key #1 to
+                                                transmit string #2
+       print_screen               mc0       ps  print contents of screen
+       prtr_off                   mc4       pf  turn off printer
+       prtr_on                    mc5       po  turn on printer
+       repeat_char                rep       rp  repeat char #1 #2 times (P*)
+       reset_1string              rs1       r1  reset string
+       reset_2string              rs2       r2  reset string
+       reset_3string              rs3       r3  reset string
+       reset_file                 rf        rf  name of reset file
+       restore_cursor             rc        rc  restore cursor to position of
+                                                last save_cursor
+       row_address                vpa       cv  vertical position #1 absolute
+                                                (P)
+       save_cursor                sc        sc  save current cursor position
+                                                (P)
+       scroll_forward             ind       sf  scroll text up (P)
+       scroll_reverse             ri        sr  scroll text down (P)
+       set_attributes             sgr       sa  define video attributes #1-#9
+                                                (PG9)
+       set_tab                    hts       st  set a tab in every row,
+                                                current columns
+       set_window                 wind      wi  current window is lines #1-#2
+                                                cols #3-#4
+       tab                        ht        ta  tab to next 8-space hardware
+                                                tab stop
+       to_status_line             tsl       ts  move to status line, column #1
+       underline_char             uc        uc  underline char and move past
+                                                it
+       up_half_line               hu        hu  half a line up
+       init_prog                  iprog     iP  path name of program for
+                                                initialization
+       key_a1                     ka1       K1  upper left of keypad
+       key_a3                     ka3       K3  upper right of keypad
+       key_b2                     kb2       K2  center of keypad
+       key_c1                     kc1       K4  lower left of keypad
+
+       key_c3                     kc3       K5  lower right of keypad
+       prtr_non                   mc5p      pO  turn on printer for #1 bytes
+       char_padding               rmp       rP  like ip but when in insert
+                                                mode
+       acs_chars                  acsc      ac  graphics charset pairs, based
+                                                on vt100
+       plab_norm                  pln       pn  program label #1 to show
+                                                string #2
+       key_btab                   kcbt      kB  back-tab key
+       enter_xon_mode             smxon     SX  turn on xon/xoff handshaking
+       exit_xon_mode              rmxon     RX  turn off xon/xoff handshaking
+       enter_am_mode              smam      SA  turn on automatic margins
+       exit_am_mode               rmam      RA  turn off automatic margins
+       xon_character              xonc      XN  XON character
+       xoff_character             xoffc     XF  XOFF character
+       ena_acs                    enacs     eA  enable alternate char set
+       label_on                   smln      LO  turn on soft labels
+       label_off                  rmln      LF  turn off soft labels
+       key_beg                    kbeg      @1  begin key
+       key_cancel                 kcan      @2  cancel key
+       key_close                  kclo      @3  close key
+       key_command                kcmd      @4  command key
+       key_copy                   kcpy      @5  copy key
+       key_create                 kcrt      @6  create key
+       key_end                    kend      @7  end key
+       key_enter                  kent      @8  enter/send key
+       key_exit                   kext      @9  exit key
+       key_find                   kfnd      @0  find key
+       key_help                   khlp      %1  help key
+       key_mark                   kmrk      %2  mark key
+       key_message                kmsg      %3  message key
+       key_move                   kmov      %4  move key
+       key_next                   knxt      %5  next key
+       key_open                   kopn      %6  open key
+       key_options                kopt      %7  options key
+       key_previous               kprv      %8  previous key
+       key_print                  kprt      %9  print key
+       key_redo                   krdo      %0  redo key
+       key_reference              kref      &1  reference key
+       key_refresh                krfr      &2  refresh key
+       key_replace                krpl      &3  replace key
+       key_restart                krst      &4  restart key
+       key_resume                 kres      &5  resume key
+       key_save                   ksav      &6  save key
+       key_suspend                kspd      &7  suspend key
+       key_undo                   kund      &8  undo key
+       key_sbeg                   kBEG      &9  shifted begin key
+       key_scancel                kCAN      &0  shifted cancel key
+       key_scommand               kCMD      *1  shifted command key
+       key_scopy                  kCPY      *2  shifted copy key
+       key_screate                kCRT      *3  shifted create key
+       key_sdc                    kDC       *4  shifted delete-character key
+       key_sdl                    kDL       *5  shifted delete-line key
+       key_select                 kslt      *6  select key
+       key_send                   kEND      *7  shifted end key
+       key_seol                   kEOL      *8  shifted clear-to-end-of-line
+                                                key
+       key_sexit                  kEXT      *9  shifted exit key
+       key_sfind                  kFND      *0  shifted find key
+       key_shelp                  kHLP      #1  shifted help key
+       key_shome                  kHOM      #2  shifted home key
+       key_sic                    kIC       #3  shifted insert-character key
+       key_sleft                  kLFT      #4  shifted left-arrow key
+       key_smessage               kMSG      %a  shifted message key
+       key_smove                  kMOV      %b  shifted move key
+
+       key_snext                  kNXT      %c  shifted next key
+       key_soptions               kOPT      %d  shifted options key
+       key_sprevious              kPRV      %e  shifted previous key
+       key_sprint                 kPRT      %f  shifted print key
+       key_sredo                  kRDO      %g  shifted redo key
+       key_sreplace               kRPL      %h  shifted replace key
+       key_sright                 kRIT      %i  shifted right-arrow key
+       key_srsume                 kRES      %j  shifted resume key
+       key_ssave                  kSAV      !1  shifted save key
+       key_ssuspend               kSPD      !2  shifted suspend key
+       key_sundo                  kUND      !3  shifted undo key
+       req_for_input              rfi       RF  send next input char (for
+                                                ptys)
+       key_f11                    kf11      F1  F11 function key
+       key_f12                    kf12      F2  F12 function key
+       key_f13                    kf13      F3  F13 function key
+       key_f14                    kf14      F4  F14 function key
+       key_f15                    kf15      F5  F15 function key
+       key_f16                    kf16      F6  F16 function key
+       key_f17                    kf17      F7  F17 function key
+       key_f18                    kf18      F8  F18 function key
+       key_f19                    kf19      F9  F19 function key
+       key_f20                    kf20      FA  F20 function key
+       key_f21                    kf21      FB  F21 function key
+       key_f22                    kf22      FC  F22 function key
+       key_f23                    kf23      FD  F23 function key
+       key_f24                    kf24      FE  F24 function key
+       key_f25                    kf25      FF  F25 function key
+       key_f26                    kf26      FG  F26 function key
+       key_f27                    kf27      FH  F27 function key
+       key_f28                    kf28      FI  F28 function key
+       key_f29                    kf29      FJ  F29 function key
+       key_f30                    kf30      FK  F30 function key
+       key_f31                    kf31      FL  F31 function key
+       key_f32                    kf32      FM  F32 function key
+       key_f33                    kf33      FN  F33 function key
+       key_f34                    kf34      FO  F34 function key
+       key_f35                    kf35      FP  F35 function key
+       key_f36                    kf36      FQ  F36 function key
+       key_f37                    kf37      FR  F37 function key
+       key_f38                    kf38      FS  F38 function key
+       key_f39                    kf39      FT  F39 function key
+       key_f40                    kf40      FU  F40 function key
+       key_f41                    kf41      FV  F41 function key
+       key_f42                    kf42      FW  F42 function key
+       key_f43                    kf43      FX  F43 function key
+       key_f44                    kf44      FY  F44 function key
+       key_f45                    kf45      FZ  F45 function key
+       key_f46                    kf46      Fa  F46 function key
+       key_f47                    kf47      Fb  F47 function key
+       key_f48                    kf48      Fc  F48 function key
+       key_f49                    kf49      Fd  F49 function key
+       key_f50                    kf50      Fe  F50 function key
+       key_f51                    kf51      Ff  F51 function key
+       key_f52                    kf52      Fg  F52 function key
+       key_f53                    kf53      Fh  F53 function key
+       key_f54                    kf54      Fi  F54 function key
+       key_f55                    kf55      Fj  F55 function key
+       key_f56                    kf56      Fk  F56 function key
+       key_f57                    kf57      Fl  F57 function key
+       key_f58                    kf58      Fm  F58 function key
+       key_f59                    kf59      Fn  F59 function key
+       key_f60                    kf60      Fo  F60 function key
+       key_f61                    kf61      Fp  F61 function key
+       key_f62                    kf62      Fq  F62 function key
+
+       key_f63                    kf63      Fr  F63 function key
+       clr_bol                    el1       cb  Clear to beginning of line
+       clear_margins              mgc       MC  clear right and left soft
+                                                margins
+       set_left_margin            smgl      ML  set left soft margin at
+                                                current column.  (ML is not in
+                                                BSD termcap).
+       set_right_margin           smgr      MR  set right soft margin at
+                                                current column
+       label_format               fln       Lf  label format
+       set_clock                  sclk      SC  set clock, #1 hrs #2 mins #3
+                                                secs
+       display_clock              dclk      DK  display clock
+       remove_clock               rmclk     RC  remove clock
+       create_window              cwin      CW  define a window #1 from #2,#3
+                                                to #4,#5
+       goto_window                wingo     WG  go to window #1
+       hangup                     hup       HU  hang-up phone
+       dial_phone                 dial      DI  dial number #1
+       quick_dial                 qdial     QD  dial number #1 without
+                                                checking
+       tone                       tone      TO  select touch tone dialing
+       pulse                      pulse     PU  select pulse dialing
+       flash_hook                 hook      fh  flash switch hook
+       fixed_pause                pause     PA  pause for 2-3 seconds
+       wait_tone                  wait      WA  wait for dial-tone
+       user0                      u0        u0  User string #0
+       user1                      u1        u1  User string #1
+       user2                      u2        u2  User string #2
+       user3                      u3        u3  User string #3
+       user4                      u4        u4  User string #4
+       user5                      u5        u5  User string #5
+       user6                      u6        u6  User string #6
+       user7                      u7        u7  User string #7
+       user8                      u8        u8  User string #8
+       user9                      u9        u9  User string #9
+       orig_pair                  op        op  Set default pair to its
+                                                original value
+       orig_colors                oc        oc  Set all color pairs to the
+                                                original ones
+       initialize_color           initc     Ic  initialize color #1 to
+                                                (#2,#3,#4)
+       initialize_pair            initp     Ip  Initialize color pair #1 to
+                                                fg=(#2,#3,#4), bg=(#5,#6,#7)
+       set_color_pair             scp       sp  Set current color pair to #1
+       set_foreground             setf      Sf  Set foreground color #1
+       set_background             setb      Sb  Set background color #1
+       change_char_pitch          cpi       ZA  Change number of characters
+                                                per inch to #1
+       change_line_pitch          lpi       ZB  Change number of lines per
+                                                inch to #1
+       change_res_horz            chr       ZC  Change horizontal resolution
+                                                to #1
+       change_res_vert            cvr       ZD  Change vertical resolution to
+                                                #1
+       define_char                defc      ZE  Define a character #1, #2 dots
+                                                wide, descender #3
+       enter_doublewide_mode      swidm     ZF  Enter double-wide mode
+       enter_draft_quality        sdrfq     ZG  Enter draft-quality mode
+       enter_italics_mode         sitm      ZH  Enter italic mode
+       enter_leftward_mode        slm       ZI  Start leftward carriage motion
+       enter_micro_mode           smicm     ZJ  Start micro-motion mode
+       enter_near_letter_quality  snlq      ZK  Enter NLQ mode
+       enter_normal_quality       snrmq     ZL  Enter normal-quality mode
+       enter_shadow_mode          sshm      ZM  Enter shadow-print mode
+
+       enter_subscript_mode       ssubm     ZN  Enter subscript mode
+       enter_superscript_mode     ssupm     ZO  Enter superscript mode
+       enter_upward_mode          sum       ZP  Start upward carriage motion
+       exit_doublewide_mode       rwidm     ZQ  End double-wide mode
+       exit_italics_mode          ritm      ZR  End italic mode
+       exit_leftward_mode         rlm       ZS  End left-motion mode
+       exit_micro_mode            rmicm     ZT  End micro-motion mode
+       exit_shadow_mode           rshm      ZU  End shadow-print mode
+       exit_subscript_mode        rsubm     ZV  End subscript mode
+       exit_superscript_mode      rsupm     ZW  End superscript mode
+       exit_upward_mode           rum       ZX  End reverse character motion
+       micro_column_address       mhpa      ZY  Like column_address in micro
+                                                mode
+       micro_down                 mcud1     ZZ  Like cursor_down in micro mode
+       micro_left                 mcub1     Za  Like cursor_left in micro mode
+       micro_right                mcuf1     Zb  Like cursor_right in micro
+                                                mode
+       micro_row_address          mvpa      Zc  Like row_address #1 in micro
+                                                mode
+       micro_up                   mcuu1     Zd  Like cursor_up in micro mode
+       order_of_pins              porder    Ze  Match software bits to print-
+                                                head pins
+       parm_down_micro            mcud      Zf  Like parm_down_cursor in micro
+                                                mode
+       parm_left_micro            mcub      Zg  Like parm_left_cursor in micro
+                                                mode
+       parm_right_micro           mcuf      Zh  Like parm_right_cursor in
+                                                micro mode
+       parm_up_micro              mcuu      Zi  Like parm_up_cursor in micro
+                                                mode
+       select_char_set            scs       Zj  Select character set, #1
+       set_bottom_margin          smgb      Zk  Set bottom margin at current
+                                                line
+       set_bottom_margin_parm     smgbp     Zl  Set bottom margin at line #1
+                                                or (if smgtp is not given) #2
+                                                lines from bottom
+       set_left_margin_parm       smglp     Zm  Set left (right) margin at
+                                                column #1
+       set_right_margin_parm      smgrp     Zn  Set right margin at column #1
+       set_top_margin             smgt      Zo  Set top margin at current line
+       set_top_margin_parm        smgtp     Zp  Set top (bottom) margin at row
+                                                #1
+       start_bit_image            sbim      Zq  Start printing bit image
+                                                graphics
+       start_char_set_def         scsd      Zr  Start character set definition
+                                                #1, with #2 characters in the
+                                                set
+       stop_bit_image             rbim      Zs  Stop printing bit image
+                                                graphics
+       stop_char_set_def          rcsd      Zt  End definition of character
+                                                set #1
+       subscript_characters       subcs     Zu  List of subscriptable
+                                                characters
+       superscript_characters     supcs     Zv  List of superscriptable
+                                                characters
+       these_cause_cr             docr      Zw  Printing any of these
+                                                characters causes CR
+       zero_motion                zerom     Zx  No motion for subsequent
+                                                character
+
+       The  following  string  capabilities  are  present  in  the SVr4.0 term
        structure, but were originally not documented in the man page.
 
-                                       Code
-       String Capability Name      TI         TC   Description
+                                      Code
+
+
+       String Capability Name     TI        TC  Description
        ------------------------------------------------------------------------
-       char_set_names              csnm       Zy   Produce #1'th item from
-                                                   list of character set names
-       key_mouse                   kmous      Km   Mouse event has occurred
-       mouse_info                  minfo      Mi   Mouse status information
-       req_mouse_pos               reqmp      RQ   Request mouse position
-       get_mouse                   getm       Gm   Curses should get button
-                                                   events, parameter #1 not
-                                                   documented.
-       set_a_foreground            setaf      AF   Set foreground color to #1,
-                                                   using ANSI escape
-       set_a_background            setab      AB   Set background color to #1,
-                                                   using ANSI escape
-       pkey_plab                   pfxl       xl   Program function key #1 to
-                                                   type string #2 and show
-                                                   string #3
-       device_type                 devt       dv   Indicate language, codeset
-                                                   support
-       code_set_init               csin       ci   Init sequence for multiple
-                                                   codesets
-       set0_des_seq                s0ds       s0   Shift to codeset 0 (EUC set
-                                                   0, ASCII)
-       set1_des_seq                s1ds       s1   Shift to codeset 1
-       set2_des_seq                s2ds       s2   Shift to codeset 2
-       set3_des_seq                s3ds       s3   Shift to codeset 3
-       set_lr_margin               smglr      ML   Set both left and right
-                                                   margins to #1, #2.  (ML is
-                                                   not in BSD termcap).
-       set_tb_margin               smgtb      MT   Sets both top and bottom
-                                                   margins to #1, #2
-       bit_image_repeat            birep      Xy   Repeat bit image cell #1 #2
-                                                   times
-       bit_image_newline           binel      Zz   Move to next row of the bit
-                                                   image
-       bit_image_carriage_return   bicr       Yv   Move to beginning of same
-                                                   row
-       color_names                 colornm    Yw   Give name for color #1
-       define_bit_image_region     defbi      Yx   Define rectangular bit
-                                                   image region
-       end_bit_image_region        endbi      Yy   End a bit-image region
-       set_color_band              setcolor   Yz   Change to ribbon color #1
-       set_page_length             slines     YZ   Set page length to #1 lines
-       display_pc_char             dispc      S1   Display PC character #1
-       enter_pc_charset_mode       smpch      S2   Enter PC character display
-                                                   mode
-       exit_pc_charset_mode        rmpch      S3   Exit PC character display
-                                                   mode
-       enter_scancode_mode         smsc       S4   Enter PC scancode mode
-       exit_scancode_mode          rmsc       S5   Exit PC scancode mode
-       pc_term_options             pctrm      S6   PC terminal options
-       scancode_escape             scesc      S7   Escape for scancode
-                                                   emulation
-       alt_scancode_esc            scesa      S8   Alternate escape for
-                                                   scancode emulation
+       char_set_names             csnm      Zy  Produce #1'th item from list
+                                                of character set names
+       key_mouse                  kmous     Km  Mouse event has occurred
+       mouse_info                 minfo     Mi  Mouse status information
+       req_mouse_pos              reqmp     RQ  Request mouse position
+       get_mouse                  getm      Gm  Curses should get button
+                                                events, parameter #1 not
+                                                documented.
+       set_a_foreground           setaf     AF  Set foreground color to #1,
+                                                using ANSI escape
+       set_a_background           setab     AB  Set background color to #1,
+                                                using ANSI escape
+       pkey_plab                  pfxl      xl  Program function key #1 to
+                                                type string #2 and show string
+                                                #3
+       device_type                devt      dv  Indicate language, codeset
+                                                support
+       code_set_init              csin      ci  Init sequence for multiple
+                                                codesets
+       set0_des_seq               s0ds      s0  Shift to codeset 0 (EUC set 0,
+                                                ASCII)
+       set1_des_seq               s1ds      s1  Shift to codeset 1
+       set2_des_seq               s2ds      s2  Shift to codeset 2
+       set3_des_seq               s3ds      s3  Shift to codeset 3
+       set_lr_margin              smglr     ML  Set both left and right
+                                                margins to #1, #2.  (ML is not
+                                                in BSD termcap).
+       set_tb_margin              smgtb     MT  Sets both top and bottom
+                                                margins to #1, #2
+       bit_image_repeat           birep     Xy  Repeat bit image cell #1 #2
+                                                times
+       bit_image_newline          binel     Zz  Move to next row of the bit
+                                                image
+       bit_image_carriage_return  bicr      Yv  Move to beginning of same row
+       color_names                colornm   Yw  Give name for color #1
+       define_bit_image_region    defbi     Yx  Define rectangular bit image
+                                                region
+       end_bit_image_region       endbi     Yy  End a bit-image region
+       set_color_band             setcolor  Yz  Change to ribbon color #1
+       set_page_length            slines    YZ  Set page length to #1 lines
+       display_pc_char            dispc     S1  Display PC character #1
+       enter_pc_charset_mode      smpch     S2  Enter PC character display
+                                                mode
+       exit_pc_charset_mode       rmpch     S3  Exit PC character display mode
+       enter_scancode_mode        smsc      S4  Enter PC scancode mode
+       exit_scancode_mode         rmsc      S5  Exit PC scancode mode
+       pc_term_options            pctrm     S6  PC terminal options
+       scancode_escape            scesc     S7  Escape for scancode emulation
+       alt_scancode_esc           scesa     S8  Alternate escape for scancode
+                                                emulation
 
        The XSI Curses standard added these hardcopy capabilities.   They  were
        used  in  some  post-4.1 versions of System V curses, e.g., Solaris 2.5
@@ -911,22 +906,22 @@
        binary-compatible with System V terminfo entries after SVr4.1; beware!
 
                                       Code
-
-       String Capability Name     TI        TC   Description
+       String Capability Name     TI        TC  Description
        ------------------------------------------------------------------------
-       enter_horizontal_hl_mode   ehhlm     Xh   Enter horizontal highlight
-                                                 mode
-       enter_left_hl_mode         elhlm     Xl   Enter left highlight mode
-       enter_low_hl_mode          elohlm    Xo   Enter low highlight mode
-       enter_right_hl_mode        erhlm     Xr   Enter right highlight mode
-       enter_top_hl_mode          ethlm     Xt   Enter top highlight mode
-       enter_vertical_hl_mode     evhlm     Xv   Enter vertical highlight mode
-       set_a_attributes           sgr1      sA   Define second set of video
-                                                 attributes #1-#6
-       set_pglen_inch             slength   YI   Set page length to #1
-                                                 hundredth of an inch (some
-                                                 implementations use sL for
-                                                 termcap).
+       enter_horizontal_hl_mode   ehhlm     Xh  Enter horizontal highlight
+                                                mode
+
+       enter_left_hl_mode         elhlm     Xl  Enter left highlight mode
+       enter_low_hl_mode          elohlm    Xo  Enter low highlight mode
+       enter_right_hl_mode        erhlm     Xr  Enter right highlight mode
+       enter_top_hl_mode          ethlm     Xt  Enter top highlight mode
+       enter_vertical_hl_mode     evhlm     Xv  Enter vertical highlight mode
+       set_a_attributes           sgr1      sA  Define second set of video
+                                                attributes #1-#6
+       set_pglen_inch             slength   YI  Set page length to #1
+                                                hundredth of an inch (some
+                                                implementations use sL for
+                                                termcap).

      User-Defined Capabilities

      @@ -2051,7 +2046,6 @@
        ACS_BOARD     0x68      h      #  board of squares
        ACS_LANTERN   0x69      i      #  lantern symbol
        ACS_LRCORNER  0x6a      j      +  lower right corner
-
        ACS_URCORNER  0x6b      k      +  upper right corner
        ACS_ULCORNER  0x6c      l      +  upper left corner
        ACS_LLCORNER  0x6d      m      +  lower left corner
@@ -2221,6 +2215,7 @@
                         A_LOW          11      2048    sgr1
                         A_RIGHT        12      4096    sgr1
                         A_TOP          13      8192    sgr1
+
                         A_VERTICAL     14     16384    sgr1
                         A_ITALIC       15     32768    sitm
 
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 7faba613..80b1fb2f 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.62 2024/01/13 22:05:39 tom Exp @
+  * @Id: toe.1m,v 1.64 2024/01/20 16:51:21 tom Exp @
 -->
 
 
 
 
 
-toe 1m 2024-01-13 ncurses 6.4 User commands
+toe 1m 2024-01-20 ncurses 6.4 User commands
 
 
 
 
-
      toe 1m 2024-01-13 ncurses 6.4 User commands
      
+
      toe 1m 2024-01-20 ncurses 6.4 User commands
      
 
       toe(1m)                          User commands                         toe(1m)
 
@@ -150,15 +150,14 @@
            xterm-r6        xterm X11R6 version
            xterm-r5        xterm R5 version
            xterm-mono      monochrome xterm
-           xterm           xterm terminal emulator (X Window
-                           System)
+           xterm           xterm terminal emulator (X Window System)
            vt220           dec vt220
            vt102           dec vt102
            vt100           dec vt100 (w/advanced video)
            vt52            dec vt52
            ...
 
-       Use the -a  and  -s  options  together  to  show  where  each  terminal
+       Use  the  -a  and  -s  options  together  to  show  where each terminal
        description was found.
 
            --> /etc/terminfo
@@ -169,16 +168,14 @@
            --*---: vt102           dec vt102
            --*---: vt220           dec vt220
            --*---: vt52            dec vt52
-           --*---: xterm           xterm terminal emulator (X
-                                   Window System)
+           --*---: xterm           xterm terminal emulator (X Window System)
            --*---: xterm-256color  xterm with 256 colors
            --*---: xterm-color     generic color xterm
            --*---: xterm-mono      monochrome xterm
            --*---: xterm-r5        xterm R5 version
            --*---: xterm-r6        xterm X11R6 version
            --*---: xterm-vt220     xterm emulating vt220
-           --*---: xterm-xfree86   xterm terminal emulator
-                                   (XFree86)
+           --*---: xterm-xfree86   xterm terminal emulator (XFree86)
            ...
 
 
@@ -188,7 +185,7 @@
 
 
 
-ncurses 6.4                       2024-01-13                           toe(1m)
+ncurses 6.4                       2024-01-20                           toe(1m)
 
      
 
      
 
        
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 8f5fbb36..d60ad982 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.102 2024/01/13 22:47:16 tom Exp @
+  * @Id: tput.1,v 1.105 2024/01/20 19:41:02 tom Exp @
 -->
 
 
 
 
 
-tput 1 2024-01-13 ncurses 6.4 User commands
+tput 1 2024-01-20 ncurses 6.4 User commands
 
 
 
 
-
        tput 1 2024-01-13 ncurses 6.4 User commands
        
+
        tput 1 2024-01-20 ncurses 6.4 User commands
        
 
         tput(1)                          User commands                         tput(1)
 
@@ -48,8 +48,8 @@
 
 
 
        NAME
        -       tput,  init,  reset - initialize a terminal, exercise its capabilities,
-       or query terminfo database
+       tput - initialize a terminal, exercise its capabilities, or query term-
+       info database
 
 
 
        SYNOPSIS
        @@ -207,57 +207,62 @@
        If  tput  is  invoked  via  link  with any of the names clear, init, or
        reset, it operates as if run with the corresponding (pseudo-)capability
        operand.  For example, executing a link named reset that points to tput
-       has the same effect as "tput reset".  (The tset(1) utility also  treats
-       a link named reset specially.)
+       has the same effect as "tput reset".
 
-       If  tput  is  invoked by a link named init, this has the same effect as
-       "tput init".  Such a link is seldom employed because another program of
-       that name is in widespread use.
+       This feature was introduced by ncurses 5.2 in 2000.  It is rarely used:
+
+       clear  is a separate program, which is both smaller and more frequently
+              executed.
+
+       init   has the same name as another program in widespread use.
+
+       reset  is  provided  by  the  tset(1)  utility  (also  via a link named
+              reset).
 
 
 
        Terminal Size
        -       Besides  the  pseudo-capabilities (such as init), tput treats the lines
-       and cols cap-codes specially: it may call setupterm(3x) to  obtain  the
+       Besides the pseudo-capabilities (such as init), tput treats  the  lines
+       and  cols  cap-codes specially: it may call setupterm(3x) to obtain the
        terminal size.
 
        o   First, tput attempts to obtain these capabilities from the terminal
-           database.  This generally fails for terminal emulators, which  lack
+           database.   This generally fails for terminal emulators, which lack
            a fixed window size and thus omit the capabilities.
 
-       o   It  then  asks  the operating system for the terminal's size, which
-           generally works, unless the connection is via a  serial  line  that
+       o   It then asks the operating system for the  terminal's  size,  which
+           generally  works,  unless  the connection is via a serial line that
            does not support "NAWS": negotiations about window size.
 
-       o   Finally,  it  inspects the environment variables LINES and COLUMNS,
+       o   Finally, it inspects the environment variables LINES  and  COLUMNS,
            which may override the terminal size.
 
-       If the -T option is given, tput ignores the  environment  variables  by
+       If  the  -T  option is given, tput ignores the environment variables by
        calling  use_tioctl(TRUE),  relying  upon  the  operating  system  (or,
        ultimately, the terminal database).
 
 
 
        OPTIONS
        -       -S       retrieves more than one capability  per  invocation  of  tput.
-                The  capabilities  must  be  passed  to tput from the standard
-                input stream instead of from the  command  line  (see  section
-                "EXAMPLES"  below).   Only  one  cap-code is allowed per line.
-                The -S option changes  the  meanings  of  the  0  and  1  exit
+       -S       retrieves  more  than  one  capability per invocation of tput.
+                The capabilities must be passed  to  tput  from  the  standard
+                input  stream  instead  of  from the command line (see section
+                "EXAMPLES" below).  Only one cap-code  is  allowed  per  line.
+                The  -S  option  changes  the  meanings  of  the  0 and 1 exit
                 statuses (see section "EXIT STATUS" below).
 
-                Some  capabilities  use  string parameters rather than numeric
-                ones.  tput employs a  built-in  table  and  the  presence  of
-                parameters  in  its input to decide how to interpret them, and
+                Some capabilities use string parameters  rather  than  numeric
+                ones.   tput  employs  a  built-in  table  and the presence of
+                parameters in its input to decide how to interpret  them,  and
                 whether to use tparm(3x).
 
        -T type  indicates  the  terminal's  type.   Normally  this  option  is
-                unnecessary,   because  a  default  is  taken  from  the  TERM
+                unnecessary,  because  a  default  is  taken  from  the   TERM
                 environment variable.  If specified, the environment variables
                 LINES and COLUMNS are also ignored.
 
        -V       reports the version of ncurses associated with tput, and exits
                 with a successful status.
 
-       -x       prevents "tput clear" from attempting to clear the  scrollback
+       -x       prevents  "tput clear" from attempting to clear the scrollback
                 buffer.
 
 
@@ -283,9 +288,9 @@
 
 
 
        ENVIRONMENT
        -       tput command reads one environment variable.
+       tput reads one environment variable.
 
-       TERM    denotes  the  terminal  type.   Each terminal type is distinct,
+       TERM    denotes the terminal type.  Each  terminal  type  is  distinct,
                though many are similar.  The -T option overrides its value.
 
 
@@ -298,190 +303,190 @@
 
 
 
        PORTABILITY
        -       Over time ncurses tput has  differed  from  that  of  System V  in  two
+       Over  time  ncurses  tput  has  differed  from  that of System V in two
        important respects, one now mostly historical.
 
-       o   "tput  cap-code" writes to the standard output, which need not be a
-           terminal device.  However, the operands  that  manipulate  terminal
+       o   "tput cap-code" writes to the standard output, which need not be  a
+           terminal  device.   However,  the operands that manipulate terminal
            modes might not use the standard output.
 
-           System V  tput's  init  and  reset  operands use logic from 4.1cBSD
+           System V tput's init and reset  operands  use  logic  from  4.1cBSD
            tset,  manipulating  terminal  modes.   It  checks  the  same  file
-           descriptors  (and  /dev/tty) for association with a terminal device
-           as ncurses now does, and if none are, finally assumes a  1200  baud
+           descriptors (and /dev/tty) for association with a  terminal  device
+           as  ncurses  now does, and if none are, finally assumes a 1200 baud
            terminal.  When updating terminal modes, it ignores errors.
 
-           Until  ncurses  6.1  (see  section  "HISTORY"  below), tput did not
+           Until ncurses 6.1 (see  section  "HISTORY"  below),  tput  did  not
            modify  terminal  modes.   It  now  employs  a  scheme  similar  to
            System V, using functions shared with tset (and ultimately based on
-           4.4BSD tset).  If it is not able to open a terminal (for  instance,
+           4.4BSD  tset).  If it is not able to open a terminal (for instance,
            when run by cron(1)), tput exits with an error status.
 
-       o   System V  tput  assumes  that  the  type  of  a cap-code operand is
-           numeric if all the characters of its value are decimal numbers;  if
+       o   System V tput assumes that  the  type  of  a  cap-code  operand  is
+           numeric  if all the characters of its value are decimal numbers; if
            they are not, it treats cap-code as a string capability.
 
            Most implementations that provide support for cap-code operands use
-           the tparm(3x) function to expand  its  parameters.   That  function
-           expects  a mixture of numeric and string parameters, requiring tput
+           the  tparm(3x)  function  to  expand its parameters.  That function
+           expects a mixture of numeric and string parameters, requiring  tput
            to know which type to use.
 
-           ncurses tput uses a table to determine the parameter types for  the
-           standard  cap-code  operands,  and  an internal function to analyze
+           ncurses  tput uses a table to determine the parameter types for the
+           standard cap-code operands, and an  internal  function  to  analyze
            nonstandard cap-code 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 ncurses to  port  NetBSD's  termcap-
-           based  tput to terminfo, and modified it to interpret multiple cap-
-           codes (and parameters) on the command line.  Portable  applications
-           should  not  rely  upon  this feature; ncurses 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 ncurses to port NetBSD's termcap-
+           based tput to terminfo, and modified it to interpret multiple  cap-
+           codes  (and parameters) on the command line.  Portable applications
+           should not rely upon this feature; ncurses  offers  it  to  support
            applications written specifically for OpenBSD.
 
-       This implementation, unlike others, accepts both termcap  and  terminfo
-       cap-codes  if  termcap  support is compiled in.  In that case, however,
+       This  implementation,  unlike others, accepts both termcap and terminfo
+       cap-codes if termcap support is compiled in.  In  that  case,  however,
        the predefined termcap and terminfo codes have two ambiguities; ncurses
        assumes the terminfo code.
 
-       o   The  cap-code  dl means delete_line to termcap but parm_delete_line
+       o   The cap-code dl means delete_line to termcap  but  parm_delete_line
            to terminfo.  termcap uses the code DL for parm_delete_line.  term-
            info uses the code dch1 for delete_line.
 
-       o   The  cap-code  ed  means exit_delete_mode to termcap but clr_eos to
+       o   The cap-code ed means exit_delete_mode to termcap  but  clr_eos  to
            terminfo.  termcap uses the code cd for clr_eos.  terminfo uses the
            code rmdc for exit_delete_mode.
 
-       The   longname  operand,  -S  option,  and  the  parameter-substitution
-       features used in the cup example below, were not supported in  AT&T/USL
+       The  longname  operand,  -S  option,  and  the   parameter-substitution
+       features  used in the cup example below, were not supported in AT&T/USL
        curses before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
        longname,  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 clear, init, and reset  operands.   A
+       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
+       (POSIX.1-2008)  documents  only the clear, init, and reset operands.  A
        few observations of interest arise from that selection.
 
        o   ncurses supports clear as it does any other standard cap-code.  The
-           others  (init  and  longname)  do  not   correspond   to   terminal
+           others   (init   and   longname)  do  not  correspond  to  terminal
            capabilities.
 
-       o   The  tput on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
+       o   The tput on SVr4-based systems such as Solaris, IRIX64, and  HP-UX,
            as well as others such as AIX and Tru64, also support standard cap-
            code operands.
 
-       o   A few platforms such as FreeBSD recognize termcap names rather than
-           terminfo capability names in their respective tput commands.  Since
-           2010,  NetBSD's  tput  uses  terminfo names.  Before that, it (like
-           FreeBSD) recognized termcap names.
+       o   A few platforms such as FreeBSD recognize termcap codes rather than
+           terminfo capability codes in their respective tput commands.  Since
+           2010, NetBSD's tput uses terminfo codes.   Before  that,  it  (like
+           FreeBSD) recognized termcap codes.
 
-           Beginning in 2021, FreeBSD uses ncurses tput, configured  for  both
+           Beginning  in  2021, FreeBSD uses ncurses tput, configured for both
            terminfo (tested first) and termcap (as a fallback).
 
        Because (apparently) all certified 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.
 
        o   X/Open Curses Issue 7 documents tput differently, with cap-code and
            the other features used in this implementation.
 
-       o   That is, there are two standards for tput:  POSIX  (a  subset)  and
-           X/Open  Curses (the full implementation).  POSIX documents a subset
-           to avoid the  complication  of  including  X/Open  Curses  and  the
+       o   That  is,  there  are  two standards for tput: POSIX (a subset) and
+           X/Open Curses (the full implementation).  POSIX documents a  subset
+           to  avoid  the  complication  of  including  X/Open  Curses and the
            terminal capability database.
 
-       o   While  it  is  certainly  possible  to write a tput program without
-           using curses, no system with a  curses  implementation  provides  a
+       o   While it is certainly possible to  write  a  tput  program  without
+           using  curses,  no  system  with a curses implementation provides a
            tput utility that does not also support standard cap-codes.
 
        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 curses behavior).
 
-       o   It  assigns  exit status 4 to "invalid operand", which may have the
-           same meaning as "unknown capability".   For  instance,  the  source
+       o   It assigns exit status 4 to "invalid operand", which may  have  the
+           same  meaning  as  "unknown  capability".  For instance, the source
            code for Solaris xcurses uses the term "invalid" in this case.
 
-       o   It  assigns  exit  status  255  to  a  numeric variable that is not
+       o   It assigns exit status 255  to  a  numeric  variable  that  is  not
            specified in the terminfo database.  That likely is a documentation
-           error,  mistaking  the  "-1"  written  to  the  standard  output to
-           indicate  an  absent  or  cancelled  numeric  capability   for   an
+           error, mistaking  the  "-1"  written  to  the  standard  output  to
+           indicate   an   absent  or  cancelled  numeric  capability  for  an
            (unsigned) exit status.
 
        The various System V implementations (AIX, HP-UX, Solaris) use the same
        exit statuses as ncurses.
 
-       NetBSD curses  documents  exit  statuses  that  correspond  to  neither
+       NetBSD  curses  documents  exit  statuses  that  correspond  to neither
        ncurses nor X/Open Curses.
 
 
 
        HISTORY
        -       Bill  Joy  wrote  a  tput command during development of 4BSD in October
-       1980.  This initial version only cleared the screen, and did  not  ship
+       Bill Joy wrote a tput 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 tput command.
 
-       o   SVr2  (1984) provided a rudimentary tput that checked the parameter
-           against each predefined capability and returned  the  corresponding
-           value.    This   version   of   tput  did  not  use  tparm(3x)  for
+       o   SVr2 (1984) provided a rudimentary tput that checked the  parameter
+           against  each  predefined capability and returned the corresponding
+           value.   This  version  of  tput  did   not   use   tparm(3x)   for
            parameterized capabilities.
 
-       o   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
-           support  for  init  and reset operands (more than half the program)
+       o   SVr3  (1987)  replaced  that  with  a  more extensive program whose
+           support for init and reset operands (more than  half  the  program)
            incorporated the reset feature of BSD tset written by Eric Allman.
 
-       o   SVr4 (1989) added color initialization  by  using  the  orig_colors
+       o   SVr4  (1989)  added  color  initialization by using the orig_colors
            (oc) and orig_pair (op) capabilities in its init logic.
 
-       Keith  Bostic  refactored BSD tput for shipment in 4.3BSD-Tahoe (1988),
-       then replaced it the next year  with  a  new  implementation  based  on
-       System V  tput.   Bostic's  version  similarly accepted some parameters
-       named for terminfo (pseudo-)capabilities: clear,  init,  longname,  and
-       reset.   However,  because  he  had only termcap available, it accepted
-       termcap names for other capabilities.  Also, Bostic's BSD tput did  not
+       Keith Bostic refactored BSD tput for shipment in  4.3BSD-Tahoe  (1988),
+       then  replaced  it  the  next  year  with a new implementation based on
+       System V tput.  Bostic's version  similarly  accepted  some  parameters
+       named  for  terminfo  (pseudo-)capabilities: clear, init, longname, and
+       reset.  However, because he had only  termcap  available,  it  accepted
+       termcap  codes for other capabilities.  Also, Bostic's BSD tput did not
        modify the terminal modes as the earlier BSD tset had done.
 
-       At  the  same time, Bostic added a shell script named "clear" that used
-       tput to clear the screen.  Both of these appeared in  4.4BSD,  becoming
+       At the same time, Bostic added a shell script named "clear"  that  used
+       tput  to  clear the screen.  Both of these appeared in 4.4BSD, becoming
        the "modern" BSD implementation of tput.
 
-       The  origin of ncurses tput lies outside both System V and BSD, in Ross
-       Ridge's mytinfo package, published  on  comp.sources.unix  in  December
-       1992.   Ridge's  program  made  more  sophisticated use of the terminal
+       The origin of ncurses tput lies outside both System V and BSD, in  Ross
+       Ridge's  mytinfo  package,  published  on comp.sources.unix in December
+       1992.  Ridge's program made more  sophisticated  use  of  the  terminal
        capabilities than the BSD program.  Eric Raymond used that tput program
-       (and  other  parts  of mytinfo) in ncurses in June 1995.  Incorporating
-       the portions dealing with terminal capabilities almost without  change,
-       Raymond  made  improvements  to  the  way  command-line parameters were
+       (and other parts of mytinfo) in ncurses 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 ncurses 6.1 (2018), its tset and tput utilities differed.
 
-       o   tset was more effective, resetting the terminal modes  and  special
+       o   tset  was  more effective, resetting the terminal modes and special
            characters.
 
-       o   On  the  other hand, tset's repertoire of terminal capabilities for
+       o   On the other hand, tset's repertoire of terminal  capabilities  for
            resetting the terminal was more limited; it had only equivalents of
-           reset_1string  (rs1), reset_2string (rs2), and reset_file (rf), and
+           reset_1string (rs1), reset_2string (rs2), and reset_file (rf),  and
            not the tab stop and margin update features of tput.
 
        The reset program is traditionally an alias for tset due to its ability
        to reset terminal modes and special characters.
 
-       As  of  ncurses  6.1,  the  "reset"  features  of  the two programs are
+       As of ncurses 6.1,  the  "reset"  features  of  the  two  programs  are
        (mostly) the same.  Two minor differences remain.
 
-       o   The tset program waits one  second  when  resetting,  in  case  the
+       o   The  tset  program  waits  one  second  when resetting, in case the
            terminal happens to be a hardware device.
 
-       o   The  two  programs  write  the  terminal  initialization strings to
-           different streams; that is, standard error for  tset  and  standard
+       o   The two programs  write  the  terminal  initialization  strings  to
+           different  streams;  that  is, standard error for tset and standard
            output for tput.
 
 
 
        EXAMPLES
                tput init
               Initialize the terminal according to the type of terminal in the
-              TERM environment variable.  If  the  system  does  not  reliably
+              TERM  environment  variable.   If  the  system does not reliably
               initialize the terminal upon login, this command can be included
               in $HOME/.profile after exporting the TERM environment variable.
 
@@ -497,7 +502,7 @@
               screen, usually known as the "home" cursor position.
 
        tput clear
-              Clear the screen: write the clear_screen capability's  value  to
+              Clear  the  screen: write the clear_screen capability's value to
               the standard output stream.
 
        tput cols
@@ -507,29 +512,29 @@
               Report the number of columns used by an ADM-3A terminal.
 
        strong=`tput smso` normal=`tput rmso`
-              Set  shell variables to capability values: strong and normal, to
-              begin and end, respectively, stand-out mode  for  the  terminal.
+              Set shell variables to capability values: strong and normal,  to
+              begin  and  end,  respectively, stand-out mode for the terminal.
               One might use these to present a prompt.
 
                      printf "${strong}Username:${normal} "
 
        tput hc
-              Indicate  via  exit  status  whether the terminal is a hard copy
+              Indicate via exit status whether the terminal  is  a  hard  copy
               device.
 
        tput cup 23 4
               Move the cursor to row 23, column 4.
 
        tput cup
-              Report the value of the cursor_address  (cup)  capability  (used
+              Report  the  value  of the cursor_address (cup) capability (used
               for cursor movement), with no parameters substituted.
 
        tput longname
-              Report  the terminfo database's description of the terminal type
+              Report the terminfo database's description of the terminal  type
               specified in the TERM environment variable.
 
        tput -S
-              Process multiple capabilities.  The -S option can be  profitably
+              Process  multiple capabilities.  The -S option can be profitably
               used with a shell "here document".
 
               $ tput -S <<!
@@ -538,7 +543,7 @@
               > bold
               > !
 
-              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.
 
        tput clear cup 10 10 bold
@@ -550,7 +555,7 @@
 
 
 
-ncurses 6.4                       2024-01-13                           tput(1)
+ncurses 6.4                       2024-01-20                           tput(1)
 
        
 
        
 
          
diff --git a/include/Caps b/include/Caps
index 00b08350..b2082034 100644
--- a/include/Caps
+++ b/include/Caps
@@ -30,7 +30,7 @@
 # Author: Zeyd M. Ben-Halim  1992,1995
 #    and: Eric S. Raymond 
 #
-# $Id: Caps,v 1.52 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps,v 1.53 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -256,9 +273,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -289,9 +306,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -317,9 +334,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -696,9 +713,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -752,9 +769,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 726005a7..591c6efa 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.24 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.aix4,v 1.25 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -256,9 +273,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -289,9 +306,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -317,9 +334,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -798,9 +815,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -854,9 +871,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index e90a1860..594f0322 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.22 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.hpux11,v 1.23 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -257,9 +274,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -291,9 +308,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -319,9 +336,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -704,9 +721,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -762,9 +779,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.keys b/include/Caps.keys
index d9a9c4cb..0017f184 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -30,7 +30,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.21 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.keys,v 1.22 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -155,6 +155,24 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo codes are "setcolor", "kcdelete",
+# "kcinsert", "kadelete", and "kcinsert" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -210,9 +228,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -258,9 +276,9 @@ lpi_changes_res			lpix	bool	YG	-	-	-----	changing line pitch changes resolution
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -291,9 +309,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -319,9 +337,9 @@ bit_image_type			bitype	num	Yp	-	-	-----	type of bit-image device
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -786,9 +804,9 @@ zero_motion			zerom	str	Zx	-		-	-----	No motion for subsequent character
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
@@ -842,9 +860,9 @@ alt_scancode_esc		scesa	str	S8	-		-	-----	Alternate escape for scancode emulatio
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index d5b8c4e6..c766a251 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.20 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.osf1r5,v 1.21 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variables) are
+# "enter_near_letter_quality" and "bit_image_carriage_return" (tied at
+# 25n), and the longest terminfo code is "setcolor" (8n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -256,9 +273,9 @@ semi_auto_right_margin		sam	bool	YE	-	-	-----	printing in last column causes cr
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -300,9 +317,9 @@ wide_char_size			widcs	num	Yn	-	-	-----	character step size when in double wide
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/Caps.uwin b/include/Caps.uwin
index a12770f2..755c7697 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -29,7 +29,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.19 2024/01/13 22:05:39 tom Exp $
+# $Id: Caps.uwin,v 1.20 2024/01/20 16:51:41 Branden.Robinson Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -153,6 +153,23 @@
 # to buy space for non-essentials Emacs is still using.  Capabilities high
 # on that hit list: rc, sc, uc.
 #
+# FORMATTING THE TABLES
+#
+# We manually specify a (minimum) column width for the capability name
+# and terminfo code columns in the tables to achieve a consistent
+# arrangement; as used here, tbl(1) cannot know the width required by
+# one table's data while formatting another's.
+#
+# The longest capability names (C variable) is
+# "hue_lightness_saturation" (24n), and the longest terminfo code is
+# "colornm" (7n).
+#
+# The tables are a tight fit on traditional man(7) implementations that
+# use a line length of 65n, and the "Description" column has little room
+# within which the formatter can make breaking or adjustment decisions.
+# Words like "micro_..._address" and "parm_..._micro" don't break.
+# Reducing the inter-column gaps to 2 ens gives them enough room.  --GBR
+#
 #############################################################################
 #
 # STANDARD CAPABILITIES
@@ -208,9 +225,9 @@
 #%.PP
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Boolean Capability Name	TI	TC	Description
 #%_
@@ -249,9 +266,9 @@ hue_lightness_saturation	hls	bool	hl	-	-	-----	terminal uses only HLS color nota
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 #%\&	Code	\&
 #%Numeric Capability Name	TI	TC	Description
 #%_
@@ -278,9 +295,9 @@ no_color_video			ncv	num	NC	-	-	-----	video attributes that cannot be used with
 #%.
 #%.TS
 #%center;
-#%Lb Cb S  Lb
-#%Lb Lb Lb Lb
-#%Lb Lb Lb Lx.
+#%Lb        Cb       S   Lb
+#%Lb        Lb       Lb  Lb
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
 #%\&	Code	\&
 #%String Capability Name	TI	TC	Description
 #%_
diff --git a/include/MKkey_defs.sh b/include/MKkey_defs.sh
index 36057002..e58ee2b6 100755
--- a/include/MKkey_defs.sh
+++ b/include/MKkey_defs.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
-# $Id: MKkey_defs.sh,v 1.23 2022/07/16 16:54:02 tom Exp $
+# $Id: MKkey_defs.sh,v 1.24 2024/01/19 12:26:17 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2013,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -64,7 +64,7 @@ fi
 
 # add keys that we generate automatically:
 cat >>$data <|:.(xterm|vt))'
+.ft \*(CW
 .TS
-lf(\*(CW).
+Lx.
 \-\-> /etc/terminfo
 \-\-\-\-> /lib/terminfo
 \-\-\-\-\-\-> /usr/share/terminfo
 .TE
 .TS
-lf(\*(CW)1 lf(\*(CW)2 lf(\*(CW).
+L1 L2 Lx.
 \-\-*\-\-\-:	vt100	dec vt100 (w/advanced video)
 \-\-*\-\-\-:	vt102	dec vt102
 \-\-*\-\-\-:	vt220	dec vt220
@@ -222,9 +225,10 @@ T}
 xterm terminal emulator (XFree86)
 T}
 .T&
-l.
+L.
 \&.\|.\|.
 .TE
+.ft
 .RE
 .SH SEE ALSO
 \fB\%@CAPTOINFO@\fP(1M),
diff --git a/man/tput.1 b/man/tput.1
index 0cf0b129..b4ea4592 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.102 2024/01/13 22:47:16 tom Exp $
-.TH @TPUT@ 1 2024-01-13 "ncurses 6.4" "User commands"
+.\" $Id: tput.1,v 1.105 2024/01/20 19:41:02 tom Exp $
+.TH @TPUT@ 1 2024-01-20 "ncurses 6.4" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -47,9 +47,7 @@
 ..
 .ds d @TERMINFO@
 .SH NAME
-\fB\%@TPUT@\fP,
-\fB\%init\fP,
-\fB\%reset\fP \-
+\fB\%@TPUT@\fP \-
 initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
 .SH SYNOPSIS
 \fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
@@ -277,16 +275,23 @@ executing a link named
 .B \%reset
 that points to \fB\%@TPUT@\fP has the same effect as
 .RB \%\*(`` "@TPUT@ \%reset" \*(''.
-(The \fB\%@TSET@\fP(1) utility also treats a link named
-.B \%reset
-specially.)
 .PP
-If \fB\%@TPUT@\fP is invoked by a link named
-.BR \%init ,
-this has the same effect as
-.RB \%\*(`` "@TPUT@ init" \*(''.
-Such a link is seldom employed because another program of that name
-is in widespread use.
+This feature was introduced by
+.I \%ncurses
+5.2 in 2000.
+It is rarely used:
+.TP
+.B \%clear
+is a separate program,
+which is both smaller and more frequently executed.
+.TP
+.B init
+has the same name as another program in widespread use.
+.TP
+.B \%reset
+is provided
+by the \fB\%@TSET@\fP(1) utility (also via a link named
+.BR \%reset ")."
 .SS "Terminal Size"
 Besides the pseudo-capabilities
 (such as
@@ -410,7 +415,7 @@ _
 4	some operands not interpreted
 .TE
 .SH ENVIRONMENT
-\fB@TPUT@\fP command reads one environment variable.
+\fB@TPUT@\fP reads one environment variable.
 .TP 8n \" "TERM" + 2n + adjustment for PDF
 .I TERM
 denotes the terminal type.
@@ -637,9 +642,9 @@ operands.
 .bP
 A few platforms such as FreeBSD recognize
 .I termcap
-names rather than
+codes rather than
 .I \%term\%info
-capability names in their respective
+capability codes in their respective
 .B tput
 commands.
 Since 2010,
@@ -647,13 +652,13 @@ NetBSD's
 .B tput
 uses
 .I \%term\%info
-names.
+codes.
 Before that,
 it
 (like FreeBSD)
 recognized
 .I termcap
-names.
+codes.
 .IP
 Beginning in 2021,
 FreeBSD uses
@@ -800,7 +805,7 @@ because he had only
 available,
 it accepted
 .I termcap
-names for other capabilities.
+codes for other capabilities.
 Also,
 Bostic's BSD
 .B tput
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 3b7a2229..0892a306 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.1109 $
-#	$Date: 2024/01/13 19:45:34 $
+#	$Revision: 1.1123 $
+#	$Date: 2024/01/14 18:08:23 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -441,11 +441,10 @@ klone+sgr8|attribute control for ansi.sys displays with invis,
 # work; uses \E[12m instead, which is pretty bulletproof but loses you the ACS
 # diamond and arrow characters under curses.
 klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m),
-	bold=\E[1m, rmso=\E[m, rmul=\E[m,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
 	    %t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
-	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
-	use=ansi+sgr, use=klone+acs,
+	sgr0=\E[0;10m, smacs=\E[12m, use=ansi+sgrbold,
+	use=klone+acs,
 
 # KOI8-R (RFC1489) acs (alternate character set)
 # From: Qing Long , 24 Feb 1996.
@@ -1162,30 +1161,25 @@ linux-vt|Linux console using VT codes for graphics,
 kon|kon2|Kanji ON Linux console,
 	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
 	colors#8, it#8, ncv#18, pairs#64,
-	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
-	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
-	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
-	bel=^G, bold=\E[1m, civis=\E[?25l, cnorm=\E[?25h, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
+	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
+	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
 	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
-	kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D,
-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kspd=^Z,
-	nel=\r\n, op=\E[37;40m, ri=\EM, rmacs=\E[10m, rmpch=\E[10m,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B,
+	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z,
+	nel=\r\n, op=\E[37;40m, ri=\EM, rmso=\E[27m, rmul=\E[24m,
+	rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr,
+	use=ansi+local, use=ansi+sgrbold, use=ecma+sgr,
+	use=vt220+pcedit,
 
 # release: 0.4.7 2005/05
 #
@@ -1344,10 +1338,10 @@ hurd|The GNU Hurd console server,
 	colors#8, it#8, ncv#18, pairs#64,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H,
-	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%dX, el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@,
-	ind=\E[S, kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~,
+	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
+	kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
 	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
 	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
@@ -1358,11 +1352,10 @@ hurd|The GNU Hurd console server,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
 	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
-	sgr0=\E[0m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, grbom=\E[>1l, gsbom=\E[>1h,
+	smacs=\E[11m, smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
 	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+rca2, use=ansi+sgr, use=vt220+pcedit,
+	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
 	use=ecma+index, use=ecma+italics, use=vt220+cvis,
 
 #### QNX
@@ -1468,13 +1461,13 @@ qansi-g|QNX ANSI,
 	am, eslok, hs, xon,
 	colors#8, cols#80, lines#25, ncv#19, pairs#64, wsl#80,
 	acsc=Oa``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J,
-	el=\E[K, el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l,
-	fsl=\E[?6h\E8, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@,
-	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
+	bel=^G, clear=\E[2J\E[H, cr=\r, csr=\E[%i%p1%d;%p2%dr,
+	cup=\E[%i%p1%d;%p2%dH$<5>, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
+	dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+	el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l, fsl=\E[?6h\E8,
+	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[1@,
+	il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
 	is2=\E>\E[?1l\E[?7h\E[0;10;39;49m, is3=\E(B\E)0,
 	kBEG=\ENn, kCAN=\E[s, kCMD=\E[t, kCPY=\ENs, kCRT=\ENt,
 	kDL=\ENv, kEXT=\ENw, kFND=\ENx, kHLP=\ENy, kHOM=\E[h,
@@ -1496,8 +1489,8 @@ qansi-g|QNX ANSI,
 	kmrk=\ENm, kmsg=\ENe, knp=\E[U, kopn=\ENo, kopt=\ENk,
 	kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg, kri=\E[b,
 	krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T, ktbc=\ENd,
-	kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, rev=\E[7m,
-	ri=\E[T, rmacs=^O, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
+	kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, ri=\E[T,
+	rmacs=^O, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
 	rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
@@ -1506,10 +1499,10 @@ qansi-g|QNX ANSI,
 	     %=%t3%e%p1%d%;m,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
-	smul=\E[4m, tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
-	use=ansi+arrows, use=ansi+local, use=ansi+rep,
-	use=ansi+inittabs, use=att610+cvis0, use=decid+cpr,
+	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
+	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+arrows,
+	use=ansi+local, use=ansi+rep, use=ansi+inittabs,
+	use=ansi+sgrbold, use=att610+cvis0, use=decid+cpr,
 	use=ecma+index,
 #
 qansi|QNX ANSI with console writes,
@@ -1695,14 +1688,14 @@ iris-color|xwsh|IRIX ANSI with color,
 #		CSI ? 5 h Reverse Video (DECSCNM).
 #
 pccon+keys|OpenBSD PC keyboard keys,
-	kbs=^?, kdch1=\E[3~, kend=\E[8~, kent=\r, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
-	kf21=\E[35~, kf22=\E[36~, kf23=\E[37~, kf24=\E[38~,
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kich1=\E[2~,
-	knp=\E[6~, kpp=\E[5~, krfr=^R, use=ansi+arrows,
+	kbs=^?, kend=\E[8~, kent=\r, kf1=\E[11~, kf10=\E[21~,
+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[35~,
+	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
+	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+	kf9=\E[20~, khome=\E[7~, krfr=^R, use=ansi+arrows,
+	use=vt220+pcedit,
 pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
 	acsc=+>\,<-\^.v0#`+a:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#
 	     z#{*|!}#~o,
@@ -1839,26 +1832,22 @@ pcvt25-color|DEC VT220 emulation with 25 lines and color,
 # modified codes for setf/setb to setaf/setab, then to klone+color, corrected
 # typo in invis - TD
 arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480),
-	am, bce, msgr, xenl, xon,
-	cols#80, it#8, lines#30,
+	bce, xenl, xon,
+	lines#30,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
-	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n,
-	invis=\E[8m$<2>, ka1=\E[q, ka3=\E[s, kb2=\E[r, kbs=^H,
-	kc1=\E[p, kc3=\E[n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
-	kcuu1=\E[A, kent=\E[M, kf0=\E[y, kf1=\E[P, kf10=\E[x,
-	kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t, kf6=\E[u, kf7=\E[v,
-	kf8=\E[l, kf9=\E[w, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
-	rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+	blink=\E[5m$<2>, bold=\E[1m$<2>, cub1=^H, cud1=\n,
+	cuf1=\E[C$<2>, cuu1=\E[A$<2>, invis=\E[8m$<2>, ka1=\E[q,
+	ka3=\E[s, kb2=\E[r, kc1=\E[p, kc3=\E[n, kent=\E[M, kf0=\E[y,
+	kf1=\E[P, kf10=\E[x, kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t,
+	kf6=\E[u, kf7=\E[v, kf8=\E[l, kf9=\E[w, rev=\E[7m$<2>,
+	rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
+	rmul=\E[m$<2>,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<2>,
 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr,
-	use=ansi+local, use=ecma+sgr, use=klone+color,
+	smso=\E[7m$<2>, smul=\E[4m$<2>, use=ansi+csr,
+	use=ansi+local, use=ecma+sgr, use=vt100+4bsd,
+	use=klone+color,
 
 arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768),
 	cols#132, lines#50, use=arm100,
@@ -2224,10 +2213,10 @@ teken-2022|teken as of 2022,
 	use=ansi+tabs,
 
 teken-vt+fkeys|teken's xterm special keys,
-	kdch1=\E[3~, kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
-	kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+	kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+	use=vt220+pcedit,
 
 teken-sc+fkeys|teken's syscons special keys,
 	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
@@ -2490,9 +2479,8 @@ vt100+fnkeys|DEC VT100 numeric keypad (kf0-kf10),
 #  |___________________|_________|_kent_@8_|
 #
 vt220+keypad|DEC VT220 numeric keypad,
-	ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, kent=\EOM,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ka2=\EOx, kb1=\EOt,
-	kb3=\EOv, kc2=\EOr,
+	ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, ka2=\EOx,
+	kb1=\EOt, kb3=\EOv, kc2=\EOr, use=vt100+pfkeys,
 #
 vt100+enq|ncurses extension for VT100-style ENQ,
 	u8=\E[?1;2c, use=ansi+enq,
@@ -3367,33 +3355,29 @@ tt|tkterm|Don Libes' tk text widget terminal emulator,
 nsterm+7|AppKit Terminal.app v41+ basic capabilities w/ASCII charset,
 	am, bw, msgr, xenl, xon,
 	cols#80, it#8, lines#24,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
-	el1=\E[1K, ht=^I, hts=\EH, ind=\n, kbs=^?, kcub1=\EOD,
-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, ri=\EM,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, el1=\E[1K, ht=^I,
+	hts=\EH, ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+	kcuu1=\EOA, kent=\EOM, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m,
-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=vt100+enq, use=vt100+pfkeys,
+	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=vt100+enq,
+	use=vt100+pfkeys,
 
 nsterm+acs|AppKit Terminal.app v41+ basic capabilities w/VT100 alternate-charset,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	enacs=\E(B\E)0, rmacs=^O,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+	sgr0=\E[m\017, use=nsterm+7, use=vt100+4bsd,
 
 nsterm+mac|AppKit Terminal.app v41+ basic capabilities w/MacRoman alternate-charset,
 	acsc=+\335\,\334-\366.\3770#`\327a:f\241g\261h#i
 	     \360jjkkllmmnno\370p\370q\321rrssttuuvvwwxxy\262z\263{
 	     \271|\255}\243~\245,
-	enacs=\E(B\E)0, rmacs=^O,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+	sgr0=\E[m\017, use=nsterm+7, use=vt100+4bsd,
 
 # compare with xterm+sl-twm
 nsterm+s|AppKit Terminal.app v41+ status-line (window titlebar) support,
@@ -3660,28 +3644,25 @@ nsterm|nsterm-256color|Apple_Terminal|AppKit Terminal.app,
 #	can display/alter xterm-256color cube
 #	can display/alter xterm-88color cube
 iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X,
-	am, bce, mir, msgr, npc, xenl, xon,
-	cols#80, it#8, lines#24, wsl#50,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ind=\n, kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?,
-	kcbt=\E[Z, kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\EOP,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
-	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m,
-	rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+	bce, mir, npc, xenl, xon,
+	wsl#50,
+	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
+	kend=\EOF, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	kEND5=\E[1;5F, kHOM5=\E[1;5H, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+enq, use=ansi+erase, use=ansi+idc,
-	use=ansi+idl, use=ansi+local, use=vt100+keypad,
-	use=xterm+alt47, use=xterm+sl-twm, use=xterm+x11mouse,
-	use=xterm+256setaf, use=vt220+cvis,
+	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
+	smul=\E[4m, vpa=\E[%i%p1%dd, kEND5=\E[1;5F,
+	kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr,
+	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	use=ansi+local, use=vt100+4bsd, use=vt100+keypad,
+	use=vt100+pfkeys, use=xterm+alt47, use=xterm+sl-twm,
+	use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis,
 
 # iTerm2 3.0.15
 #
@@ -3840,12 +3821,12 @@ xnuppc+basic|Darwin PowerPC console basic capabilities,
 	bold=\E[1m, cr=\r, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
 	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m,
-	rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+erase,
-	use=ansi+local, use=vt100+keypad,
+	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=ansi+csr, use=ansi+erase, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul, use=vt100+keypad,
 
 xnuppc+c|Darwin PowerPC console ANSI color support,
 	colors#8, ncv#32, pairs#64,
@@ -4585,39 +4566,37 @@ ms-vt100-16color|VT-UTF-8 and VT100+,
 #	telnet, kf1-kf4 are \EOP to \EOS, and kf5-kf12 match the terminfo.
 #	But with ssh, it's entirely different (reminds me of rxvt).
 winconsole|Windows 10 new console,
-	am, km, mir, msgr, xenl, AX,
+	am, km, mir, msgr, xenl,
 	ncv@, U8#1,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz~~,
 	bel=^G, blink@, cr=\r, ech=\E[%p1%dX, el1=\E[0K, ich1@, ind=\n,
-	invis@, is1=\E[!p, kdch1=\E[3~, kend=\E[4~, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[11;2~,
-	kf14=\E[12;2~, kf15=\E[13;2~, kf16=\E[14;2~,
-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\E[12~,
-	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-	kf23=\E[24;2~, kf24=\E[25;2~, kf25=\E[11;3~,
-	kf26=\E[12;3~, kf27=\E[13;3~, kf28=\E[14;3~,
-	kf29=\E[15;3~, kf3=\E[13~, kf30=\E[17;3~, kf31=\E[18;3~,
-	kf32=\E[19;3~, kf33=\E[20;3~, kf34=\E[21;3~,
-	kf35=\E[24;3~, kf36=\E[25;3~, kf37=\E[11;4~,
-	kf38=\E[12;4~, kf39=\E[13;4~, kf4=\E[14~, kf40=\E[14;4~,
-	kf41=\E[15;4~, kf42=\E[17;4~, kf43=\E[18;4~,
-	kf44=\E[19;4~, kf45=\E[20;4~, kf46=\E[21;4~,
-	kf47=\E[24;4~, kf48=\E[25;4~, kf49=\E[11;7~, kf5=\E[15~,
-	kf50=\E[12;7~, kf51=\E[13;7~, kf52=\E[14;7~,
-	kf53=\E[15;7~, kf54=\E[17;7~, kf55=\E[18;7~,
-	kf56=\E[19;7~, kf57=\E[20;7~, kf58=\E[21;7~,
-	kf59=\E[24;7~, kf6=\E[17~, kf60=\E[25;7~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
-	knp=\E[6~, kpp=\E[5~, nel=\r\n, ri=\E[T, rmacs=\E(B, rmir@,
-	rmpch@, rs1=\E[!p,
+	invis@, is1=\E[!p, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
+	kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~,
+	kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~,
+	kf22=\E[21;2~, kf23=\E[24;2~, kf24=\E[25;2~,
+	kf25=\E[11;3~, kf26=\E[12;3~, kf27=\E[13;3~,
+	kf28=\E[14;3~, kf29=\E[15;3~, kf3=\E[13~, kf30=\E[17;3~,
+	kf31=\E[18;3~, kf32=\E[19;3~, kf33=\E[20;3~,
+	kf34=\E[21;3~, kf35=\E[24;3~, kf36=\E[25;3~,
+	kf37=\E[11;4~, kf38=\E[12;4~, kf39=\E[13;4~, kf4=\E[14~,
+	kf40=\E[14;4~, kf41=\E[15;4~, kf42=\E[17;4~,
+	kf43=\E[18;4~, kf44=\E[19;4~, kf45=\E[20;4~,
+	kf46=\E[21;4~, kf47=\E[24;4~, kf48=\E[25;4~,
+	kf49=\E[11;7~, kf5=\E[15~, kf50=\E[12;7~, kf51=\E[13;7~,
+	kf52=\E[14;7~, kf53=\E[15;7~, kf54=\E[17;7~,
+	kf55=\E[18;7~, kf56=\E[19;7~, kf57=\E[20;7~,
+	kf58=\E[21;7~, kf59=\E[24;7~, kf6=\E[17~, kf60=\E[25;7~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, nel=\r\n,
+	ri=\E[T, rmacs=\E(B, rmir@, rmpch@, rs1=\E[!p,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
 	    \E(0%e\E(B%;,
 	sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=ansi+arrows,
 	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
 	use=ansi+idl, use=ecma+index, use=ansi+inittabs,
 	use=ansi+local, use=ecma+sgr, use=ecma+color,
-	use=vt220+cvis,
+	use=vt220+cvis, use=vt220+pcedit,
 
 # Windows Terminal (Preview)
 # https://github.com/microsoft/terminal
@@ -4862,11 +4841,10 @@ xterm-r6|xterm X11R6 version,
 	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, kmous=\E[M, meml=\El, memu=\Em,
 	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
-	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=xterm+alt47,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=xterm+alt47, use=ansi+csr, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
 	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
 
 xterm-old|antique xterm version,
@@ -4896,9 +4874,8 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
 	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
 	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kich1=\E[2~,
-	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El,
-	memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kmous=\E[M, kslt=\E[4~,
+	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
 	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=^O,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
@@ -4913,6 +4890,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
 	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
 	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
+	use=vt220+pcedit,
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
@@ -5187,8 +5165,7 @@ xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
 	kPRV6=\E[5;6~, kPRV7=\E[5;7~, use=xterm+edit,
 
 xterm+edit|fragment for 6-key editing-keypad,
-	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	use=xterm+pc+edit,
+	use=xterm+pc+edit, use=vt220+pcedit,
 
 xterm+pc+edit|fragment for pc-style editing keypad,
 	kend=\E[4~, khome=\E[1~,
@@ -5277,29 +5254,27 @@ xterm+acs|ISO-2022 alternate character-switching for xterm,
 xterm-basic|modern xterm terminal emulator - common,
 	OTbs, am, bce, mir, msgr, xenl, AX, XT,
 	colors#8, cols#80, lines#24, pairs#64,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
 	ich=\E[%p1%d@, ind=\n, is2=\E[!p\E[?3;4l\E[4l\E>,
 	kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, ri=\EM,
-	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-	rs2=\E[!p\E[?3;4l\E[4l\E>, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-	E3=\E[3J, use=ansi+csr, use=ansi+enq, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgr, use=xterm+kbs, use=xterm+alt+title,
-	use=att610+cvis, use=xterm+meta,
+	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
+	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+pp, use=ansi+sgrbold, use=xterm+kbs,
+	use=xterm+alt+title, use=att610+cvis, use=xterm+acs,
+	use=xterm+meta,
 
 xterm+meta|meta mode for xterm,
 	km,
@@ -5550,7 +5525,6 @@ xterm+tmux2|advanced xterm features used in tmux,
 xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	OTbs, am, bce, km, mc5i, mir, msgr, npc, xenl, AX,
 	colors#8, cols#80, it#8, lines#24, pairs#64,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\2335m, bold=\2331m, cbt=\233Z,
 	civis=\233?25l, clear=\233H\2332J,
 	cnorm=\233?25l\233?25h, cr=\r, csr=\233%i%p1%d;%p2%dr,
@@ -5575,9 +5549,8 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	kf9=\23320~, khome=\2331~, kich1=\2332~, kmous=\233M,
 	knp=\2336~, kpp=\2335~, mc0=\233i, mc4=\2334i, mc5=\2335i,
 	meml=\El, memu=\Em, op=\23339;49m, rc=\E8, rev=\2337m,
-	ri=\215, rmacs=\E(B, rmam=\233?7l, rmcup=\233?1049l,
-	rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m,
-	rs1=\Ec,
+	ri=\215, rmam=\233?7l, rmcup=\233?1049l, rmir=\2334l,
+	rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m, rs1=\Ec,
 	rs2=\E[62"p\E\sG\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r
 	    \E8,
 	sc=\E7, setab=\2334%p1%dm, setaf=\2333%p1%dm,
@@ -5587,11 +5560,11 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	     %{6}%=%t3%e%p1%d%;m,
 	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
-	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h,
-	smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=,
-	smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR,
-	u8=\233[?%[;0123456789]c, vpa=\233%i%p1%dd,
-	use=ansi+enq, use=xterm+kbs,
+	sgr0=\2330m\E(B, smam=\233?7h, smcup=\233?1049h,
+	smir=\2334h, smkx=\233?1h\E=, smso=\2337m, smul=\2334m,
+	tbc=\2333g, u6=\233[%i%d;%dR, u8=\233[?%[;0123456789]c,
+	vpa=\233%i%p1%dd, use=ansi+enq, use=xterm+acs,
+	use=xterm+kbs,
 
 # Note: normally xterm supports modified function-keys as described in
 #	XTerm - "Other" modified keys
@@ -5972,15 +5945,16 @@ xtermm|xterm terminal emulator (monochrome),
 	ind=\n, kend=\E[Y, kf0=\EOy, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
 	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H,
 	kmous=\E[^_, knp=\E[U, kpp=\E[V, reqmp=\E[492Z, rev=\E[7m,
-	ri=\EM, rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
+	ri=\EM, rmacs=^O, rmcup=\E@0\E[?4r,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1,
-	smso=\E[7m, tbc=\E[3g, use=ansi+apparrows, use=ansi+csr,
+	tbc=\E[3g, use=ansi+apparrows, use=ansi+csr,
 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=decid+cpr, use=vt100+fnkeys,
+	use=ansi+local, use=ansi+sgrso, use=decid+cpr,
+	use=vt100+fnkeys,
 
 xtermc|xterm terminal emulator (color),
 	colors#8, ncv#7, pairs#64,
@@ -6461,19 +6435,19 @@ kvt|KDE terminal,
 konsole-base|KDE console window (common),
 	bce, km@, npc, XT,
 	ncv@,
-	blink=\E[5m, dim=\E[2m, ech=\E[%p1%dX,
-	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG,
-	invis=\E[8m, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@,
-	kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@,
-	kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@, rmam=\E[?7l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
+	hpa=\E[%i%p1%dG, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@,
+	kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@,
+	kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@,
+	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
-	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
-	use=ecma+strikeout, use=ecma+italics, use=ecma+color,
-	use=xterm-r6, use=vt220+cvis, use=bracketed+paste,
+	use=ansi+sgrdim, use=ecma+index, use=xterm+focus,
+	use=xterm+sm+1006, use=ecma+strikeout,
+	use=ecma+italics, use=ecma+color, use=xterm-r6,
+	use=vt220+cvis, use=bracketed+paste,
 	use=report+version,
 
 # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
@@ -6720,26 +6694,23 @@ mlterm-256color|mlterm 3.0 with xterm 256-colors,
 # removed dch/dch1 because they are inconsistent with bce/ech -TD
 # remove km as per tack test -TD
 rxvt-basic|rxvt terminal base (X Window System),
-	OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
-	cols#80, it#8, lines#24,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\n,
+	OTbs, bce, eo, mir, xenl, xon, XT,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K,
+	flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@,
 	is1=\E[?47l\E=\E[?1l,
-	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
-	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmir=\E[4l,
+	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
 	    25h,
 	s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
-	sgr0=\E[0m\017, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=xterm+alt47, use=vt100+enq,
+	sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smso=\E[7m,
+	smul=\E[4m, use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47, use=vt100+enq, use=vt100+4bsd,
 	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
 
 # Key Codes from rxvt reference:
@@ -6825,23 +6796,19 @@ rxvt-basic|rxvt terminal base (X Window System),
 rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, kf1=\E[11~,
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
-	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
+	kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~,
 	kf21=\E[23$, kf22=\E[24$, kf23=\E[11\^, kf24=\E[12\^,
 	kf25=\E[13\^, kf26=\E[14\^, kf27=\E[15\^, kf28=\E[17\^,
-	kf29=\E[18\^, kf3=\E[13~, kf30=\E[19\^, kf31=\E[20\^,
-	kf32=\E[21\^, kf33=\E[23\^, kf34=\E[24\^, kf35=\E[25\^,
-	kf36=\E[26\^, kf37=\E[28\^, kf38=\E[29\^, kf39=\E[31\^,
-	kf4=\E[14~, kf40=\E[32\^, kf41=\E[33\^, kf42=\E[34\^,
-	kf43=\E[23@, kf44=\E[24@, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kind=\E[a,
-	kri=\E[b, kDC5=\E[3\^, kDC6=\E[3@, kDN=\E[b, kDN5=\EOb,
-	kEND5=\E[8\^, kEND6=\E[8@, kHOM5=\E[7\^, kHOM6=\E[7@,
-	kIC5=\E[2\^, kIC6=\E[2@, kLFT5=\EOd, kNXT5=\E[6\^,
-	kNXT6=\E[6@, kPRV5=\E[5\^, kPRV6=\E[5@, kRIT5=\EOc,
-	kUP=\E[a, kUP5=\EOa, use=vt220+vtedit,
+	kf29=\E[18\^, kf30=\E[19\^, kf31=\E[20\^, kf32=\E[21\^,
+	kf33=\E[23\^, kf34=\E[24\^, kf35=\E[25\^, kf36=\E[26\^,
+	kf37=\E[28\^, kf38=\E[29\^, kf39=\E[31\^, kf40=\E[32\^,
+	kf41=\E[33\^, kf42=\E[34\^, kf43=\E[23@, kf44=\E[24@,
+	khome=\E[7~, kind=\E[a, kri=\E[b, kDC5=\E[3\^, kDC6=\E[3@,
+	kDN=\E[b, kDN5=\EOb, kEND5=\E[8\^, kEND6=\E[8@,
+	kHOM5=\E[7\^, kHOM6=\E[7@, kIC5=\E[2\^, kIC6=\E[2@,
+	kLFT5=\EOd, kNXT5=\E[6\^, kNXT6=\E[6@, kPRV5=\E[5\^,
+	kPRV6=\E[5@, kRIT5=\EOc, kUP=\E[a, kUP5=\EOa,
+	use=vt220+vtedit, use=xterm+nopcfkeys,
 
 # rxvt was originally "xvt", first announced in April 1993:
 #	http://www.krsaborio.net/linux-desktops/research/1993/0416.html
@@ -6964,29 +6931,27 @@ mrxvt-256color|multitabbed rxvt with 256 colors,
 # remove nonworking flash -TD
 # remove km as per tack test -TD
 Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
-	am, bce, bw, eo, mc5i, mir, msgr, xenl, xon, XT,
-	btns#5, cols#80, it#8, lines#24, lm#0, ncv@,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	bce, bw, eo, mc5i, mir, xenl, xon, XT,
+	btns#5, lm#0, ncv@,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
-	ind=\n, is1=\E[?47l\E>\E[?1l,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
-	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
-	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
-	mc4=\E[4i, mc5=\E[5i, rev=\E[7m, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=, rmso=\E[27m, rmul=\E[24m,
+	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kc1=\E[8~,
+	kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i,
+	mc5=\E[5i, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=,
+	rmso=\E[27m, rmul=\E[24m,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
 	    25h,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, smkx=,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
-	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
-	use=ecma+color, use=vt220+cvis,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=, smso=\E[7m,
+	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+	use=ansi+local, use=xterm+alt47, use=vt100+enq,
+	use=rxvt+pcfkeys, use=ecma+color, use=vt100+4bsd,
+	use=vt220+cvis,
 
 Eterm-256color|Eterm with xterm 256-colors,
 	use=xterm+256color, use=Eterm,
@@ -7166,23 +7131,20 @@ emu-220|Emu-220 (vt200-7bit mode),
 #	apparently implements alternate screen like xterm
 #	does not use padding, of course.
 mvterm|vv100|SwitchTerm aka mvTERM,
-	am, km, mir, msgr, xenl, xon,
-	colors#8, cols#80, it#8, lines#24, pairs#64,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
-	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0,
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	op=\E[100m, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[?1l\E>,
-	rmso=\E[m, rmul=\E[m,
+	km, mir, xenl, xon,
+	colors#8, pairs#64,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+	el=\E[K, ich=\E[%p1%d@, ich1=\E[@, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, op=\E[100m, rev=\E[7m, ri=\EM,
+	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
 	rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H,
 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
-	use=ansi+local, use=xterm+alt47, use=vt100+fnkeys,
+	sgr0=\E[m\017, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+	use=ansi+csr, use=ansi+idl, use=ansi+local,
+	use=xterm+alt47, use=vt100+fnkeys, use=vt100+4bsd,
 	use=x10term+sl,
 
 #### MTERM
@@ -7194,16 +7156,15 @@ mterm-ansi|ANSI emulation,
 	am, bw, mir, msgr,
 	it#8,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX, home=\E[H,
-	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\017,
-	kbs=^H, nel=\EE, ri=\E[T, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dim=\E[2m, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%d`,
+	ht=^I, ich1=, ind=\E[S, is2=\E)0\017, kbs=^H, nel=\EE, ri=\E[T,
+	rmacs=^O, rmso=\E[27m, rmul=\E[24m,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, use=ansi+erase, use=ansi+idc1,
-	use=ansi+idl, use=ansi+local, use=ansi+sgr,
-	use=ecma+index,
+	sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd, use=ansi+erase,
+	use=ansi+idc1, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=ecma+index,
 
 # mterm normally sets $TERM to "mterm"
 mterm|mouse-sun|Der Mouse term,
@@ -7220,25 +7181,25 @@ decansi|ANSI emulation with DEC compatibility hacks,
 	am, mir, msgr, xenl,
 	colors#8, it#8, pairs#64,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0,
-	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
-	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
-	kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~, kf10=\E[21~,
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
-	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf3=\E[13~,
-	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-	kf9=\E[20~, nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O,
-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+	dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H,
+	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017,
+	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~,
+	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\EE,
+	op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
+	rmso=\E[27m, rmul=\E[24m, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+cpr,
-	use=ansi+csr, use=ansi+erase, use=ansi+idc1,
-	use=ansi+idl, use=ansi+local, use=ansi+sgr,
-	use=vt220+vtedit, use=ecma+index, use=vt220+cvis,
+	vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr,
+	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit,
+	use=ecma+index, use=vt220+cvis,
 
 #### VWM
 # http://vwm.sourceforge.net/
@@ -7335,15 +7296,12 @@ st-0.8|simpleterm 0.8,
 #	provided with the source is incorrect, since Se/Ss are mis-coded
 #	as booleans rather than strings.
 st-0.7|simpleterm 0.7,
-	ccc,
-	initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
-	      %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
-	kcbt@, kent@, oc=\E]104\007, Ms=\E]52;%p1%s;%p2%s\007,
-	kDN3=\E[1;3B, kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D,
+	kcbt@, kent@, Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B,
+	kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D,
 	kNXT3=\E[6;3~, kNXT5=\E[6;5~, kPRV3=\E[5;3~,
 	kPRV5=\E[5;5~, kRIT3=\E[1;3C, kRIT5=\E[1;5C,
 	kUP3=\E[1;3A, kUP5=\E[1;5A, use=ecma+strikeout,
-	use=st-0.6,
+	use=st-0.6, use=xterm+256color,
 
 # st-0.4.1
 #
@@ -7374,57 +7332,40 @@ st-0.7|simpleterm 0.7,
 # still has no function keys past kf36 (no combinations of modifiers)
 # no application keypad mode, e.g, kent.
 st-0.6|simpleterm 0.6,
-	am, bce, mir, msgr, npc, xenl, XT,
-	colors#8, cols#80, lines#24, pairs#64,
+	bce, mir, npc, xenl, XT,
+	colors#8, pairs#64,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
 	     zz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n,
-	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
-	kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
-	kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu,
-	kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~,
-	kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, kent=\EOM,
-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
-	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
-	kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
-	kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
-	kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
-	kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R,
-	kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~,
-	kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
-	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~,
-	kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R,
-	kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
-	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
-	kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
-	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kil1=\E[2;5~,
-	kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A, krmir=\E[2;2~,
-	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, ri=\EM,
-	rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
-	rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	clear=\E[H\E[2J, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+	ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG,
+	ich=\E[%p1%d@, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~,
+	kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D,
+	kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~,
+	ka3=\E[5~, kb2=\EOu, kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z,
+	kclr=\E[3;5~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
+	khome=\E[1~, kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M,
+	kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
+	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
+	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	rs2=\E[4l\E>\E[?1034l, setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
 	     %=%t3%e%p1%d%;m,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
-	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, u8=\E[?1;2c, vpa=\E[%i%p1%dd,
-	Se=\E[2 q, Ss=\E[%p1%d q, use=ansi+apparrows,
-	use=ansi+csr, use=ansi+enq, use=ansi+idl,
-	use=ansi+inittabs, use=ansi+local, use=ansi+sgr,
+	smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, u8=\E[?1;2c,
+	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=vt100+4bsd, use=vt100+pfkeys,
 	use=vt220+pcedit, use=ecma+index, use=xterm+alt1049,
 	use=vt220+cvis, use=xterm+sl, use=ecma+italics,
 	use=ecma+strikeout, use=bracketed+paste,
+	use=xterm+pcf2,
 #
 # st-0.1.1
 #
@@ -7447,7 +7388,6 @@ st-0.6|simpleterm 0.6,
 simpleterm|old-st|simpleterm 0.1.1,
 	am, eo, mir, msgr, ul, xenl,
 	colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -7457,13 +7397,12 @@ simpleterm|old-st|simpleterm 0.1.1,
 	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rev=\E[7m,
-	rmacs=\E(B, rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm,
-	setaf=\E[3%p1%dm,
+	rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;m,
-	sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
-	use=vt220+cvis, use=ecma+index,
+	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
+	use=ecma+index, use=xterm+acs,
 
 st-16color|stterm-16color|simpleterm with 16-colors,
 	use=ibm+16color, use=st,
@@ -7951,25 +7890,23 @@ foot-direct|foot with direct color indexing,
 foot+base|foot base fragment,
 	am, bce, bw, mir, msgr, npc, xenl, AX, XT,
 	cols#80, it#8, lines#24,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
-	dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
 	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
-	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, rmacs=\E(B,
+	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
 	rs1=\Ec, rs2=\E[!p\E[4l\E>,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis,
-	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local,
-	use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep,
-	use=ansi+tabs, use=ansi+sgr, use=ecma+index,
-	use=ecma+italics, use=ecma+strikeout,
-	use=xterm+alt+title, use=xterm+pcfkeys,
-	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
-	use=bracketed+paste, use=report+version,
-	use=xterm+focus,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, E3=\E[3J,
+	use=att610+cvis, use=ansi+csr, use=ansi+cup,
+	use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
+	use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
+	use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
+	use=ecma+strikeout, use=xterm+acs, use=xterm+alt+title,
+	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
+	use=xterm+sl-alt, use=bracketed+paste,
+	use=report+version, use=xterm+focus,
 
 ######## WEB CLIENTS
 
@@ -8144,27 +8081,26 @@ wezterm|Wez's Terminal Emulator,
 contour|contour-latest|Contour Terminal Emulator,
 	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
 	cols#80, lines#24, pairs#0x7fff,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
 	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
 	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
 	ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=,
 	kc3=, kcbt=\E[Z, kend=\EOF, khlp=, kmous=\E[M, kund=,
 	oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM,
-	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmkx=\E[?1l,
-	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+	rin=\E[%p1%dT, rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m,
+	rmul=\E[24m, rs1=\E]\E\\\Ec,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
 	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h,
-	smso=\E[7m, smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J,
-	vpa=\E[%i%p1%dd, Cs=\E]12;%p1%s\E\\, E3=\E[3J,
-	Rmol=\E[55m, Se=\E[ q, Smol=\E[53m, Smulx=\E[4:%p1%dm,
-	Ss=\E[%p1%d q, use=ansi+apparrows, use=ansi+cup,
-	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h, smso=\E[7m,
+	smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd,
+	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
+	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
+	use=ansi+erase, use=ansi+idc, use=ansi+idl,
 	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
 	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
-	use=xterm+256color, use=xterm+alt1049, use=xterm+pcc2,
-	use=xterm+pce2, use=xterm+pcf2,
+	use=xterm+256color, use=xterm+acs, use=xterm+alt1049,
+	use=xterm+pcc2, use=xterm+pce2, use=xterm+pcf2,
 
 contour-direct|Contour terminal with direct colors,
 	use=xterm+direct, use=contour,
@@ -8314,30 +8250,29 @@ dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
 # the (Siemens Nixdorf) 97801 terminal.  It was not shown in the termcap or
 # terminfo entries (which list about 60% of the control sequences).
 screen-base|VT 100/ANSI X3.64 virtual terminal (base),
-	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
-	cols#80, lines#24, ncv@, U8#1,
+	OTbs, OTpt, km, mir, xenl, G0,
+	ncv@, U8#1,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
 	     yzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
+	blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+	cnorm=\E[34h\E[?25h, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
-	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?,
-	kcbt=\E[Z, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
-	kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
-	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
+	kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
+	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
 	rs2=\Ec\E[?1000l\E[?25h,
 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
-	smso=\E[3m, smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B,
-	S0=\E(%p1%c, use=ansi+apparrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=xterm+kbs, use=vt220+pcedit,
-	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
+	sgr0=\E[m\017, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m,
+	smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c,
+	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
+	use=ecma+color, use=vt100+enq, use=vt100+4bsd,
 
 screen|VT 100/ANSI X3.64 virtual terminal,
 	use=screen4,
@@ -8683,13 +8618,11 @@ mosh-256color|mosh using 256-colors,
 # + Most of the mode-settings in the initialization/reset strings are not
 #   implemented; dvtm copies its description from rxvt.
 dvtm|dynamic virtual terminal manager,
-	am, eo, mir, msgr, xenl, AX,
-	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
-	el1=\E[1K, enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
+	eo, mir, xenl,
+	ncv@,
+	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K,
+	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
 	is1=\E[?47l\E=\E[?1l,
 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
@@ -8701,20 +8634,19 @@ dvtm|dynamic virtual terminal manager,
 	kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[23$,
 	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, op=\E[39;49m,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[27m,
-	rmul=\E[24m,
+	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, rev=\E[7m,
+	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
 	    25h,
-	s0ds=\E(B, s1ds=\E(0, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
 	    %p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
-	use=ansi+csr, use=ansi+idl, use=ansi+local,
-	use=xterm+alt47, use=vt220+vtedit, use=vt220+cvis,
-	use=ecma+italics,
+	sgr0=\E[m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idl, use=ansi+local, use=xterm+alt47,
+	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
+	use=ecma+italics, use=vt100+4bsd,
 
 dvtm-256color|dynamic virtual terminal manager with 256 colors,
 	colors#0x100, pairs#0x10000,
@@ -8762,7 +8694,6 @@ dvtm-256color|dynamic virtual terminal manager with 256 colors,
 # pairs, since the latter ends the string that is loaded to the window-title.
 ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	am, km, mir, msgr, xenl,
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
 	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
 	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
@@ -8776,15 +8707,15 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
 	kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khlp=\E[1~,
 	khome=\E[2~, knp=\E[6~, kpp=\E[3~, mc4=\E[4i, mc5=\E[5i,
 	rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
-	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l,
-	rmso=\E[27m, rmul=\E[24m,
+	rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l, rmso=\E[27m,
+	rmul=\E[24m,
 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>,
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
 	    %p9%t\E(0%e\E(B%;,
-	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7,
-	smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	u8=\E[?62;1;6c, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+local, use=vt220+cvis,
+	sgr0=\E[m\E(B, smam=\E[?7h, smcup=\E7, smir=\E[4h,
+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?62;1;6c,
+	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+	use=ansi+local, use=vt220+cvis, use=xterm+acs,
 	use=xterm+sl, use=ansi+enq,
 
 ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
@@ -8844,7 +8775,7 @@ elks-vt52|ELKS VT52 console,
 
 elks-ansi|ELKS ANSI console,
 	clear=\E[H\E[2J, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
-	el=\E[K, home=\E[H, rmso=\E[m, smso=\E[7m, use=ansi+local1,
+	el=\E[K, home=\E[H, use=ansi+local1, use=ansi+sgrso,
 	use=elks-glasstty,
 
 # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation
@@ -9403,24 +9334,23 @@ cygwinDBG|Debug Version for Cygwin,
 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
-	bel=^G, bold=\E[1m, cr=\r, cup=\E[%i%p1%d;%p2%dH,
-	dim=\E[2m, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\n, kNXT=\E[6$, kPRV=\E[5$,
-	kb2=\E[G, kcbt=\E[Z, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-	khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM,
-	rmacs=\E[10m, rmso=\E[m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+	ind=\n, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z,
+	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B,
+	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z,
+	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rmacs=\E[10m,
+	rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
-	sgr0=\E[0;10m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+erase,
-	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
-	use=vt220+cvis, use=vt102+enq,
+	sgr0=\E[0;10m, smacs=\E[11m, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+erase, use=ansi+idc,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=vt220+pcedit, use=vt220+cvis,
+	use=vt102+enq,
 
 #### DJGPP
 
@@ -12737,10 +12667,10 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	am, km, mir, msgr, xenl,
 	cols#80, it#8, lines#25, vt#3,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-	clear=\E[H\E[J$<200>, cnorm=\E[34h\E[?25h, cr=\r,
-	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
-	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
+	bel=^G, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J$<200>,
+	cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD$<1>,
+	cub1=\010$<1>, cud=\E[%p1%dB, cud1=\ED,
+	cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
 	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
 	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
@@ -12762,8 +12692,8 @@ wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard),
 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%?
 	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
-	use=ansi+csr, use=ansi+idl, use=ansi+pp, use=ansi+sgr,
+	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+	use=ansi+pp, use=ansi+sgrbold,
 
 #   This is the american terminal. Here tabs work fine.
 # From: Francesco Potorti` , 24 Aug 1998
@@ -12919,16 +12849,15 @@ wy75|wyse75|Wyse 75,
 	am, hs, mir, msgr, xenl, xon,
 	cols#80, lines#24, ma#1, pb#1201, wsl#78,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, cbt=\E[Z, clear=\E[H\E[J$<30>, cr=\r,
+	bel=^G, clear=\E[H\E[J$<30>, cr=\r,
 	csr=\E[%i%p1%d;%p2%dr$<2>, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP$<3*>,
 	dch1=\E[P$<3>, dim=\E[0t\E[2m, dl=\E[%p1%dM$<1*>,
 	dl1=\E[M, dsl=\E[>\,\001\001\E[>-\001\001,
 	ech=\E[%p1%dX, ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>,
 	enacs=\E)0, flash=\E[30h\E\,$<250/>\E[30l, fsl=^A,
-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>,
-	ind=\n$<2>, ip=$<1>,
+	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@$<1*>,
+	il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>,
 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
 	kf1=\E[?5i, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
@@ -12946,8 +12875,8 @@ wy75|wyse75|Wyse 75,
 	    \016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m,
-	tbc=\E[3g, tsl=\E[>\,\001, use=ansi+arrows,
-	use=ansi+local, use=ansi+pp, use=decid+cpr,
+	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local,
+	use=ansi+pp, use=ansi+tabs, use=decid+cpr,
 	use=vt220+cvis, use=vt220+keypad,
 #
 #	This terminal description uses the non-hidden attribute mode
@@ -12986,35 +12915,33 @@ wy75-wvb|wyse75-wvb|Wyse 75 with visible bell 132 columns,
 #	 leave trash on the screen when used without XON/XOFF.
 #
 wy85|wyse85|Wyse 85,
-	am, hs, mir, msgr, xenl, xon,
-	cols#80, lines#24, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J$<110>, cr=\r, cub1=^H,
-	cud=\E[%p1%dB, cud1=\n, cup=\E[%i%p1%d;%p2%dH$<1>,
-	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m,
-	dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l,
-	ech=\E[%p1%dX, ed=\E[J$<110>, el=\E[K$<1>, el1=\E[1K,
-	enacs=\E)0, flash=\E[30h\E\,$<300/>\E[30l,
-	fsl=\E[1;24r\E8, home=\E[H, ht=\011$<1>,
-	ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, il1=\E[L$<5>,
-	ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
+	hs, mir, xenl, xon,
+	wsl#80,
+	clear=\E[H\E[J$<110>, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH$<1>, dch=\E[%p1%dP$<3*>,
+	dch1=\E[P$<3>, dim=\E[2m, dl=\E[%p1%dM$<3*>,
+	dl1=\E[M$<3>, dsl=\E[40l, ech=\E[%p1%dX, ed=\E[J$<110>,
+	el=\E[K$<1>, el1=\E[1K, enacs=\E)0,
+	flash=\E[30h\E\,$<300/>\E[30l, fsl=\E[1;24r\E8,
+	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
+	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
 	is3=\E>\E(B\E)0\017\E[m, kf10=\E[21~, kf11=\E[23~,
 	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
 	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
 	kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
 	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
-	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
-	rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
+	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, rmam=\E[?7l,
+	rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
+	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+arrows,
 	use=ansi+csr, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp, use=ansi+sgr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+	use=vt100+4bsd, use=vt220+vtedit, use=vt220+cvis,
+	use=vt220+keypad,
 #
 #	Wyse 85 with visual bell.
 wy85-vb|wyse85-vb|Wyse 85 with visible bell,
@@ -13040,39 +12967,35 @@ wy85-wvb|wyse85-wvb|Wyse 85 with visible bell 132-columns,
 # terminfo should reflect the manufacturer's intended behaviour of the terminal
 # or the actual."
 wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
-	am, hs, mir, msgr, xenl, xon,
-	cols#80, lines#24, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J$<110>, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH$<1>, dch=\E[%p1%dP$<3*>,
+	hs, mir, xenl, xon,
+	wsl#80,
+	clear=\E[H\E[J$<110>, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH$<1>, dch=\E[%p1%dP$<3*>,
 	dch1=\E[P$<3>, dim=\E[2m, dl=\E[%p1%dM$<3*>,
 	dl1=\E[M$<3>, dsl=\E[40l, ech=\E[%p1%dX, ed=\E[J$<110>,
 	el=\E[K$<1>, el1=\E[1K, enacs=\E)0,
 	flash=\E[30h\E\,$<300/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, ht=\011$<1>, ich=\E[%p1%d@$<4*>,
-	il=\E[%p1%dL$<5*>, il1=\E[L$<5>, ind=\n$<3>, ip=$<3>,
-	is1=\E[62;1"p\E[?5W,
+	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
+	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
 	is3=\E>\E(B\E)0\017\E[m, ka1=\EOw, ka3=\EOy, kb2=\EOu,
-	kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B,
-	kcuf1=\233C, kcuu1=\233A, kdch1=\2333~, kent=\EOM,
-	kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~,
-	kf13=\23325~, kf14=\23326~, kf15=\23328~, kf16=\23329~,
-	kf17=\23331~, kf18=\23332~, kf19=\23333~, kf2=\EOQ,
-	kf20=\23334~, kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~,
-	kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~,
-	khome=\23326~, kich1=\2332~, knp=\2336~, kpp=\2335~,
-	kslt=\2334~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
-	ri=\EM$<3>, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
-	rmso=\E[m, rmul=\E[m, rs1=\E[13l\E[3l\E!p,
+	kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B, kcuf1=\233C,
+	kcuu1=\233A, kdch1=\2333~, kf10=\23321~, kf11=\23323~,
+	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
+	kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~,
+	kf20=\23334~, kf6=\23317~, kf7=\23318~, kf8=\23319~,
+	kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\23326~,
+	kich1=\2332~, knp=\2336~, kpp=\2335~, kslt=\2334~, lf1=PF1,
+	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>,
+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
 	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;+m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+csr,
 	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgr, use=decid+cpr, use=vt220+cvis,
+	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
+	use=vt100+pfkeys, use=vt220+cvis,
 #
 #	Wyse 185 emulating a VT320 7 bit mode.
 #
@@ -13085,20 +13008,18 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode,
 #	by set-up.
 #
 wy185|wyse185|Wyse 185,
-	am, hs, km, mir, msgr, xenl, xon,
-	cols#80, lines#24, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J$<40>,
-	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
+	hs, km, mir, xenl, xon,
+	wsl#80,
+	civis=\E[?25l, clear=\E[H\E[J$<40>,
+	cnorm=\E[34h\E[?25h, csr=\E[%i%p1%d;%p2%dr$<20>,
 	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<3>,
 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>,
 	dsl=\E7\E[99;0H\E[K\E8, ech=\E[%p1%dX, ed=\E[J$<40>,
 	el=\E[K, el1=\E[1K, enacs=\E)0,
 	flash=\E[30h\E\,$<100/>\E[30l, fsl=\E[1;24r\E8,
-	home=\E[H, hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>,
-	il=\E[%p1%dL$<3*>, il1=\E[L$<3>, ind=\n$<2>, ip=$<4>,
-	is1=\E[?5W,
+	hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>,
+	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
@@ -13106,18 +13027,17 @@ wy185|wyse185|Wyse 185,
 	kf19=\E[33~, kf20=\E[34~, kf6=\E[17~, kf7=\E[18~,
 	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
 	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, rc=\E8, ri=\EM$<2>,
-	rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
+	rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
 	rmso=\E[27m, rmul=\E[24m,
 	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
 	rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
-	smir=\E[4h, smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
-	tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
+	sgr0=\E[m\017, smam=\E[?7h, smcup=\E[ Q, smir=\E[4h,
+	smkx=\E[?1l\E=, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
 	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
-	use=ansi+pp, use=ansi+sgr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+keypad,
+	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
 #
 #	Wyse 185 with 24 data lines and top status (terminal status)
 wy185-24|wyse185-24|Wyse 185 with 24 data lines,
@@ -13265,7 +13185,7 @@ wy370-nk|Wyse 370 without function keys,
 	am, ccc, hs, mir, msgr, xenl, xon,
 	colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J$<40>,
+	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
 	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH$<1>, cvvis=\E[?25h\E[34l,
 	dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, dclk=\E[31h,
@@ -13294,12 +13214,12 @@ wy370-nk|Wyse 370 without function keys,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
-	smir=\E[4h, smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m,
+	smir=\E[4h, smkx=\E[?1l\E=,
 	tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8,
 	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
 	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
 	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
-	use=ansi+sgr, use=decid+cpr,
+	use=ansi+sgrbold, use=decid+cpr,
 #
 #	Function key set for the ASCII (wy-50 compatible) keyboard
 #	This is the default 370.
@@ -13425,16 +13345,15 @@ wy520|wyse520|Wyse 520,
 	am, hs, km, mir, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-	clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr$<20>, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l,
-	dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m,
-	dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
+	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
+	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>,
+	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
-	enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`, ht=^I,
-	hts=\EH, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>,
-	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
+	enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`,
+	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>,
+	ind=\n$<2>, ip=$<4>, is1=\E[?5W,
 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -13443,17 +13362,16 @@ wy520|wyse520|Wyse 520,
 	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
 	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
 	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
-	rmso=\E[m, rmul=\E[24m,
-	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
-	rs3=\E[?5l\E[47h\E[40l\E[r,
+	rmul=\E[24m, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p,
+	rs2=\E[35h\E[?3l, rs3=\E[?5l\E[47h\E[40l\E[r,
 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
-	smcup=\E[ Q\E[?67;8h, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, tsl=\E[2$~\E[1$}\E[%i%p1%d`,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+local, use=ansi+pp, use=ansi+sgr, use=decid+cpr,
-	use=vt220+vtedit, use=vt220+keypad,
+	smcup=\E[ Q\E[?67;8h, smir=\E[4h,
+	tsl=\E[2$~\E[1$}\E[%i%p1%d`, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+local,
+	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
+	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
 #
 #       Wyse 520 with 24 data lines and status (terminal status)
 wy520-24|wyse520-24|Wyse 520 with 24 data lines,
@@ -13955,14 +13873,13 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1,
 	nel=\r\n,
 	pfx=\E[%p1%1d;%p2%l%2.2dq\s\s\sf%p1%1d\s\s\s\s\s\s\s\s\s\s
 	    \s%p2%s,
-	pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O, rmso=\E[m,
-	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+	pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O,
+	rs2=\Ec\E[?3l\E[2;0y,
 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
-	tsl=\E7\E[25;%p1%{1}%+%dH, use=ansi+arrows,
-	use=ansi+csr, use=ansi+erase, use=ansi+local1,
-	use=ansi+sgr,
+	sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+local1, use=ansi+sgrbold,
 
 att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
 	cols#132, wsl#132,
@@ -14107,8 +14024,8 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, cr=\EG, cub1=^H,
 	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
 	cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P,
-	dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K,
-	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
+	ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
 	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
 	indn=\E[%p1%dE,
 	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j
@@ -14125,14 +14042,14 @@ att5420_2|AT&T 5420 model 2 80 cols,
 	    %s\E~,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, ri=\EM,
 	rin=\E[%p1%dF, rmacs=^O, rmkx=\E[19;0j, rmln=\E|,
-	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+	rs2=\Ec\E[?3l\E[2;0y,
 	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;%?%p8%t\EV%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~,
-	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+sgr, use=decid+cpr,
+	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim,
+	use=decid+cpr,
 
 att5420_2-w|AT&T 5420 model 2 in 132 column mode,
 	cols#132,
@@ -14237,16 +14154,13 @@ att4424m|tty4424m|Teletype 4424M,
 #
 # (att5425: added / based on the init string -- esr)
 att5425|tty5425|att4425|AT&T 4425/5425,
-	am, da, db, hs, mir, msgr, xenl, xon,
-	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[2;7m, cnorm=\E[12;0j, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K, enacs=\E(B\E)0,
-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
-	indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
+	da, db, hs, mir, xenl, xon,
+	lh#2, lm#78, lw#8, nlab#8, wsl#55,
+	bold=\E[2;7m, cnorm=\E[12;0j, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, hpa=\E[%p1%{1}%+%dG,
+	ich=\E[%p1%d@, indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
 	is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h
 	    \E[4i\Ex\E[25;1j\212,
 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
@@ -14256,17 +14170,17 @@ att5425|tty5425|att4425|AT&T 4425/5425,
 	ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, nel=\r\n,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, ri=\EM,
-	rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
-	rmkx=\E[21;0j\E[25;1j\212, rmln=\E|, rmso=\E[m,
-	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+	rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l,
+	rmkx=\E[21;0j\E[25;1j\212, rmln=\E|,
+	rs2=\Ec\E[?3l\E[2;0y,
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
 	    %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m,
-	smul=\E[4m, tsl=\E7\E[25;%p1%{8}%+%dH,
-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+sgr, use=decid+cpr,
+	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
+	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~,
+	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
 
 att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels,
 	smkx=\E[21;1j\E[25;4j\Eent, use=att4425,
@@ -14307,12 +14221,12 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	am, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#7, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z,
-	civis=\E[11;0|, clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r,
-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
-	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H, ht=^I, hts=\EH,
-	ind=\n, is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u,
+	bel=^G, blink=\E[5m, bold=\E[2;7m, civis=\E[11;0|,
+	clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|, dch=\E[%p1%dP,
+	dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K,
+	enacs=\E(B\E)1, ff=^L, home=\E[H, ind=\n,
+	is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u,
 	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
 	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
 	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
@@ -14324,8 +14238,8 @@ att510a|bct510a|AT&T 510A Personal Terminal,
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
 	    %|%t;7%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=ansi+idl,
-	use=ansi+local,
+	smul=\E[4m, use=ansi+cpr, use=ansi+idl, use=ansi+local,
+	use=ansi+tabs,
 
 # Terminfo entry for the AT&T 510 D Personal Terminal
 # Function keys 9 through 16 are accessed by bringing up the
@@ -14340,40 +14254,40 @@ att510d|bct510d|AT&T 510D Personal Terminal,
 	am, da, db, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, bold=\E[2;7m, cbt=\E[Z, clear=\E[H\E[J,
-	cnorm=\E[11;3|, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E(B\E)1, ff=^L,
-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ind=\n, is1=\E(B\E)1\E[5;0|,
-	is3=\E[21;1|\212, kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z,
-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm,
-	kf10=\EOd, kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh,
-	kf15=\EOi, kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe,
-	kf6=\ENf, kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T,
-	ll=\E#2, mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE,
+	bel=^G, bold=\E[2;7m, clear=\E[H\E[J, cnorm=\E[11;3|,
+	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
+	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
+	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+	is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u,
+	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
+	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
+	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
+	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
+	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
+	mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE,
 	pln=\E[%p1%dp%p2%:-16s, rc=\E8, ri=\EM, rmacs=^O,
-	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m, rmul=\E[m,
-	rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
+	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmxon=\E[29;1|,
+	rs2=\E[5;0|, sc=\E7,
 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
-	smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m,
-	smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+cpr, use=ansi+idl, use=ansi+local, use=ansi+rep,
-	use=ansi+sgr, use=ecma+index,
+	smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+cpr, use=ansi+idl,
+	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
+	use=ansi+tabs, use=ecma+index,
 
 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
 att500|att513|AT&T 513 using page mode,
 	am, chts, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8,
 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
-	bel=^G, bold=\E[2;7m, cbt=\E[Z, cnorm=\E[11;0|, cr=\r,
+	bel=^G, bold=\E[2;7m, cnorm=\E[11;0|, cr=\r,
 	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n,
 	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;1|, dch=\E[%p1%dP,
 	dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1,
-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH,
-	ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE,
+	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+	indn=\E[%p1%dE,
 	is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l,
 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON,
 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK,
@@ -14399,18 +14313,17 @@ att500|att513|AT&T 513 using page mode,
 	pfx=\E[%p1%d;%p2%l%d;1;0p   F%p1%d           %p2%s,
 	pln=\E[%p1%dp%p2%:-16s, rc=\E8, ri=\EM, rin=\E[%p1%dF,
 	rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|\E[21;1|\212,
-	rmln=\E<, rmso=\E[m, rmul=\E[m,
+	rmln=\E<,
 	rs1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l\E[2;0|
 	    \E[6;1|\E[8;0|\E[19;0|\E[1{\E[?99l,
 	rs2=\E[5;0|, sc=\E7,
 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smir=\E[4h,
-	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+rep, use=ansi+sgr,
-	use=decid+cpr,
+	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+rep,
+	use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr,
 
 # 01-07-88:
 # printer must be set to EMUL ANSI to accept ESC codes
@@ -14555,10 +14468,10 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@,
+	ind=\ED,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0,
 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14568,16 +14481,14 @@ att610|AT&T 610; 80 column; 98key keyboard,
 	nel=\EE,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
-	rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
-	rs2=\Ec\E[?3l,
+	rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rs2=\Ec\E[?3l,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smln=\E[p, smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
-	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
-	use=ansi+erase, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=decid+cpr, use=ecma+index,
-	use=att610+cvis,
+	smln=\E[p, tsl=\E7\E[25;%i%p1%dx, use=ansi+arrows,
+	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+sgrbold, use=decid+cpr,
+	use=ecma+index, use=att610+cvis,
 
 att610-w|AT&T 610; 132 column; 98key keyboard,
 	cols#132, wsl#132,
@@ -14628,10 +14539,10 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
-	ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@,
+	ind=\ED,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h,
 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14648,15 +14559,15 @@ att620|AT&T 620; 80 column; 98key keyboard,
 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM,
 	rmacs=\E(B\017, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p,
-	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l,
+	rs2=\Ec\E[?3l,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
 	sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h,
-	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
-	tsl=\E7\E[25;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
-	use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr, use=decid+cpr,
-	use=ecma+index, use=att610+cvis,
+	smir=\E[4h, smln=\E[p, tsl=\E7\E[25;%i%p1%dx,
+	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrbold, use=decid+cpr, use=ecma+index,
+	use=att610+cvis,
 
 att620-w|AT&T 620; 132 column; 98key keyboard,
 	cols#132, wsl#132,
@@ -14798,7 +14709,7 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	am, eslok, hs, mir, msgr, xenl, xon,
 	cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+	bel=^G, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
 	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
 	fln=4\,4, fsl=\E8, home=\E[H, ich=\E[%p1%d@, ind=\ED,
@@ -14824,12 +14735,11 @@ att700|AT&T 700 24x80 column display w/102key keyboard,
 	rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
-	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p, smso=\E[7m,
-	smul=\E[4m, smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx,
-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
-	use=ansi+rep, use=ansi+sgr, use=decid+cpr,
-	use=att610+cvis0,
+	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p,
+	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx, use=ansi+arrows,
+	use=ansi+csr, use=ansi+erase, use=ansi+idl,
+	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
+	use=ansi+sgrbold, use=decid+cpr, use=att610+cvis0,
 
 # This entry was modified 3/13/90 by JWE.
 # fixes include additions of , correcting , and modification
@@ -14848,10 +14758,10 @@ att730|AT&T 730 windowing terminal,
 	am, da, db, eslok, hs, mir, msgr, npc, xenl, xon,
 	cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
-	fsl=\E8, ht=^I, ich=\E[%p1%d@, ind=\ED,
+	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h,
+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K,
+	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I,
+	ich=\E[%p1%d@, ind=\ED,
 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B,
 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A,
 	kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq,
@@ -14875,10 +14785,10 @@ att730|AT&T 730 windowing terminal,
 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
-	smln=\E[?13l, smso=\E[7m, smul=\E[4m, smxon=\E[?21h,
-	swidm=\E#6, tsl=\E7\E[;%i%p1%dx, use=ansi+arrows,
-	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+rep, use=ansi+sgr,
+	smln=\E[?13l, smxon=\E[?21h, swidm=\E#6,
+	tsl=\E7\E[;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
+	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
 	use=decid+cpr, use=att610+cvis,
 
 # "MGT" is "Multi-Tasking Graphics Terminal"
@@ -15337,9 +15247,9 @@ aas1901|Ann Arbor K4080 w/S1901 mod,
 aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	OTbs, am, km, mc5i, mir, xon,
 	cols#80,
-	bel=^G, bold=\E[1m, clear=\E[H\E[J$<156>, cr=\r, cub1=^H,
-	cud1=^K, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	ed=\E[J, el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
+	bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+	el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
 	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
 	is1=\E[m\E7\E[H\E9\E8,
 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
@@ -15352,15 +15262,15 @@ aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly),
 	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
 	     \\,
-	rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
+	rmm=\E[>52l, sc=\E7,
 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
 	    %;%?%p7%t8;%;m,
 	sgr0=\E[m,
 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
 	     \\,
-	smm=\E[>52h, smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local, use=ansi+rep, use=ansi+sgr,
+	smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows,
+	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rep, use=ansi+sgrbold,
 
 aaa+rv|Ann Arbor Ambassador in reverse video,
 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
@@ -16434,13 +16344,13 @@ hds200|Human Designed Systems HDS200,
 avt-ns|Concept AVT no status line,
 	OTbs, am, eo, mir, ul, xenl, xon,
 	cols#80, lines#24, lm#192,
-	acsc=, bel=^G, bold=\E[1m, clear=\E[H\E[J$<38>,
-	cnorm=\E[=119l, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h, dim=\E[1!{,
-	dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, ed=\E[J$<96>,
-	el=\E[K$<6>, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=\011$<4>,
-	ich=\E[%p1%d@, il=\E[%p1%dL$<4*>, il1=\E[L$<4>,
-	ind=\n$<8>, ip=$<4>, is1=\E[=103l\E[=205l,
+	acsc=, bel=^G, clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r,
+	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h,
+	dim=\E[1!{, dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>,
+	ed=\E[J$<96>, el=\E[K$<6>, home=\E[H,
+	hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, ich=\E[%p1%d@,
+	il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, ip=$<4>,
+	is1=\E[=103l\E[=205l,
 	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1
 	    \E[1Q\EW\E[!y\E[!z\E>\E[0:0:32!r\E[0*w\E[w\E2\r\n\E[2;27
 	    !t,
@@ -16456,10 +16366,9 @@ avt-ns|Concept AVT no status line,
 	    \016%;$<1>,
 	sgr0=\E[m\016$<1>, smacs=\017$<1>,
 	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
-	smso=\E[7m, smul=\E[4m, vpa=\E[%p1%{1}%+%dd,
-	use=ansi+arrows, use=ansi+csr, use=ansi+idc1,
-	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
-	use=ansi+sgr,
+	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
+	use=ansi+idc1, use=ansi+inittabs, use=ansi+local,
+	use=ansi+rep, use=ansi+sgrbold,
 
 avt-rv-ns|Concept AVT in reverse video mode/no status line,
 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
@@ -17479,25 +17388,15 @@ falco-p|ts1p|ts-1p|Falco ts-1 with paging option,
 
 # (ts100: I added / based on the init string -- esr)
 ts100|ts100-sp|Falco ts100-sp,
-	am, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, dch1=\E~W, dl1=\E~R, ed=\E[J$<50>,
-	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
-	ht=^I, hts=\EH, ich1=\E~Q, il1=\E~E, ind=\n, is1=\E~)\E~ea,
-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
-	    %;m%?%p9%t\016%e\017%;$<2>,
-	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
-	use=ansi+csr, use=ansi+local, use=decid+cpr,
-	use=vt100+fnkeys,
+	mir, xenl, xon,
+	vt#3,
+	cub1=^H, cud1=\n, cuf1=\E[C$<2>, cuu1=\E[A$<2>, dch1=\E~W,
+	dl1=\E~R, ich1=\E~Q, il1=\E~E, is1=\E~)\E~ea, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l,
+	rmkx=\E[?1l\E>,
+	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smam=\E[?7h,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+local,
+	use=decid+cpr, use=vt100+4bsd, use=vt100+fnkeys,
 
 ts100-ctxt|Falco ts-100 saving context,
 	rmcup=\E~_b, smcup=\E~_d\E[2J, use=ts100,
@@ -18091,27 +17990,26 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display,
 	cols#80, it#8, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ech=\E[%p1%dX,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S, is2=\Ec, kcbt=\E[Z,
-	kclr=\E[144q, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
-	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
-	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
-	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
-	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
-	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
-	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
-	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
-	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
-	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
-	kf9=\E[009q, kich1=\E[139q, kil1=\E[140q, kind=\E[151q,
-	knp=\E[154q, kpp=\E[150q, kri=\E[155q, krmir=\E[4l,
-	ri=\E[T, rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+	dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG,
+	ind=\E[S, is2=\Ec, kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P,
+	ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q,
+	kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q,
+	kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q,
+	kf18=\E[018q, kf19=\E[019q, kf2=\E[002q, kf20=\E[020q,
+	kf21=\E[021q, kf22=\E[022q, kf23=\E[023q, kf24=\E[024q,
+	kf25=\E[025q, kf26=\E[026q, kf27=\E[027q, kf28=\E[028q,
+	kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q,
+	kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q,
+	kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q,
+	kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, kich1=\E[139q,
+	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
+	kri=\E[155q, krmir=\E[4l, ri=\E[T, rmir=\E[4l, rs2=\Ec,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t;8%;m,
-	sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+sgr, use=ecma+index,
+	smir=\E[4h, use=ansi+arrows, use=ansi+erase,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+	use=ecma+index,
 
 ibmaed|IBM Experimental display,
 	OTbs, am, eo, msgr,
@@ -18237,8 +18135,8 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	cols#80, it#8, lines#25,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H,
-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+	bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H,
 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
 	kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q,
@@ -18257,9 +18155,9 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device,
 	rmul=\E[0m, rs2=\Ec,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
-	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, use=ansi+arrows, use=ansi+idl, use=ansi+local,
-	use=ansi+sgr, use=ecma+index,
+	smacs=\E(0, smir=\E[4h, tbc=\E[3g, use=ansi+arrows,
+	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+	use=ecma+index,
 
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@@ -19329,9 +19227,9 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
-	cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>,
-	cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
+	clear=\E[2J\E[1;1H$<20>, cr=\r$<1>, cub=\E[%p1%dD$<5>,
+	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
+	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
 	cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>,
 	cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>,
 	dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX,
@@ -19350,8 +19248,8 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
 	sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h,
-	smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g,
-	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=ansi+sgr,
+	smkx=\E[?1h\E=, smso=\E[1;7m, tbc=\E[3g,
+	vpa=\E[%p1%dd$<40>, use=ansi+csr, use=ansi+sgrbold,
 	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
 	use=vt220+keypad, use=ncr260vt+sl,
 
@@ -19384,7 +19282,7 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
 	csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>,
 	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
 	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
@@ -19415,10 +19313,10 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=ansi+sgr,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
-	use=vt220+keypad, use=ncr260vt+sl,
+	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ncr260vt+sl,
 
 ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
 	cols#132,
@@ -19442,7 +19340,7 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	am, mir, msgr, xenl, xon,
 	cols#80, lines#24, nlab#32,
 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	bold=\E[1m, clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
+	clear=\E[2J\E[1;1H$<20>, cr=\r$<1>,
 	csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>,
 	cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>,
 	cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>,
@@ -19473,10 +19371,10 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard,
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
 	sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-	tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=ansi+sgr,
-	use=decid+cpr, use=vt220+vtedit, use=vt220+cvis,
-	use=vt220+keypad, use=ncr260vt+sl,
+	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+	use=ncr260vt+sl,
 
 ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
 	cols#132,
@@ -19746,26 +19644,24 @@ ncr160wy60pp|NCR 2900/160 Wyse 60,
 ncr160wy60wpp|NCR 2900/160 Wyse 60 wide mode,
 	use=ncr260wy60wpp,
 ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal,
-	am, hs, mc5i, mir, msgr, xon,
-	cols#80, it#8, lines#24, nlab#32,
+	hs, mc5i, mir, xon,
+	nlab#32,
 	acsc=``aaffgghhiijjkkllmmnnqqttuuvvwwxxyyzz~~,
-	bel=^G, blink=\E[5m$<30>, bold=\E[1m$<30>,
-	clear=\E[2J\E[1;1H$<300>, cr=\r,
+	blink=\E[5m$<30>, bold=\E[1m$<30>,
+	clear=\E[2J\E[1;1H$<300>,
 	csr=\E[%i%p1%d;%p2%dr$<100>, cub=\E[%p1%dD$<30>,
 	cub1=\E[D$<2>, cud=\E[%p1%dB$<30>, cud1=\E[B$<2>,
-	cuf=\E[%p1%dC$<30>, cuf1=\E[C$<2>,
-	cup=\E[%i%p1%d;%p2%dH$<100>, cuu=\E[%p1%dA$<30>,
-	cuu1=\E[A$<2>, dch=\E[%p1%dP$<40>, dch1=\E[1P$<10>,
-	dl=\E[%p1%dM$<70>, dl1=\E[M$<40>, dsl=\E[31l$<25>,
-	ed=\E[0J$<300>, el=\E[0K$<30>, el1=\E[1K$<30>,
-	enacs=\E(B\E)0$<40>, fsl=1$<10>, home=\E[H$<2>$<80>,
-	ht=^I, hts=\EH, il=\E[%p1%dL$<80>, il1=\E[B\E[L$<80>,
-	ind=\ED,
+	cuf=\E[%p1%dC$<30>, cup=\E[%i%p1%d;%p2%dH$<100>,
+	cuu=\E[%p1%dA$<30>, dch=\E[%p1%dP$<40>,
+	dch1=\E[1P$<10>, dl=\E[%p1%dM$<70>, dl1=\E[M$<40>,
+	dsl=\E[31l$<25>, ed=\E[0J$<300>, el=\E[0K$<30>,
+	el1=\E[1K$<30>, enacs=\E(B\E)0$<40>, fsl=1$<10>,
+	home=\E[H$<2>$<80>, il=\E[%p1%dL$<80>,
+	il1=\E[B\E[L$<80>, ind=\ED,
 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3l\E(B\E)0$<200>,
-	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kbs=^H, kcub1=\E[D,
-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kent=\r, kf1=\EOP,
-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE,
-	rc=\E8, rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>,
+	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, kf1=\EOP, kf2=\EOQ,
+	kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE, rc=\E8,
+	rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>,
 	rmir=\E[4l$<80>, rmso=\E[0m$<30>, rmul=\E[0m$<30>,
 	rs2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E(
 	    B\E)0\E%/0n\E[P\031$<200>,
@@ -19774,7 +19670,7 @@ ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal,
 	    %p3%|%t;7%;%?%p4%t;5%;m$<120>,
 	sgr0=\017\E[0m$<120>, smacs=\016$<90>, smir=\E[4h$<80>,
 	smso=\E[7m$<30>, smul=\E[4m$<30>, tbc=\E[3g$<40>,
-	tsl=\E[>+1$<70>, use=decid+cpr,
+	tsl=\E[>+1$<70>, use=decid+cpr, use=vt100+4bsd,
 ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal,
 	cols#132,
 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0$<200>,
@@ -20030,10 +19926,11 @@ uts30|Sperry UTS30 with cp/m@1R1,
 	il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H,
 	khome=\E[H, rc=\EX, rev=\E[7m,
 	rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA,
-	rmacs=\Ed, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
+	rmacs=\Ed, rmam=\E[?7l,
 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW,
-	sgr0=\E[m, smacs=\EF, smam=\E[?7m, smso=\E[7m, smul=\E[4m,
-	tsl=\E], uc=\EPB, use=ansi+apparrows, use=ansi+local,
+	sgr0=\E[m, smacs=\EF, smam=\E[?7m, tsl=\E], uc=\EPB,
+	use=ansi+apparrows, use=ansi+local, use=ansi+sgrso,
+	use=ansi+sgrul,
 
 #### Tandem
 #
@@ -20269,23 +20166,13 @@ tek4105|Tektronix 4105,
 
 # (tek4105-30: I added / based on the init string -- esr)
 tek4105-30|Tektronix 4015 emulating 30 line VT100,
-	am, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#30, vt#3,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
-	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
-	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>,
-	enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
-	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
-	    %;m%?%p9%t\016%e\017%;$<2>,
-	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
-	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
-	use=ansi+csr, use=ansi+local, use=vt100+fnkeys,
+	mir, xenl, xon,
+	lines#30, vt#3,
+	cub1=^H, cud1=\n, cuf1=\E[C$<2>, cuu1=\E[A$<2>, kcub1=\EOD,
+	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l,
+	rmkx=\E[?1l\E>, rmso=\E[m$<2>, smam=\E[?7h,
+	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+local,
+	use=vt100+4bsd, use=vt100+fnkeys,
 
 # Tektronix 4105 from BRL
 # The following setup modes are assumed for normal operation:
@@ -20496,15 +20383,12 @@ otek4115|Tektronix 4115 (old),
 tek4115|Tektronix 4115 entry with more ANSI capabilities (new),
 	am, xon,
 	cols#80, lines#34,
-	bel=^G, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n,
-	dch1=\E[P, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
-	kcuu1=\E[A, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
-	    %;%?%p7%t8;%;m,
-	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
-	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
-	use=ansi+idl, use=ansi+local, use=ansi+rep, use=ansi+rca,
-	use=ansi+sgr,
+	bel=^G, cr=\r, cub1=^H, cud1=\n, dch1=\E[P, ich=\E[%p1%d@,
+	ich1=\E[@, ind=\n, kcuu1=\E[A, rmam=\E[?7l, sgr0=\E[m,
+	smam=\E[?7h, use=ansi+arrows, use=ansi+cup,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+rep, use=ansi+rca, use=ansi+sgrbold,
+	use=ansi+tabs,
 
 # The tek4125 emulates a VT100 incorrectly - the scrolling region
 # command is ignored.  The following entry replaces  with the needed
@@ -20768,19 +20652,18 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX,
 	cols#80, it#8, lines#24,
 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
 	     \263,
-	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-	home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S\E[B,
-	indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, kcbt=^],
-	kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241, kf3=\242,
-	kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247, kf9=\250,
-	kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H, nel=\r,
-	rev=\E[7m, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
-	rmso=\E[m, rmul=\E[m,
+	bel=^G, clear=\Ec, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
+	hpa=\E[%i%p1%dG, ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB,
+	invis=\E[30;40m, kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240,
+	kf10=\251, kf2=\241, kf3=\242, kf4=\243, kf5=\244, kf6=\245,
+	kf7=\246, kf8=\247, kf9=\250, kich1=\E[^H, knp=\E[U,
+	kpp=\E[V, ll=\E[24;1H, nel=\r, rev=\E[7m, ri=\E[T\E[A,
+	rin=\E[%p1%dT\E[%p1%dA,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;%?%p7%t30;40%;m,
-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
-	use=ansi+local,
+	sgr0=\E[m, use=ansi+arrows, use=ansi+local,
+	use=ansi+sgrbold,
 
 #### Apple II
 #
@@ -22069,15 +21952,14 @@ tws-generic|dku7102|Bull Questar tws terminals,
 	kf8=\E[8u\027, khts=\EH, kil1=\E[L, krmir=\E[4l,
 	ll=\E[H\E[A, mc0=\E[0i, mc4=\r\E[4i, mc5=\E[5i,
 	rev=\E[0;7m, rmacs=^O, rmcup=\E[0;98v\E[2J\E[v,
-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O,
-	s1ds=^N,
+	rmir=\E[4l, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N,
 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?
 	    %p7%t;8%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99:98\E\\,
 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
-	use=ansi+local,
+	use=ansi+local, use=ansi+sgrdim,
 
 tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
@@ -22174,35 +22056,31 @@ dku7202|Bull Questar 200 DKU7202 (colour/character attributes),
 
 # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310
 bq300|Bull VT320 ISO Latin 1 80 columns terminal,
-	am, eo, eslok, hs, km, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r,
-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
-	dsl=\E[1$}\E[2$~\n\E[0$}, ech=\E[%p1%dX, el1=\E[1K,
-	enacs=\E(B\E)0, flash=\E[?5h$<50>\E[?5l, fsl=\E[0$},
-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
-	is1=\E[63;1"p\E[2h,
+	eo, eslok, hs, km, mir, xenl, xon,
+	vt#3, wsl#80,
+	blink=\E[5m, bold=\E[1m, cup=\E[%i%p1%d;%p2%dH,
+	dch=\E[%p1%dP, dch1=\E[P, dsl=\E[1$}\E[2$~\n\E[0$},
+	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<50>\E[?5l,
+	fsl=\E[0$}, ich=\E[%p1%d@, ind=\ED, is1=\E[63;1"p\E[2h,
 	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
 	    l,
 	is3=\E[0$}\E[?25h\E[2l\E[H\E[J, ka1=\EOw, ka3=\EOy,
-	kb2=\EOu, kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\E[D, kcud1=\E[B,
-	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
-	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
-	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h,
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-	rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
+	kb2=\EOu, kc1=\EOq, kc3=\EOs, kf1=\EOP, kf10=\E[21~,
+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+	nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
+	rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+	rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
 	    %;m%?%p9%t\E(0%e\E(B%;,
 	sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
 	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, use=ansi+enq,
-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
-	use=ansi+local, use=ansi+pp, use=vt220+cvis,
+	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+pp, use=vt100+4bsd, use=vt220+cvis,
 	use=vt220+vtedit,
 
 bq300-rv|Bull VT320 reverse 80 columns,
@@ -22277,28 +22155,26 @@ bq300-w-rv|Bull VT320 reverse mode 132 columns,
 # and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off
 # (bq300-8: ,,,,, to get under 1024 --esr)
 bq300-8|Bull VT320 full 8 bits 80 columns,
-	am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon,
-	cols#80, it#8, lines#24, vt#3, wsl#80,
-	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-	bel=^G, blink=\2335m, bold=\2331m, clear=\233H\233J, cr=\r,
+	eo, eslok, hs, km, mc5i, mir, xenl, xon,
+	vt#3, wsl#80,
+	blink=\2335m, bold=\2331m, clear=\233H\233J,
 	csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=\2331D,
 	cud=\233%p1%dB, cud1=\2331B, cuf=\233%p1%dC, cuf1=\2331C,
 	cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\2331A,
 	dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, dl1=\233M,
 	dsl=\2331$}\2332$~\n\2330$}, ech=\233%p1%dX, ed=\233J,
-	el=\233K, el1=\2331K, enacs=\E(B\E)0,
-	flash=\233?5h$<50>\233?5l, fsl=\2330$}, home=\233H,
-	ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L,
-	ind=\ED, is1=\E[63;2"p\E[2h,
+	el=\233K, el1=\2331K, flash=\233?5h$<50>\233?5l,
+	fsl=\2330$}, home=\233H, ich=\233%p1%d@, il=\233%p1%dL,
+	il1=\233L, ind=\ED, is1=\E[63;2"p\E[2h,
 	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
 	    l,
 	is3=\2330$}\233?25h\2332l\233H\233J, ka1=\217w,
-	ka3=\217y, kb2=\217u, kbs=^H, kc1=\217q, kc3=\217s,
-	kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A,
-	kdch1=\2333~, kf1=\217P, kf10=\23321~, kf11=\23323~,
-	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
-	kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~,
-	kf2=\217Q, kf20=\23334~, kf3=\217R, kf4=\217S, kf6=\23317~,
+	ka3=\217y, kb2=\217u, kc1=\217q, kc3=\217s, kcub1=\233D,
+	kcud1=\233B, kcuf1=\233C, kcuu1=\233A, kdch1=\2333~,
+	kf1=\217P, kf10=\23321~, kf11=\23323~, kf12=\23324~,
+	kf13=\23325~, kf14=\23326~, kf15=\23328~, kf16=\23329~,
+	kf17=\23331~, kf18=\23332~, kf19=\23333~, kf2=\217Q,
+	kf20=\23334~, kf3=\217R, kf4=\217S, kf6=\23317~,
 	kf7=\23318~, kf8=\23319~, kf9=\23320~, kfnd=\2331~,
 	khlp=\23328~, kich1=\2332~, knp=\2336~, kpp=\2335~,
 	krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3,
@@ -22312,7 +22188,7 @@ bq300-8|Bull VT320 full 8 bits 80 columns,
 	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h,
 	smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m,
 	smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~,
-	use=vt220+cvis8,
+	use=vt100+4bsd, use=vt220+cvis8,
 bq300-8rv|Bull VT320 8-bit reverse mode 80 columns,
 	flash=\233?5l$<50>\233?5h,
 	is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4
@@ -22981,22 +22857,21 @@ z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode,
 	am, eslok, hs, mir, msgr, xon,
 	cols#80, lines#24,
 	acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
-	blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h,
-	clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r,
-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
-	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
-	fsl=\E[u, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[1L,
-	ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw,
-	ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS,
-	kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ,
-	kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
+	blink=\E[5m, bold=\E[1m, civis=\E[>5h, clear=\E[2J\E[H,
+	cnorm=\E[>5l, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
+	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[>1l, ed=\E[0J,
+	el=\E[0K, el1=\E[1K, fsl=\E[u, home=\E[H, il=\E[%p1%dL,
+	il1=\E[1L, ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J,
+	ka1=\EOw, ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J,
+	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
+	kf7=\EOQ, kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
 	mc0=\E[?19h\E[i, rc=\E[u, rev=\E[7m, rmacs=\E(B,
 	rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m,
 	rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, smir=\E[4h,
-	smkx=\E[>7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
 	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
-	use=ansi+local, use=ansi+pp,
+	use=ansi+local, use=ansi+pp, use=ansi+tabs,
 
 # From: Brad Brahms 
 z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor,
@@ -23121,9 +22996,9 @@ graphos|graphos III,
 	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
 	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
-	rmir=\E[4l, rmso=\E[m, sc=\E7, sgr0=\E[m, smdc=\E[4h,
-	smir=\E[4h, smso=\E[7m, use=ansi+arrows, use=ansi+idl,
-	use=ansi+local,
+	rmir=\E[4l, sc=\E7, sgr0=\E[m, smdc=\E[4h, smir=\E[4h,
+	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso,
 
 graphos-30|graphos III with 30 lines,
 	lines#30,
@@ -23332,12 +23207,12 @@ hirez100|Selanar HiREZ-100,
 	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
 	lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[48H, mc0=\E[i,
 	mc4=\E[4i\E[?4i, mc5=\E[?5i\E[5i, nel=\EE, rc=\E8,
-	rev=\E[7m, rmacs=^O, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+	rev=\E[7m, rmacs=^O, rmkx=\E[?1l\E>,
 	rs1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;1
 	    9l\E[r\E[m\E(B\017\E)0\E>,
-	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m,
-	smul=\E[4m, tbc=\E[3g, use=ansi+erase, use=ansi+idl,
-	use=ansi+local,
+	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, tbc=\E[3g,
+	use=ansi+erase, use=ansi+idl, use=ansi+local,
+	use=ansi+sgrso, use=ansi+sgrul,
 
 hirez100-w|Selanar HiREZ-100 in 132-column mode,
 	cols#132, use=hirez100,
@@ -23795,8 +23670,7 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	am, bw, eo, xon,
 	cols#80, lines#25,
 	acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~,
-	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[=C,
-	clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
+	bel=^G, civis=\E[=C, clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J,
 	el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@,
@@ -23805,13 +23679,12 @@ att6386|at386|386at|AT&T WGS 6386 console,
 	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
 	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
 	kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S,
-	rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmso=\E[m,
-	rmul=\E[m, sc=\E7,
+	rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7,
 	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;
 	    2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
-	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+inittabs,
-	use=ansi+local, use=ecma+index, use=klone+color,
+	sgr0=\E[0;10m, smacs=\E[12m, vpa=\E[%i%p1%dd,
+	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+	use=ansi+sgrbold, use=ecma+index, use=klone+color,
 
 # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
 pc6300plus|AT&T 6300 plus,
@@ -27694,4 +27567,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr
 #	  to trim -TD
 #
+# 2024-01-14
+#	+ use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs
+#	  ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit
+#	  xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 59e80d05..ae198df6 100644
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.183 2022/10/01 12:47:39 tom Exp $
+# $Id: Makefile.in,v 1.184 2024/01/19 12:00:00 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -251,7 +251,7 @@ init_keytry.h : make_keys$(BUILD_EXEEXT) keys.list
 	./make_keys$(BUILD_EXEEXT) keys.list > $@
 
 keys.list :	$(tinfo)/MKkeys_list.sh
-	AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@
+	AWK=$(AWK) USE_SIGWINCH=@cf_cv_enable_sigwinch@ $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@
 
 make_keys$(BUILD_EXEEXT) : \
 		build.priv.h \
@@ -288,7 +288,7 @@ report_offsets$(BUILD_EXEEXT) : \
 	$(SHELL) -e $(tinfo)/MKuserdefs.sh $(AWK) $(USE_BIG_STRINGS) $(CAPLIST) > $@
 
 ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
-	$(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@
+	$(AWK) -f $(base)/MKkeyname.awk use_sigwinch=@cf_cv_enable_sigwinch@ bigstrings=$(USE_BIG_STRINGS) keys.list > $@
 
 ./codes.c: $(tinfo)/MKcodes.awk
 	$(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@
diff --git a/ncurses/tinfo/MKkeys_list.sh b/ncurses/tinfo/MKkeys_list.sh
index 0facfbb8..05ac8cf6 100755
--- a/ncurses/tinfo/MKkeys_list.sh
+++ b/ncurses/tinfo/MKkeys_list.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
-# $Id: MKkeys_list.sh,v 1.8 2022/02/05 20:40:20 tom Exp $
+# $Id: MKkeys_list.sh,v 1.9 2024/01/19 12:26:30 tom Exp $
 ##############################################################################
-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2001-2003,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -36,6 +36,7 @@
 # Extract function-key names from the Caps file
 #
 : ${AWK-awk}
+: ${USE_SIGWINCH-0}
 if test $# != 0
 then
 	DATA="$*"
@@ -53,8 +54,8 @@ cat <  Sat, 13 Jan 2024 05:52:13 -0500
+ -- Thomas E. Dickey   Fri, 19 Jan 2024 06:23:02 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 93de69c0..0a77de59 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240113) unstable; urgency=low
+ncurses6 (6.4+20240120) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 13 Jan 2024 05:52:13 -0500
+ -- Thomas E. Dickey   Fri, 19 Jan 2024 06:23:02 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 2bbe1c66..b3b72561 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20240113) unstable; urgency=low
+ncurses6 (6.4+20240120) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 13 Jan 2024 05:52:13 -0500
+ -- Thomas E. Dickey   Fri, 19 Jan 2024 06:23:02 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 803262a2..23076414 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.628 2024/01/13 10:52:13 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.629 2024/01/19 11:23:02 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0113"
+!define VERSION_MMDD  "0120"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 6e43bd2f..05137673 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20240113
+Release: 20240120
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 22af400a..142275f7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20240113
+Release: 20240120
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index b32a9607..88c58ee2 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20240113
+Release: 20240120
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 3bdd8e73..fdab359a 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
 dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.220 2023/12/03 14:21:34 tom Exp $
+dnl $Id: aclocal.m4,v 1.221 2024/01/19 18:27:20 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -1098,7 +1098,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 15 updated: 2021/01/02 09:31:20
+dnl CF_CURSES_TERM_H version: 16 updated: 2024/01/07 06:34:16
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -1144,7 +1144,7 @@ case "$cf_cv_term_header" in
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
-make an error
+#error expected NCURSES_VERSION to be defined
 #endif],
 			[WINDOW *x; (void)x],
 			[cf_cv_term_header=$cf_header
@@ -3074,7 +3074,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 17 updated: 2023/01/05 18:54:02
+dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -3104,7 +3104,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -4386,7 +4386,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 18 updated: 2023/01/11 04:05:23
+dnl CF_XOPEN_CURSES version: 20 updated: 2024/01/07 06:54:12
 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
@@ -4403,15 +4403,16 @@ $ac_includes_default
 #include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(NCURSES_VERSION_PATCH)
 #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
-	make an error
+	#error disallow ncurses versions between 2020/04/03 and 2010/05/01
 #endif
 #endif
 #ifdef NCURSES_WIDECHAR
-make an error	/* prefer to fall-through on the second checks */
+#error prefer to fall-through on the second checks
 #endif
+	static char dummy[10];
 	cchar_t check;
 	int check2 = curs_set((int)sizeof(check));
-	long x = winnstr(stdscr, "", 0);
+	long x = winnstr(stdscr, dummy, 5);
 	int x1, y1;
 	(void)check2;
 	getbegyx(stdscr, y1, x1);
@@ -4427,9 +4428,10 @@ make an error	/* prefer to fall-through on the second checks */
 #define $cf_try_xopen_extension 1
 $ac_includes_default
 #include <${cf_cv_ncurses_header:-curses.h}>],[
+		static char dummy[10];
 		cchar_t check;
 		int check2 = curs_set((int)sizeof(check));
-		long x = winnstr(stdscr, "", 0);
+		long x = winnstr(stdscr, dummy, 5);
 		int x1, y1;
 		getbegyx(stdscr, y1, x1);
 		(void)check2;
diff --git a/test/configure b/test/configure
index dfc9112e..d20e3c76 100755
--- a/test/configure
+++ b/test/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20230903.
+# Generated by Autoconf 2.52.20231210.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -809,7 +809,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20230903.  Invocation command line was
+generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
 
@@ -2447,8 +2447,8 @@ for ac_kw in inline __inline__ __inline; do
 #line 2447 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }
-$ac_kw int foo () {return 0; }
+static $ac_kw int static_foo (void) {return 0; }
+$ac_kw int foo (void) {return 0; }
 #endif
 
 _ACEOF
@@ -3881,7 +3881,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char strlcat ();
+char strlcat (void);
 int
 main (void)
 {
@@ -6171,7 +6171,7 @@ int
 main (void)
 {
 #ifndef exit
-  char *p = (char *) exit; (void) p;
+  (void) exit;
 #endif
 
   ;
@@ -7188,7 +7188,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -7280,7 +7280,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -7357,7 +7357,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -7428,7 +7428,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -7737,7 +7737,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -10074,7 +10074,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -10133,7 +10133,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -10183,7 +10183,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -10245,7 +10245,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -12161,7 +12161,7 @@ int main(void)
 # ifdef __NCURSES_H
 	fprintf(fp, "old\\n");
 # else
-	make an error
+	#error expected ncurses header to define __NCURSES_H
 # endif
 #endif
 	${cf_cv_main_return:-return}(0);
@@ -12220,7 +12220,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char Gpm_Open ();
+char Gpm_Open (void);
 int
 main (void)
 {
@@ -12270,7 +12270,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char initscr ();
+char initscr (void);
 int
 main (void)
 {
@@ -12332,7 +12332,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char tgoto ();
+char tgoto (void);
 int
 main (void)
 {
@@ -13039,7 +13039,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -13081,7 +13081,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -13135,7 +13135,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -13261,7 +13261,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -13315,7 +13315,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -13438,7 +13438,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char connect ();
+char connect (void);
 int
 main (void)
 {
@@ -13554,7 +13554,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char remove ();
+char remove (void);
 int
 main (void)
 {
@@ -13670,7 +13670,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char shmat ();
+char shmat (void);
 int
 main (void)
 {
@@ -13735,7 +13735,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber ();
+char IceConnectionNumber (void);
 int
 main (void)
 {
@@ -14408,7 +14408,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char XextCreateExtension ();
+char XextCreateExtension (void);
 int
 main (void)
 {
@@ -15953,7 +15953,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -16086,7 +16086,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char XtAppInitialize ();
+char XtAppInitialize (void);
 int
 main (void)
 {
@@ -16756,7 +16756,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -16959,7 +16959,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char _nc_init_pthreads ();
+char _nc_init_pthreads (void);
 int
 main (void)
 {
@@ -17487,7 +17487,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char new_panel ();
+char new_panel (void);
 int
 main (void)
 {
@@ -17892,7 +17892,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char menu_driver ();
+char menu_driver (void);
 int
 main (void)
 {
@@ -18298,7 +18298,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char form_driver ();
+char form_driver (void);
 int
 main (void)
 {
@@ -18763,7 +18763,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gettimeofday ();
+char gettimeofday (void);
 int
 main (void)
 {
@@ -19119,15 +19119,16 @@ main (void)
 
 #if defined(NCURSES_VERSION_PATCH)
 #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
-	make an error
+	#error disallow ncurses versions between 2020/04/03 and 2010/05/01
 #endif
 #endif
 #ifdef NCURSES_WIDECHAR
-make an error	/* prefer to fall-through on the second checks */
+#error prefer to fall-through on the second checks
 #endif
+	static char dummy[10];
 	cchar_t check;
 	int check2 = curs_set((int)sizeof(check));
-	long x = winnstr(stdscr, "", 0);
+	long x = winnstr(stdscr, dummy, 5);
 	int x1, y1;
 	(void)check2;
 	getbegyx(stdscr, y1, x1);
@@ -19140,16 +19141,16 @@ make an error	/* prefer to fall-through on the second checks */
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19146: \$? = $ac_status" >&5
+  echo "$as_me:19147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19152: \$? = $ac_status" >&5
+  echo "$as_me:19153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -19159,7 +19160,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19162 "configure"
+#line 19163 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -19169,9 +19170,10 @@ int
 main (void)
 {
 
+		static char dummy[10];
 		cchar_t check;
 		int check2 = curs_set((int)sizeof(check));
-		long x = winnstr(stdscr, "", 0);
+		long x = winnstr(stdscr, dummy, 5);
 		int x1, y1;
 		getbegyx(stdscr, y1, x1);
 		(void)check2;
@@ -19184,16 +19186,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19190: \$? = $ac_status" >&5
+  echo "$as_me:19192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19196: \$? = $ac_status" >&5
+  echo "$as_me:19198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -19207,7 +19209,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19210: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:19212: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -19219,7 +19221,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:19222: checking for term.h" >&5
+echo "$as_me:19224: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19240,7 +19242,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19243 "configure"
+#line 19245 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19254,16 +19256,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19260: \$? = $ac_status" >&5
+  echo "$as_me:19262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19266: \$? = $ac_status" >&5
+  echo "$as_me:19268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -19282,14 +19284,14 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19285 "configure"
+#line 19287 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
-make an error
+#error expected NCURSES_VERSION to be defined
 #endif
 int
 main (void)
@@ -19300,16 +19302,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19306: \$? = $ac_status" >&5
+  echo "$as_me:19308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19312: \$? = $ac_status" >&5
+  echo "$as_me:19314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -19324,7 +19326,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:19327: result: $cf_cv_term_header" >&5
+echo "$as_me:19329: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -19351,7 +19353,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19354: checking for unctrl.h" >&5
+echo "$as_me:19356: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19372,7 +19374,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19375 "configure"
+#line 19377 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19386,16 +19388,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19392: \$? = $ac_status" >&5
+  echo "$as_me:19394: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19398: \$? = $ac_status" >&5
+  echo "$as_me:19400: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -19408,12 +19410,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:19411: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:19413: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:19416: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:19418: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -19511,10 +19513,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:19514: checking for ${cf_func}" >&5
+	echo "$as_me:19516: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19517: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19519: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19523,7 +19525,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19526 "configure"
+#line 19528 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19556,16 +19558,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19562: \$? = $ac_status" >&5
+  echo "$as_me:19564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19568: \$? = $ac_status" >&5
+  echo "$as_me:19570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19581,7 +19583,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19584: result: $cf_result" >&5
+	echo "$as_me:19586: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <&5
+	echo "$as_me:19601: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:19602: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:19604: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19608,7 +19610,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19611 "configure"
+#line 19613 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19641,16 +19643,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19647: \$? = $ac_status" >&5
+  echo "$as_me:19649: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19653: \$? = $ac_status" >&5
+  echo "$as_me:19655: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -19666,7 +19668,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:19669: result: $cf_result" >&5
+	echo "$as_me:19671: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
-#line 19693 "configure"
+#line 19695 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19710,21 +19712,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19716: \$? = $ac_status" >&5
+  echo "$as_me:19718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19722: \$? = $ac_status" >&5
+  echo "$as_me:19724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:19727: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:19729: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <&5
+echo "$as_me:19749: checking for ncurses extended functions" >&5
 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19754 "configure"
+#line 19756 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19766,16 +19768,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19772: \$? = $ac_status" >&5
+  echo "$as_me:19774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19778: \$? = $ac_status" >&5
+  echo "$as_me:19780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -19783,7 +19785,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19786 "configure"
+#line 19788 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19808,16 +19810,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19814: \$? = $ac_status" >&5
+  echo "$as_me:19816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19820: \$? = $ac_status" >&5
+  echo "$as_me:19822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -19831,7 +19833,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19834: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:19836: result: $cf_cv_ncurses_ext_funcs" >&5
 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
 test "$cf_cv_ncurses_ext_funcs" = yes &&
 cat >>confdefs.h <<\EOF
@@ -19845,11 +19847,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:19848: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:19850: checking if _XPG5 should be defined to enable wide-characters" >&5
 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 19852 "configure"
+#line 19854 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19862,16 +19864,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19868: \$? = $ac_status" >&5
+  echo "$as_me:19870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19874: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19880,7 +19882,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19883 "configure"
+#line 19885 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19893,16 +19895,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19899: \$? = $ac_status" >&5
+  echo "$as_me:19901: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19905: \$? = $ac_status" >&5
+  echo "$as_me:19907: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
@@ -19913,7 +19915,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 			 CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:19916: result: $cf_define_xpg5" >&5
+		echo "$as_me:19918: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -19922,14 +19924,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:19925: checking for wide-character functions" >&5
+	echo "$as_me:19927: checking for wide-character functions" >&5
 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
 if test "${cf_cv_widechar_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 19932 "configure"
+#line 19934 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19946,16 +19948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19952: \$? = $ac_status" >&5
+  echo "$as_me:19954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19958: \$? = $ac_status" >&5
+  echo "$as_me:19960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -19966,7 +19968,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19969: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19971: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -19987,14 +19989,14 @@ EOF
 
 fi
 
-echo "$as_me:19990: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19992: checking if $cf_cv_screen library uses pthreads" >&5
 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
 if test "${cf_cv_use_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19997 "configure"
+#line 19999 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20012,16 +20014,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20018: \$? = $ac_status" >&5
+  echo "$as_me:20020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20024: \$? = $ac_status" >&5
+  echo "$as_me:20026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -20032,21 +20034,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20035: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:20037: result: $cf_cv_use_pthreads" >&5
 echo "${ECHO_T}$cf_cv_use_pthreads" >&6
 test $cf_cv_use_pthreads = yes &&
 cat >>confdefs.h <<\EOF
 #define USE_PTHREADS 1
 EOF
 
-echo "$as_me:20042: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20044: checking if sys/time.h works with sys/select.h" >&5
 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
 if test "${cf_cv_sys_time_select+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20049 "configure"
+#line 20051 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20066,16 +20068,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20072: \$? = $ac_status" >&5
+  echo "$as_me:20074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20078: \$? = $ac_status" >&5
+  echo "$as_me:20080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -20087,7 +20089,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:20090: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20092: result: $cf_cv_sys_time_select" >&5
 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
 test "$cf_cv_sys_time_select" = yes &&
 cat >>confdefs.h <<\EOF
@@ -20096,7 +20098,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:20099: checking for openpty in -lutil" >&5
+echo "$as_me:20101: checking for openpty in -lutil" >&5
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20104,7 +20106,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20107 "configure"
+#line 20109 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20113,7 +20115,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char openpty ();
+char openpty (void);
 int
 main (void)
 {
@@ -20123,16 +20125,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20129: \$? = $ac_status" >&5
+  echo "$as_me:20131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20135: \$? = $ac_status" >&5
+  echo "$as_me:20137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -20143,7 +20145,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20146: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:20148: result: $ac_cv_lib_util_openpty" >&5
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test "$ac_cv_lib_util_openpty" = yes; then
   cf_cv_lib_util=yes
@@ -20151,7 +20153,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:20154: checking for openpty header" >&5
+echo "$as_me:20156: checking for openpty header" >&5
 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
 if test "${cf_cv_func_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20178,7 +20180,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20181 "configure"
+#line 20183 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20196,16 +20198,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20202: \$? = $ac_status" >&5
+  echo "$as_me:20204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20208: \$? = $ac_status" >&5
+  echo "$as_me:20210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -20223,7 +20225,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:20226: result: $cf_cv_func_openpty" >&5
+echo "$as_me:20228: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -20257,7 +20259,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:20260: checking for function curses_version" >&5
+echo "$as_me:20262: checking for function curses_version" >&5
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20267,7 +20269,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20270 "configure"
+#line 20272 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20283,15 +20285,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20289: \$? = $ac_status" >&5
+  echo "$as_me:20291: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20294: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -20306,14 +20308,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:20309: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:20311: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes &&
 cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
-echo "$as_me:20316: checking for alternate character set array" >&5
+echo "$as_me:20318: checking for alternate character set array" >&5
 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
 if test "${cf_cv_curses_acs_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20323,7 +20325,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20326 "configure"
+#line 20328 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20339,16 +20341,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20345: \$? = $ac_status" >&5
+  echo "$as_me:20347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20351: \$? = $ac_status" >&5
+  echo "$as_me:20353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -20359,7 +20361,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:20362: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:20364: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -20369,7 +20371,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:20372: checking for wide alternate character set array" >&5
+echo "$as_me:20374: checking for wide alternate character set array" >&5
 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
 if test "${cf_cv_curses_wacs_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20379,7 +20381,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20382 "configure"
+#line 20384 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20395,16 +20397,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20401: \$? = $ac_status" >&5
+  echo "$as_me:20403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20407: \$? = $ac_status" >&5
+  echo "$as_me:20409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -20415,7 +20417,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	done
 fi
-echo "$as_me:20418: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:20420: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -20423,7 +20425,7 @@ cat >>confdefs.h <&5
+echo "$as_me:20428: checking for wide alternate character constants" >&5
 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
 if test "${cf_cv_curses_wacs_symbols+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20433,7 +20435,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20436 "configure"
+#line 20438 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20450,16 +20452,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20456: \$? = $ac_status" >&5
+  echo "$as_me:20458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20462: \$? = $ac_status" >&5
+  echo "$as_me:20464: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20469,7 +20471,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20472 "configure"
+#line 20474 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20485,16 +20487,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20491: \$? = $ac_status" >&5
+  echo "$as_me:20493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20497: \$? = $ac_status" >&5
+  echo "$as_me:20499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -20505,7 +20507,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
-echo "$as_me:20508: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:20510: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -20515,10 +20517,10 @@ EOF
 
 fi
 
-echo "$as_me:20518: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20520: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20521 "configure"
+#line 20523 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20536,16 +20538,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20542: \$? = $ac_status" >&5
+  echo "$as_me:20544: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20548: \$? = $ac_status" >&5
+  echo "$as_me:20550: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20554,7 +20556,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20557: result: $cf_result" >&5
+echo "$as_me:20559: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20575,14 +20577,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:20578: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:20580: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20585 "configure"
+#line 20587 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20600,23 +20602,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20606: \$? = $ac_status" >&5
+  echo "$as_me:20608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20612: \$? = $ac_status" >&5
+  echo "$as_me:20614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20619 "configure"
+#line 20621 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20635,16 +20637,16 @@ mbstate_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20641: \$? = $ac_status" >&5
+  echo "$as_me:20643: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20647: \$? = $ac_status" >&5
+  echo "$as_me:20649: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -20656,7 +20658,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20659: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:20661: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -20679,14 +20681,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:20682: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:20684: checking if we must include wchar.h to declare wchar_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
 if test "${cf_cv_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20689 "configure"
+#line 20691 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20704,23 +20706,23 @@ wchar_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20710: \$? = $ac_status" >&5
+  echo "$as_me:20712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20716: \$? = $ac_status" >&5
+  echo "$as_me:20718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20723 "configure"
+#line 20725 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20739,16 +20741,16 @@ wchar_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20745: \$? = $ac_status" >&5
+  echo "$as_me:20747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20751: \$? = $ac_status" >&5
+  echo "$as_me:20753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -20760,7 +20762,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20763: result: $cf_cv_wchar_t" >&5
+echo "$as_me:20765: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -20783,14 +20785,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:20786: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:20788: checking if we must include wchar.h to declare wint_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
 if test "${cf_cv_wint_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20793 "configure"
+#line 20795 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20808,23 +20810,23 @@ wint_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20814: \$? = $ac_status" >&5
+  echo "$as_me:20816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20820: \$? = $ac_status" >&5
+  echo "$as_me:20822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20827 "configure"
+#line 20829 "configure"
 #include "confdefs.h"
 
 #include 
@@ -20843,16 +20845,16 @@ wint_t value; (void) value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20849: \$? = $ac_status" >&5
+  echo "$as_me:20851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20855: \$? = $ac_status" >&5
+  echo "$as_me:20857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
@@ -20864,7 +20866,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:20867: result: $cf_cv_wint_t" >&5
+echo "$as_me:20869: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -20888,10 +20890,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:20891: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20893: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20894 "configure"
+#line 20896 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20909,16 +20911,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20915: \$? = $ac_status" >&5
+  echo "$as_me:20917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20921: \$? = $ac_status" >&5
+  echo "$as_me:20923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20927,7 +20929,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20930: result: $cf_result" >&5
+echo "$as_me:20932: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -20949,10 +20951,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:20952: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20954: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20955 "configure"
+#line 20957 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -20970,16 +20972,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20976: \$? = $ac_status" >&5
+  echo "$as_me:20978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20982: \$? = $ac_status" >&5
+  echo "$as_me:20984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -20988,7 +20990,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20991: result: $cf_result" >&5
+echo "$as_me:20993: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21010,10 +21012,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:21013: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21015: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21016 "configure"
+#line 21018 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -21031,16 +21033,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21037: \$? = $ac_status" >&5
+  echo "$as_me:21039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21043: \$? = $ac_status" >&5
+  echo "$as_me:21045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21049,7 +21051,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21052: result: $cf_result" >&5
+echo "$as_me:21054: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
@@ -21078,11 +21080,11 @@ boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:21081: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:21083: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21085 "configure"
+#line 21087 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21115,16 +21117,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21121: \$? = $ac_status" >&5
+  echo "$as_me:21123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21127: \$? = $ac_status" >&5
+  echo "$as_me:21129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21134,7 +21136,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:21137: result: $cf_result" >&5
+echo "$as_me:21139: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
@@ -21146,14 +21148,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-	echo "$as_me:21149: checking for data $cf_data in library" >&5
+	echo "$as_me:21151: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
 	# BSD linkers insist on making weak linkage, but resolve at runtime.
 	if test "$cross_compiling" = yes; then
 
 	# cross-compiling
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21156 "configure"
+#line 21158 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21192,16 +21194,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21198: \$? = $ac_status" >&5
+  echo "$as_me:21200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21204: \$? = $ac_status" >&5
+  echo "$as_me:21206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21213,7 +21215,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21216 "configure"
+#line 21218 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -21245,15 +21247,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21251: \$? = $ac_status" >&5
+  echo "$as_me:21253: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21256: \$? = $ac_status" >&5
+  echo "$as_me:21258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 
@@ -21265,7 +21267,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-	echo "$as_me:21268: result: $cf_result" >&5
+	echo "$as_me:21270: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" = yes ; then
 
@@ -21282,7 +21284,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:21285: checking for X" >&5
+	echo "$as_me:21287: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -21386,17 +21388,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21389 "configure"
+#line 21391 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:21393: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21395: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21399: \$? = $ac_status" >&5
+  echo "$as_me:21401: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21429,7 +21431,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21432 "configure"
+#line 21434 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -21441,16 +21443,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21447: \$? = $ac_status" >&5
+  echo "$as_me:21449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21453: \$? = $ac_status" >&5
+  echo "$as_me:21455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -21488,7 +21490,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:21491: result: $have_x" >&5
+  echo "$as_me:21493: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -21498,7 +21500,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:21501: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21503: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -21525,11 +21527,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21528: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21530: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >"conftest.$ac_ext" <<_ACEOF
-#line 21532 "configure"
+#line 21534 "configure"
 #include "confdefs.h"
 
 int
@@ -21541,16 +21543,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21547: \$? = $ac_status" >&5
+  echo "$as_me:21549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21553: \$? = $ac_status" >&5
+  echo "$as_me:21555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -21560,13 +21562,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21563: result: no" >&5
+	echo "$as_me:21565: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 21569 "configure"
+#line 21571 "configure"
 #include "confdefs.h"
 
 int
@@ -21578,16 +21580,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21584: \$? = $ac_status" >&5
+  echo "$as_me:21586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21590: \$? = $ac_status" >&5
+  echo "$as_me:21592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -21597,11 +21599,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21600: result: yes" >&5
+	  echo "$as_me:21602: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21604: result: neither works" >&5
+	  echo "$as_me:21606: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21621,7 +21623,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 21624 "configure"
+#line 21626 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21630,7 +21632,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
+char XOpenDisplay (void);
 int
 main (void)
 {
@@ -21640,22 +21642,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21646: \$? = $ac_status" >&5
+  echo "$as_me:21648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21652: \$? = $ac_status" >&5
+  echo "$as_me:21654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:21658: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21660: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21663,7 +21665,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21666 "configure"
+#line 21668 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21672,7 +21674,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -21682,16 +21684,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21688: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21694: \$? = $ac_status" >&5
+  echo "$as_me:21696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21702,14 +21704,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21705: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21707: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:21712: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21714: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21717,7 +21719,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21720 "configure"
+#line 21722 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21726,7 +21728,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
+char dnet_ntoa (void);
 int
 main (void)
 {
@@ -21736,16 +21738,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21742: \$? = $ac_status" >&5
+  echo "$as_me:21744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21748: \$? = $ac_status" >&5
+  echo "$as_me:21750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21756,7 +21758,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21759: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21761: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -21775,13 +21777,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21778: checking for gethostbyname" >&5
+    echo "$as_me:21780: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21784 "configure"
+#line 21786 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21812,16 +21814,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21818: \$? = $ac_status" >&5
+  echo "$as_me:21820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21824: \$? = $ac_status" >&5
+  echo "$as_me:21826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21831,11 +21833,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21834: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21836: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:21838: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21840: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21843,7 +21845,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21846 "configure"
+#line 21848 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21852,7 +21854,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -21862,16 +21864,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21868: \$? = $ac_status" >&5
+  echo "$as_me:21870: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21874: \$? = $ac_status" >&5
+  echo "$as_me:21876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21882,14 +21884,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21885: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21887: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:21892: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21894: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21897,7 +21899,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21900 "configure"
+#line 21902 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21906,7 +21908,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
+char gethostbyname (void);
 int
 main (void)
 {
@@ -21916,16 +21918,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21922: \$? = $ac_status" >&5
+  echo "$as_me:21924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21928: \$? = $ac_status" >&5
+  echo "$as_me:21930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21936,7 +21938,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21939: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21941: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -21952,13 +21954,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21955: checking for connect" >&5
+    echo "$as_me:21957: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21961 "configure"
+#line 21963 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21989,16 +21991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21995: \$? = $ac_status" >&5
+  echo "$as_me:21997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22001: \$? = $ac_status" >&5
+  echo "$as_me:22003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -22008,11 +22010,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22011: result: $ac_cv_func_connect" >&5
+echo "$as_me:22013: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:22015: checking for connect in -lsocket" >&5
+      echo "$as_me:22017: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22020,7 +22022,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22023 "configure"
+#line 22025 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22029,7 +22031,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char connect ();
+char connect (void);
 int
 main (void)
 {
@@ -22039,16 +22041,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22045: \$? = $ac_status" >&5
+  echo "$as_me:22047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22051: \$? = $ac_status" >&5
+  echo "$as_me:22053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -22059,7 +22061,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22062: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:22064: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test "$ac_cv_lib_socket_connect" = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -22068,13 +22070,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:22071: checking for remove" >&5
+    echo "$as_me:22073: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22077 "configure"
+#line 22079 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22105,16 +22107,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22111: \$? = $ac_status" >&5
+  echo "$as_me:22113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22117: \$? = $ac_status" >&5
+  echo "$as_me:22119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -22124,11 +22126,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22127: result: $ac_cv_func_remove" >&5
+echo "$as_me:22129: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:22131: checking for remove in -lposix" >&5
+      echo "$as_me:22133: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22136,7 +22138,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22139 "configure"
+#line 22141 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22145,7 +22147,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char remove ();
+char remove (void);
 int
 main (void)
 {
@@ -22155,16 +22157,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22161: \$? = $ac_status" >&5
+  echo "$as_me:22163: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22167: \$? = $ac_status" >&5
+  echo "$as_me:22169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -22175,7 +22177,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22178: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:22180: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test "$ac_cv_lib_posix_remove" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -22184,13 +22186,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:22187: checking for shmat" >&5
+    echo "$as_me:22189: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22193 "configure"
+#line 22195 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22221,16 +22223,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22227: \$? = $ac_status" >&5
+  echo "$as_me:22229: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22233: \$? = $ac_status" >&5
+  echo "$as_me:22235: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22240,11 +22242,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22243: result: $ac_cv_func_shmat" >&5
+echo "$as_me:22245: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:22247: checking for shmat in -lipc" >&5
+      echo "$as_me:22249: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22252,7 +22254,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22255 "configure"
+#line 22257 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22261,7 +22263,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char shmat ();
+char shmat (void);
 int
 main (void)
 {
@@ -22271,16 +22273,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22277: \$? = $ac_status" >&5
+  echo "$as_me:22279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22283: \$? = $ac_status" >&5
+  echo "$as_me:22285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22291,7 +22293,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22294: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:22296: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test "$ac_cv_lib_ipc_shmat" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -22309,7 +22311,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22312: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:22314: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22317,7 +22319,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22320 "configure"
+#line 22322 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22326,7 +22328,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber ();
+char IceConnectionNumber (void);
 int
 main (void)
 {
@@ -22336,16 +22338,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22342: \$? = $ac_status" >&5
+  echo "$as_me:22344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22348: \$? = $ac_status" >&5
+  echo "$as_me:22350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22356,7 +22358,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22359: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:22361: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -22403,16 +22405,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22406: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22408: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22411: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22413: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22415: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22417: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22451,16 +22453,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22454: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22456: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:22459: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:22461: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22463: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22465: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -22499,23 +22501,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22502: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22504: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:22507: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22509: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:22511: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:22513: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:22518: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:22520: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -22532,7 +22534,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:22535: result: $enable_warnings" >&5
+echo "$as_me:22537: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -22555,10 +22557,10 @@ cat > conftest.i <&5
+	{ echo "$as_me:22560: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <
 #include "confdefs.h"
 #include "conftest.h"
@@ -22608,12 +22610,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:22611: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22614: \$? = $ac_status" >&5
+  echo "$as_me:22616: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22616: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:22618: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -22691,7 +22693,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22694 "configure"
+#line 22696 "configure"
 #include "confdefs.h"
 
 #include 
@@ -22706,26 +22708,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22712: \$? = $ac_status" >&5
+  echo "$as_me:22714: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22718: \$? = $ac_status" >&5
+  echo "$as_me:22720: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:22721: checking for X11/Xt const-feature" >&5
+echo "$as_me:22723: checking for X11/Xt const-feature" >&5
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22728 "configure"
+#line 22730 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -22743,16 +22745,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22749: \$? = $ac_status" >&5
+  echo "$as_me:22751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22755: \$? = $ac_status" >&5
+  echo "$as_me:22757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -22767,7 +22769,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:22770: result: $cf_cv_const_x_string" >&5
+echo "$as_me:22772: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -22796,7 +22798,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <&5
+	{ echo "$as_me:22817: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -22828,12 +22830,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22831: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22834: \$? = $ac_status" >&5
+  echo "$as_me:22836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22836: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22838: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -22841,7 +22843,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:22844: checking for $CC warning options..." >&5
+	{ echo "$as_me:22846: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -22864,12 +22866,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:22869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
+  echo "$as_me:22872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:22872: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:22874: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -22877,7 +22879,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22880: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22882: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22887,7 +22889,7 @@ echo "${as_me:-configure}:22880: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:22890: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22892: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -22904,7 +22906,7 @@ fi
 
 fi
 
-echo "$as_me:22907: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22909: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -22926,7 +22928,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:22929: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22931: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23040,23 +23042,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23043: checking for dmalloc.h" >&5
+	echo "$as_me:23045: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23049 "configure"
+#line 23051 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:23053: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23055: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23059: \$? = $ac_status" >&5
+  echo "$as_me:23061: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23075,11 +23077,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23078: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23080: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test "$ac_cv_header_dmalloc_h" = yes; then
 
-echo "$as_me:23082: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23084: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23087,7 +23089,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23090 "configure"
+#line 23092 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23096,7 +23098,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char dmalloc_debug ();
+char dmalloc_debug (void);
 int
 main (void)
 {
@@ -23106,16 +23108,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23112: \$? = $ac_status" >&5
+  echo "$as_me:23114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23118: \$? = $ac_status" >&5
+  echo "$as_me:23120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23126,7 +23128,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23129: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23131: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:23146: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -23163,7 +23165,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23166: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23168: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23277,23 +23279,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23280: checking for dbmalloc.h" >&5
+	echo "$as_me:23282: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23286 "configure"
+#line 23288 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:23290: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23292: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23296: \$? = $ac_status" >&5
+  echo "$as_me:23298: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23312,11 +23314,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23315: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23317: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test "$ac_cv_header_dbmalloc_h" = yes; then
 
-echo "$as_me:23319: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23321: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23324,7 +23326,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23327 "configure"
+#line 23329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23333,7 +23335,7 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char debug_malloc ();
+char debug_malloc (void);
 int
 main (void)
 {
@@ -23343,16 +23345,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23349: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23355: \$? = $ac_status" >&5
+  echo "$as_me:23357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23363,7 +23365,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23366: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23368: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:23383: checking if you want to use valgrind for testing" >&5
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.
@@ -23400,7 +23402,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:23403: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23405: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23513,7 +23515,7 @@ fi
 	;;
 esac
 
-echo "$as_me:23516: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23518: checking if you want to perform memory-leak testing" >&5
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
@@ -23524,7 +23526,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23527: result: $with_no_leaks" >&5
+echo "$as_me:23529: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23542,7 +23544,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:23545: checking for an rpath option" >&5
+	echo "$as_me:23547: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -23573,12 +23575,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:23576: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:23578: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:23581: checking if we need a space after rpath option" >&5
+		echo "$as_me:23583: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 		cf_save_LIBS="$LIBS"
 
@@ -23599,7 +23601,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23602 "configure"
+#line 23604 "configure"
 #include "confdefs.h"
 
 int
@@ -23611,16 +23613,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23617: \$? = $ac_status" >&5
+  echo "$as_me:23619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23623: \$? = $ac_status" >&5
+  echo "$as_me:23625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -23630,14 +23632,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:23633: result: $cf_rpath_space" >&5
+		echo "$as_me:23635: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:23640: checking if rpath-hack should be disabled" >&5
+echo "$as_me:23642: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -23655,22 +23657,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:23658: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:23660: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:23663: checking for updated LDFLAGS" >&5
+echo "$as_me:23665: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:23666: result: maybe" >&5
+	echo "$as_me:23668: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:23673: checking for $ac_word" >&5
+echo "$as_me:23675: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23685,7 +23687,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:23688: found $ac_dir/$ac_word" >&5
+echo "$as_me:23690: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23693,10 +23695,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:23696: result: $cf_ldd_prog" >&5
+  echo "$as_me:23698: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:23699: result: no" >&5
+  echo "$as_me:23701: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23710,7 +23712,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23713 "configure"
+#line 23715 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -23722,16 +23724,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23728: \$? = $ac_status" >&5
+  echo "$as_me:23730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23734: \$? = $ac_status" >&5
+  echo "$as_me:23736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -23759,7 +23761,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:23762: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:23764: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -23771,11 +23773,11 @@ echo "${as_me:-configure}:23762: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23776: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23778: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23780: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -23812,7 +23814,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23815: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23817: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23825,11 +23827,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23828: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23830: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23832: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23834: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -23866,7 +23868,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:23869: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:23871: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -23879,14 +23881,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:23882: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:23884: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23886: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23888: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:23889: result: no" >&5
+	echo "$as_me:23891: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23907,7 +23909,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -23976,7 +23978,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23979: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23981: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24112,7 +24114,7 @@ EOF
 cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24160: error: ambiguous option: $1
+    { { echo "$as_me:24162: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -24176,7 +24178,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24179: error: unrecognized option: $1
+  -*) { { echo "$as_me:24181: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -24195,7 +24197,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20230903, executed with
+This file was extended by $as_me 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -24226,7 +24228,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
-  *) { { echo "$as_me:24229: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24231: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24534,7 +24536,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24537: creating $ac_file" >&5
+    { echo "$as_me:24539: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24552,7 +24554,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24555: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24557: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -24565,7 +24567,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24568: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24570: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24581,7 +24583,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24584: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24586: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -24590,7 +24592,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24593: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24595: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -24635,7 +24637,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
-              { echo "$as_me:24638: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24640: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -24646,7 +24648,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:24649: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24651: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24695,7 +24697,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24698: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24700: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24706,7 +24708,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24709: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24711: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24719,7 +24721,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24722: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24724: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24777,7 +24779,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f "$tmp"/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24780: $ac_file is unchanged" >&5
+      { echo "$as_me:24782: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index bb812638..44166726 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.34 2023/06/24 15:37:17 tom Exp $
+ * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -148,11 +148,7 @@ really_define_key(WINDOW *win, const char *new_string, int code)
     }
     log_last_line(win);
 
-    if (vis_string != 0) {
-	free(vis_string);
-	vis_string = 0;
-    }
-
+    free(vis_string);
     vis_string = visible(new_string);
     if ((rc = key_defined(new_string)) > 0) {
 	wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));
-- 
2.45.0