From 3eda6f30a84d53844d2ebceadb457e2e7e9cfbf3 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 2 Apr 2017 01:27:53 +0000 Subject: [PATCH] ncurses 6.0 - patch 20170401 + minor fixes for vt100+4bsd, e.g., delay in sgr for consistency -TD + add smso for env230, to match sgr -TD + remove p7/protect from sgr in fbterm -TD + drop setf/setb from fbterm; setaf/setab are enough -TD + make xterm-pcolor sgr consistent with other capabilities -TD + add rmxx/smxx ECMA-48 strikeout extension to tmux and xterm-basic (discussion with Nicholas Marriott) + add test-programs sp_tinfo and extended_color + modify no-leaks code for lib_cur_term.c to account for the tgetent() cache. + modify setupterm() to save original tty-modes so that erasechar() works as expected. Also modify _nc_setupscreen() to avoid redundant calls to get original tty-modes. + modify set_curterm() to update ttytype[] data used by longname(). + modify wattr_set() and wattr_get() to return ERR if win-parameter is null, as documented. + improve cast used for null-pointer checks in header macros, to reduce compiler warnings. + modify several functions, using the reserved "opts" parameter to pass color- and pair-values larger than 16-bits: + getcchar(), setcchar(), slk_attr_set(), vid_puts(), wattr_get(), wattr_set(), wchgat(), wcolor_set(). + Other functions call these with the corresponding altered behavior, including chgat(), mvchgat(), mvwchgat(), slk_color_on(), slk_color_off(), vid_attr(). + add new functions for manipulating color- and pair-values larger than 16-bits. These are extended_color_content(), extended_pair_content(), extended_slk_color(), init_extended_color(), init_extended_pair(), and the corresponding sp-funcs. --- NEWS | 33 +- VERSION | 2 +- configure | 2084 +++++++++++++------------ configure.in | 28 +- dist.mk | 4 +- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_attr.3x.html | 145 +- doc/html/man/curs_bkgrnd.3x.html | 15 +- doc/html/man/curs_color.3x.html | 347 ++-- doc/html/man/curs_getcchar.3x.html | 27 +- doc/html/man/curs_printw.3x.html | 2 +- doc/html/man/curs_slk.3x.html | 100 +- doc/html/man/curs_sp_funcs.3x.html | 14 +- doc/html/man/curs_terminfo.3x.html | 391 +++-- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 917 +++++------ doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- include/curses.h.in | 154 +- include/curses.wide | 6 +- include/ncurses_defs | 6 +- man/curs_attr.3x | 98 +- man/curs_color.3x | 145 +- man/curs_getcchar.3x | 23 +- man/curs_slk.3x | 72 +- man/curs_sp_funcs.3x | 12 +- man/curs_terminfo.3x | 205 ++- man/manhtml.externs | 3 +- man/ncurses.3x | 9 +- misc/terminfo.src | 37 +- ncurses/base/lib_chgat.c | 22 +- ncurses/base/lib_color.c | 260 ++- ncurses/base/lib_colorset.c | 19 +- ncurses/base/lib_initscr.c | 10 +- ncurses/base/lib_newterm.c | 5 +- ncurses/base/lib_set_term.c | 20 +- ncurses/base/lib_slkatr_set.c | 23 +- ncurses/base/lib_slkcolor.c | 50 +- ncurses/base/new_pair.c | 16 +- ncurses/curses.priv.h | 29 +- ncurses/llib-lncurses | 77 +- ncurses/llib-lncursest | 77 +- ncurses/llib-lncursestw | 125 +- ncurses/llib-lncursesw | 125 +- ncurses/new_pair.h | 33 +- ncurses/tinfo/lib_baudrate.c | 6 +- ncurses/tinfo/lib_cur_term.c | 13 +- ncurses/tinfo/lib_data.c | 6 +- ncurses/tinfo/lib_setup.c | 14 +- ncurses/tinfo/lib_termcap.c | 29 +- ncurses/tinfo/lib_ttyflags.c | 12 +- ncurses/tinfo/tinfo_driver.c | 26 +- ncurses/tty/tty_update.c | 12 +- ncurses/widechar/lib_cchar.c | 26 +- ncurses/widechar/lib_vid_attr.c | 55 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.map | 16 +- package/ncurses.spec | 2 +- package/ncurses.sym | 10 +- package/ncursest.map | 16 +- package/ncursest.sym | 10 +- package/ncursestw.map | 16 +- package/ncursestw.sym | 10 +- package/ncursesw.map | 16 +- package/ncursesw.sym | 10 +- test/README | 162 +- test/configure | 732 ++++----- test/configure.in | 4 +- test/extended_color.c | 251 +++ test/modules | 6 +- test/programs | 4 +- test/sp_tinfo.c | 338 ++++ test/test.priv.h | 10 +- 88 files changed, 4647 insertions(+), 2983 deletions(-) create mode 100644 test/extended_color.c create mode 100644 test/sp_tinfo.c diff --git a/NEWS b/NEWS index 01b809ce..769aea14 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2782 2017/03/25 23:37:12 tom Exp $ +-- $Id: NEWS,v 1.2794 2017/04/01 20:42:24 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,37 @@ 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. +20170401 + + minor fixes for vt100+4bsd, e.g., delay in sgr for consistency -TD + + add smso for env230, to match sgr -TD + + remove p7/protect from sgr in fbterm -TD + + drop setf/setb from fbterm; setaf/setab are enough -TD + + make xterm-pcolor sgr consistent with other capabilities -TD + + add rmxx/smxx ECMA-48 strikeout extension to tmux and xterm-basic + (discussion with Nicholas Marriott) + + add test-programs sp_tinfo and extended_color + + modify no-leaks code for lib_cur_term.c to account for the tgetent() + cache. + + modify setupterm() to save original tty-modes so that erasechar() + works as expected. Also modify _nc_setupscreen() to avoid redundant + calls to get original tty-modes. + + modify set_curterm() to update ttytype[] data used by longname(). + + modify wattr_set() and wattr_get() to return ERR if win-parameter is + null, as documented. + + improve cast used for null-pointer checks in header macros, to + reduce compiler warnings. + + modify several functions, using the reserved "opts" parameter to pass + color- and pair-values larger than 16-bits: + + getcchar(), setcchar(), slk_attr_set(), vid_puts(), wattr_get(), + wattr_set(), wchgat(), wcolor_set(). + + Other functions call these with the corresponding altered behavior, + including chgat(), mvchgat(), mvwchgat(), slk_color_on(), + slk_color_off(), vid_attr(). + + add new functions for manipulating color- and pair-values larger + than 16-bits. These are extended_color_content(), + extended_pair_content(), extended_slk_color(), init_extended_color(), + init_extended_pair(), and the corresponding sp-funcs. + 20170325 + fix a memory leak in the window-list when creating multiple screens (reports by Andres Martinelli, Debian #783486). diff --git a/VERSION b/VERSION index 224a8e1f..5c501347 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20170325 +5:0:9 6.0 20170401 diff --git a/configure b/configure index a32f9dff..06f014d2 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.638 . +# From configure.in Revision: 1.640 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20150926. # @@ -12075,6 +12075,10 @@ echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 +cat >>confdefs.h <<\EOF +#define NCURSES_EXT_FUNCS 1 +EOF + cat >>confdefs.h <<\EOF #define HAVE_ASSUME_DEFAULT_COLORS 1 EOF @@ -12117,10 +12121,6 @@ EOF cat >>confdefs.h <<\EOF #define HAVE_WRESIZE 1 -EOF - -cat >>confdefs.h <<\EOF -#define NCURSES_EXT_FUNCS 1 EOF GENERATED_EXT_FUNCS=generated @@ -12147,6 +12147,10 @@ if test "x$with_sp_funcs" = xyes ; then cat >>confdefs.h <<\EOF #define NCURSES_SP_FUNCS 1 +EOF + +cat >>confdefs.h <<\EOF +#define HAVE_TPUTS_SP 1 EOF GENERATED_SP_FUNCS=generated @@ -12155,7 +12159,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:12158: checking if you want to build with terminal-driver" >&5 +echo "$as_me:12162: 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. @@ -12165,7 +12169,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:12168: result: $with_term_driver" >&5 +echo "$as_me:12172: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "x$with_term_driver" = xyes ; then @@ -12174,19 +12178,19 @@ cat >>confdefs.h <<\EOF EOF if test "x$with_termlib" != xno ; then - { { echo "$as_me:12177: error: The term-driver option conflicts with the termlib option" >&5 + { { echo "$as_me:12181: 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:12182: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:12186: 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:12189: checking for extended use of const keyword" >&5 +echo "$as_me:12193: 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. @@ -12196,7 +12200,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:12199: result: $with_ext_const" >&5 +echo "$as_me:12203: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "x$with_ext_const" = xyes ; then @@ -12204,7 +12208,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:12207: checking if you want to use extended colors" >&5 +echo "$as_me:12211: 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. @@ -12214,12 +12218,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:12217: result: $with_ext_colors" >&5 +echo "$as_me:12221: 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:12222: WARNING: This option applies only to wide-character library" >&5 + { echo "$as_me:12226: 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) @@ -12229,7 +12233,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12232: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12236: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12243,13 +12247,17 @@ EOF cat >>confdefs.h <<\EOF #define HAVE_ALLOC_PAIR 1 +EOF + +cat >>confdefs.h <<\EOF +#define HAVE_INIT_EXTENDED_COLOR 1 EOF fi fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:12252: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:12260: 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. @@ -12259,7 +12267,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:12262: result: $with_ext_mouse" >&5 +echo "$as_me:12270: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "x$with_ext_mouse" = xyes ; then @@ -12270,7 +12278,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12273: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12281: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12279,7 +12287,7 @@ fi fi ### use option --enable-ext-putwin to turn on extended screendumps -echo "$as_me:12282: checking if you want to use extended putwin/screendump" >&5 +echo "$as_me:12290: 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. @@ -12289,7 +12297,7 @@ if test "${enable_ext_putwin+set}" = set; then else with_ext_putwin=$cf_dft_ext_putwin fi; -echo "$as_me:12292: result: $with_ext_putwin" >&5 +echo "$as_me:12300: result: $with_ext_putwin" >&5 echo "${ECHO_T}$with_ext_putwin" >&6 if test "x$with_ext_putwin" = xyes ; then @@ -12299,7 +12307,7 @@ EOF fi -echo "$as_me:12302: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:12310: 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. @@ -12309,20 +12317,20 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:12312: result: $with_no_padding" >&5 +echo "$as_me:12320: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:12319: checking for ANSI C header files" >&5 +echo "$as_me:12327: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12325 "configure" +#line 12333 "configure" #include "confdefs.h" #include #include @@ -12330,13 +12338,13 @@ else #include _ACEOF -if { (eval echo "$as_me:12333: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12341: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12339: \$? = $ac_status" >&5 + echo "$as_me:12347: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12358,7 +12366,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 12361 "configure" +#line 12369 "configure" #include "confdefs.h" #include @@ -12376,7 +12384,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 12379 "configure" +#line 12387 "configure" #include "confdefs.h" #include @@ -12397,7 +12405,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 12400 "configure" +#line 12408 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -12423,15 +12431,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12426: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12434: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12429: \$? = $ac_status" >&5 + echo "$as_me:12437: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12431: \"$ac_try\"") >&5 + { (eval echo "$as_me:12439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12434: \$? = $ac_status" >&5 + echo "$as_me:12442: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12444,7 +12452,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:12447: result: $ac_cv_header_stdc" >&5 +echo "$as_me:12455: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -12460,28 +12468,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12463: checking for $ac_header" >&5 +echo "$as_me:12471: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12469 "configure" +#line 12477 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12475: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12483: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12478: \$? = $ac_status" >&5 + echo "$as_me:12486: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12481: \"$ac_try\"") >&5 + { (eval echo "$as_me:12489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12484: \$? = $ac_status" >&5 + echo "$as_me:12492: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -12491,7 +12499,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12494: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12502: result: `eval echo '${'$as_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:12512: 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 12510 "configure" +#line 12518 "configure" #include "confdefs.h" $ac_includes_default int @@ -12522,16 +12530,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12533: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12528: \$? = $ac_status" >&5 + echo "$as_me:12536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12531: \"$ac_try\"") >&5 + { (eval echo "$as_me:12539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12534: \$? = $ac_status" >&5 + echo "$as_me:12542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -12541,10 +12549,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12544: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:12552: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:12547: checking size of signed char" >&5 +echo "$as_me:12555: 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 @@ -12553,7 +12561,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 12556 "configure" +#line 12564 "configure" #include "confdefs.h" $ac_includes_default int @@ -12565,21 +12573,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12568: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12571: \$? = $ac_status" >&5 + echo "$as_me:12579: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12574: \"$ac_try\"") >&5 + { (eval echo "$as_me:12582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12577: \$? = $ac_status" >&5 + echo "$as_me:12585: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 12582 "configure" +#line 12590 "configure" #include "confdefs.h" $ac_includes_default int @@ -12591,16 +12599,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12594: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12602: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12597: \$? = $ac_status" >&5 + echo "$as_me:12605: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12600: \"$ac_try\"") >&5 + { (eval echo "$as_me:12608: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12603: \$? = $ac_status" >&5 + echo "$as_me:12611: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -12616,7 +12624,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 12619 "configure" +#line 12627 "configure" #include "confdefs.h" $ac_includes_default int @@ -12628,16 +12636,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12631: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12634: \$? = $ac_status" >&5 + echo "$as_me:12642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12637: \"$ac_try\"") >&5 + { (eval echo "$as_me:12645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12640: \$? = $ac_status" >&5 + echo "$as_me:12648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -12653,7 +12661,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 12656 "configure" +#line 12664 "configure" #include "confdefs.h" $ac_includes_default int @@ -12665,16 +12673,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12676: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12671: \$? = $ac_status" >&5 + echo "$as_me:12679: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12674: \"$ac_try\"") >&5 + { (eval echo "$as_me:12682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12677: \$? = $ac_status" >&5 + echo "$as_me:12685: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -12687,12 +12695,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:12690: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12698: 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 12695 "configure" +#line 12703 "configure" #include "confdefs.h" $ac_includes_default int @@ -12708,15 +12716,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12711: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12714: \$? = $ac_status" >&5 + echo "$as_me:12722: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12716: \"$ac_try\"") >&5 + { (eval echo "$as_me:12724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12719: \$? = $ac_status" >&5 + echo "$as_me:12727: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -12732,7 +12740,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:12735: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:12743: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:12754: checking if you want to use signed Boolean array in term.h" >&5 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -12753,12 +12761,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:12756: result: $with_signed_char" >&5 +echo "$as_me:12764: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:12761: checking if you want SIGWINCH handler" >&5 +echo "$as_me:12769: 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. @@ -12768,7 +12776,7 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:12771: result: $with_sigwinch" >&5 +echo "$as_me:12779: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF @@ -12776,7 +12784,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:12779: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:12787: 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. @@ -12786,14 +12794,14 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:12789: result: $with_tcap_names" >&5 +echo "$as_me:12797: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 ############################################################################## -echo "$as_me:12796: checking if you want to link with the pthread library" >&5 +echo "$as_me:12804: 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. @@ -12803,27 +12811,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:12806: result: $with_pthread" >&5 +echo "$as_me:12814: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:12810: checking for pthread.h" >&5 + echo "$as_me:12818: 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 12816 "configure" +#line 12824 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12820: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12828: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12826: \$? = $ac_status" >&5 + echo "$as_me:12834: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12842,7 +12850,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12845: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:12853: 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 @@ -12852,7 +12860,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:12855: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:12863: 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" @@ -12873,7 +12881,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 12876 "configure" +#line 12884 "configure" #include "confdefs.h" #include @@ -12890,16 +12898,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12893: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12901: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12896: \$? = $ac_status" >&5 + echo "$as_me:12904: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12899: \"$ac_try\"") >&5 + { (eval echo "$as_me:12907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12902: \$? = $ac_status" >&5 + echo "$as_me:12910: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -12909,7 +12917,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:12912: result: $with_pthread" >&5 + echo "$as_me:12920: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -12937,7 +12945,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:12940: error: Cannot link with pthread library" >&5 + { { echo "$as_me:12948: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -12947,13 +12955,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:12950: checking for pthread_kill" >&5 + echo "$as_me:12958: 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 12956 "configure" +#line 12964 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -12984,16 +12992,16 @@ f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12987: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12995: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12990: \$? = $ac_status" >&5 + echo "$as_me:12998: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12993: \"$ac_try\"") >&5 + { (eval echo "$as_me:13001: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12996: \$? = $ac_status" >&5 + echo "$as_me:13004: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -13003,11 +13011,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13006: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:13014: 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:13010: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:13018: 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. @@ -13017,7 +13025,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:13020: result: $use_pthreads_eintr" >&5 + echo "$as_me:13028: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -13028,7 +13036,7 @@ EOF fi fi - echo "$as_me:13031: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:13039: 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. @@ -13038,18 +13046,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:13041: result: $use_weak_symbols" >&5 + echo "$as_me:13049: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:13045: checking if $CC supports weak symbols" >&5 +echo "$as_me:13053: 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 13052 "configure" +#line 13060 "configure" #include "confdefs.h" #include @@ -13075,16 +13083,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13078: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13086: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13081: \$? = $ac_status" >&5 + echo "$as_me:13089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13084: \"$ac_try\"") >&5 + { (eval echo "$as_me:13092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13087: \$? = $ac_status" >&5 + echo "$as_me:13095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -13095,7 +13103,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13098: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:13106: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -13128,7 +13136,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:13131: checking if you want reentrant code" >&5 +echo "$as_me:13139: 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. @@ -13138,7 +13146,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:13141: result: $with_reentrant" >&5 +echo "$as_me:13149: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 @@ -13210,7 +13218,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:13213: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:13221: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -13222,7 +13230,7 @@ else NCURSES_SIZE_T=short fi -echo "$as_me:13225: checking if you want opaque curses-library structures" >&5 +echo "$as_me:13233: checking if you want opaque curses-library structures" >&5 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-curses or --disable-opaque-curses was given. @@ -13244,16 +13252,16 @@ else test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no fi; -echo "$as_me:13247: result: $enable_opaque_curses" >&5 +echo "$as_me:13255: 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:13252: error: reentrant configuration requires opaque library" >&5 +{ { echo "$as_me:13260: error: reentrant configuration requires opaque library" >&5 echo "$as_me: error: reentrant configuration requires opaque library" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:13256: checking if you want opaque form-library structures" >&5 +echo "$as_me:13264: checking if you want opaque form-library structures" >&5 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-form or --disable-opaque-form was given. @@ -13263,10 +13271,10 @@ if test "${enable_opaque_form+set}" = set; then else enable_opaque_form=no fi; -echo "$as_me:13266: result: $enable_opaque_form" >&5 +echo "$as_me:13274: result: $enable_opaque_form" >&5 echo "${ECHO_T}$enable_opaque_form" >&6 -echo "$as_me:13269: checking if you want opaque menu-library structures" >&5 +echo "$as_me:13277: checking if you want opaque menu-library structures" >&5 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-menu or --disable-opaque-menu was given. @@ -13276,10 +13284,10 @@ if test "${enable_opaque_menu+set}" = set; then else enable_opaque_menu=no fi; -echo "$as_me:13279: result: $enable_opaque_menu" >&5 +echo "$as_me:13287: result: $enable_opaque_menu" >&5 echo "${ECHO_T}$enable_opaque_menu" >&6 -echo "$as_me:13282: checking if you want opaque panel-library structures" >&5 +echo "$as_me:13290: checking if you want opaque panel-library structures" >&5 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-panel or --disable-opaque-panel was given. @@ -13289,7 +13297,7 @@ if test "${enable_opaque_panel+set}" = set; then else enable_opaque_panel=no fi; -echo "$as_me:13292: result: $enable_opaque_panel" >&5 +echo "$as_me:13300: result: $enable_opaque_panel" >&5 echo "${ECHO_T}$enable_opaque_panel" >&6 NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -13299,7 +13307,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:13302: checking for prefix used to wrap public variables" >&5 + echo "$as_me:13310: 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. @@ -13309,7 +13317,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:13312: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:13320: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -13322,7 +13330,7 @@ EOF ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:13325: checking if you want all development code" >&5 +echo "$as_me:13333: 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. @@ -13332,11 +13340,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:13335: result: $with_develop" >&5 +echo "$as_me:13343: 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:13339: checking if you want hard-tabs code" >&5 +echo "$as_me:13347: 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. @@ -13346,7 +13354,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:13349: result: $enable_hard_tabs" >&5 +echo "$as_me:13357: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -13354,7 +13362,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:13357: checking if you want limited support for xmc" >&5 +echo "$as_me:13365: 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. @@ -13364,7 +13372,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:13367: result: $enable_xmc_glitch" >&5 +echo "$as_me:13375: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -13374,7 +13382,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:13377: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:13385: 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. @@ -13384,7 +13392,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:13387: result: $with_assumed_color" >&5 +echo "$as_me:13395: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -13392,7 +13400,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:13395: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:13403: 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. @@ -13402,7 +13410,7 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:13405: result: $with_hashmap" >&5 +echo "$as_me:13413: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF @@ -13410,7 +13418,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:13413: checking if you want colorfgbg code" >&5 +echo "$as_me:13421: 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. @@ -13420,7 +13428,7 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:13423: result: $with_colorfgbg" >&5 +echo "$as_me:13431: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "x$with_colorfgbg" = xyes && cat >>confdefs.h <<\EOF @@ -13428,7 +13436,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:13431: checking if you want interop bindings" >&5 +echo "$as_me:13439: 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. @@ -13438,13 +13446,13 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=$cf_dft_interop fi; -echo "$as_me:13441: result: $with_exp_interop" >&5 +echo "$as_me:13449: 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:13447: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:13455: 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. @@ -13454,7 +13462,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:13457: result: $with_safe_sprintf" >&5 +echo "$as_me:13465: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 test "x$with_safe_sprintf" = xyes && cat >>confdefs.h <<\EOF @@ -13464,7 +13472,7 @@ EOF ### 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:13467: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:13475: 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. @@ -13474,7 +13482,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:13477: result: $with_scroll_hints" >&5 +echo "$as_me:13485: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -13483,7 +13491,7 @@ EOF fi -echo "$as_me:13486: checking if you want wgetch-events code" >&5 +echo "$as_me:13494: 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. @@ -13493,7 +13501,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:13496: result: $with_wgetch_events" >&5 +echo "$as_me:13504: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "x$with_wgetch_events" = xyes && cat >>confdefs.h <<\EOF @@ -13504,7 +13512,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:13507: checking if you want to see long compiling messages" >&5 +echo "$as_me:13515: 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. @@ -13538,7 +13546,7 @@ else ECHO_CC='' fi; -echo "$as_me:13541: result: $enableval" >&5 +echo "$as_me:13549: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -13550,7 +13558,7 @@ else fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:13553: checking if you want to see compiler warnings" >&5 +echo "$as_me:13561: checking if you want to see compiler warnings" >&5 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -13558,7 +13566,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:13561: result: $with_warnings" >&5 +echo "$as_me:13569: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -13570,12 +13578,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:13573: checking if this is really Intel C compiler" >&5 + echo "$as_me:13581: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 13578 "configure" +#line 13586 "configure" #include "confdefs.h" int @@ -13592,16 +13600,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13598: \$? = $ac_status" >&5 + echo "$as_me:13606: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13601: \"$ac_try\"") >&5 + { (eval echo "$as_me:13609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13604: \$? = $ac_status" >&5 + echo "$as_me:13612: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -13612,7 +13620,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13615: result: $INTEL_COMPILER" >&5 + echo "$as_me:13623: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -13621,12 +13629,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:13624: checking if this is really Clang C compiler" >&5 + echo "$as_me:13632: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 13629 "configure" +#line 13637 "configure" #include "confdefs.h" int @@ -13643,16 +13651,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13654: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13649: \$? = $ac_status" >&5 + echo "$as_me:13657: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13652: \"$ac_try\"") >&5 + { (eval echo "$as_me:13660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13655: \$? = $ac_status" >&5 + echo "$as_me:13663: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13663,12 +13671,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13666: result: $CLANG_COMPILER" >&5 + echo "$as_me:13674: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:13696: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -13701,12 +13709,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:13704: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13707: \$? = $ac_status" >&5 + echo "$as_me:13715: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13709: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13717: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -13715,7 +13723,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:13718: checking for $CC warning options..." >&5 + { echo "$as_me:13726: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -13739,12 +13747,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:13742: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13745: \$? = $ac_status" >&5 + echo "$as_me:13753: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13747: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13755: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -13755,7 +13763,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}:13758: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13766: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13765,7 +13773,7 @@ echo "${as_me:-configure}:13758: 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}:13768: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13776: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13785,12 +13793,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:13788: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:13796: 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 13793 "configure" +#line 13801 "configure" #include "confdefs.h" int @@ -13807,16 +13815,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13810: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13818: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13813: \$? = $ac_status" >&5 + echo "$as_me:13821: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13816: \"$ac_try\"") >&5 + { (eval echo "$as_me:13824: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13819: \$? = $ac_status" >&5 + echo "$as_me:13827: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -13827,7 +13835,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13830: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:13838: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -13836,12 +13844,12 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:13839: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:13847: checking if this is really Clang C++ compiler" >&5 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 13844 "configure" +#line 13852 "configure" #include "confdefs.h" int @@ -13858,16 +13866,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13869: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13864: \$? = $ac_status" >&5 + echo "$as_me:13872: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13867: \"$ac_try\"") >&5 + { (eval echo "$as_me:13875: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13870: \$? = $ac_status" >&5 + echo "$as_me:13878: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13878,7 +13886,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13881: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:13889: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -13890,7 +13898,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:13919: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -13925,12 +13933,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:13928: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13931: \$? = $ac_status" >&5 + echo "$as_me:13939: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13933: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13941: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -13939,7 +13947,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:13942: checking for $CXX warning options..." >&5 + { echo "$as_me:13950: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -13969,16 +13977,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:13972: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13975: \$? = $ac_status" >&5 + echo "$as_me:13983: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13977: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13985: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:13981: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13989: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -14014,10 +14022,10 @@ cat > conftest.i <&5 + { echo "$as_me:14025: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:14077: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14072: \$? = $ac_status" >&5 + echo "$as_me:14080: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:14074: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:14082: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -14130,7 +14138,7 @@ fi rm -rf conftest* fi -echo "$as_me:14133: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:14141: 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. @@ -14140,7 +14148,7 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:14143: result: $with_string_hacks" >&5 +echo "$as_me:14151: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then @@ -14149,15 +14157,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:14152: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:14160: 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:14154: checking for strlcat" >&5 + echo "$as_me:14162: 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 14160 "configure" +#line 14168 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strlcat (); below. */ @@ -14188,16 +14196,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14199: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14194: \$? = $ac_status" >&5 + echo "$as_me:14202: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14197: \"$ac_try\"") >&5 + { (eval echo "$as_me:14205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14200: \$? = $ac_status" >&5 + echo "$as_me:14208: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strlcat=yes else @@ -14207,7 +14215,7 @@ ac_cv_func_strlcat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14210: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:14218: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test $ac_cv_func_strlcat = yes; then @@ -14217,7 +14225,7 @@ EOF else - echo "$as_me:14220: checking for strlcat in -lbsd" >&5 + echo "$as_me:14228: 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 @@ -14225,7 +14233,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14228 "configure" +#line 14236 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14244,16 +14252,16 @@ strlcat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14247: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14250: \$? = $ac_status" >&5 + echo "$as_me:14258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14253: \"$ac_try\"") >&5 + { (eval echo "$as_me:14261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14256: \$? = $ac_status" >&5 + echo "$as_me:14264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -14264,7 +14272,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14267: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:14275: 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 @@ -14287,23 +14295,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:14290: checking for $ac_header" >&5 +echo "$as_me:14298: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14296 "configure" +#line 14304 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14300: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14308: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14306: \$? = $ac_status" >&5 + echo "$as_me:14314: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14322,7 +14330,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14325: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14333: result: `eval echo '${'$as_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:14354: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14352 "configure" +#line 14360 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -14380,16 +14388,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14383: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14391: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14386: \$? = $ac_status" >&5 + echo "$as_me:14394: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14389: \"$ac_try\"") >&5 + { (eval echo "$as_me:14397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14392: \$? = $ac_status" >&5 + echo "$as_me:14400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -14399,7 +14407,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14402: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14410: result: `eval echo '${'$as_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:14423: 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. @@ -14422,7 +14430,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:14425: result: $with_assertions" >&5 +echo "$as_me:14433: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -14438,7 +14446,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:14441: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:14449: 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. @@ -14455,7 +14463,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:14458: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:14466: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -14569,23 +14577,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:14572: checking for dmalloc.h" >&5 + echo "$as_me:14580: 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 14578 "configure" +#line 14586 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14582: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14590: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14588: \$? = $ac_status" >&5 + echo "$as_me:14596: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14604,11 +14612,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14607: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:14615: 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:14611: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:14619: 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 @@ -14616,7 +14624,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14619 "configure" +#line 14627 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14635,16 +14643,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14638: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14646: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14641: \$? = $ac_status" >&5 + echo "$as_me:14649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14644: \"$ac_try\"") >&5 + { (eval echo "$as_me:14652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14647: \$? = $ac_status" >&5 + echo "$as_me:14655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -14655,7 +14663,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14658: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:14666: 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:14681: 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. @@ -14687,7 +14695,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:14690: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:14698: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -14801,23 +14809,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:14804: checking for dbmalloc.h" >&5 + echo "$as_me:14812: 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 14810 "configure" +#line 14818 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14814: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14822: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14820: \$? = $ac_status" >&5 + echo "$as_me:14828: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14836,11 +14844,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14839: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:14847: 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:14843: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:14851: 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 @@ -14848,7 +14856,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14851 "configure" +#line 14859 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14867,16 +14875,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14873: \$? = $ac_status" >&5 + echo "$as_me:14881: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14876: \"$ac_try\"") >&5 + { (eval echo "$as_me:14884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14879: \$? = $ac_status" >&5 + echo "$as_me:14887: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -14887,7 +14895,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14890: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:14898: 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:14913: 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. @@ -14919,7 +14927,7 @@ EOF else with_valgrind= fi; -echo "$as_me:14922: result: ${with_valgrind:-no}" >&5 +echo "$as_me:14930: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -15032,7 +15040,7 @@ fi ;; esac -echo "$as_me:15035: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:15043: 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. @@ -15042,7 +15050,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:15045: result: $with_no_leaks" >&5 +echo "$as_me:15053: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -15094,7 +15102,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:15097: checking whether to add trace feature to all models" >&5 +echo "$as_me:15105: 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. @@ -15104,7 +15112,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:15107: result: $cf_with_trace" >&5 +echo "$as_me:15115: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -15214,7 +15222,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:15217: checking if we want to use GNAT projects" >&5 +echo "$as_me:15225: 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. @@ -15231,7 +15239,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:15234: result: $enable_gnat_projects" >&5 +echo "$as_me:15242: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -15241,13 +15249,13 @@ case $cf_cv_system_name in LIBS=" -lpsapi $LIBS" ;; (*) -echo "$as_me:15244: checking for gettimeofday" >&5 +echo "$as_me:15252: 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 15250 "configure" +#line 15258 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -15278,16 +15286,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15281: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15289: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15284: \$? = $ac_status" >&5 + echo "$as_me:15292: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15287: \"$ac_try\"") >&5 + { (eval echo "$as_me:15295: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15290: \$? = $ac_status" >&5 + echo "$as_me:15298: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -15297,7 +15305,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15300: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:15308: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then @@ -15307,7 +15315,7 @@ EOF else -echo "$as_me:15310: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:15318: 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 @@ -15315,7 +15323,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15318 "configure" +#line 15326 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15334,16 +15342,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15337: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15340: \$? = $ac_status" >&5 + echo "$as_me:15348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15343: \"$ac_try\"") >&5 + { (eval echo "$as_me:15351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15346: \$? = $ac_status" >&5 + echo "$as_me:15354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -15354,7 +15362,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15357: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:15365: 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 @@ -15384,14 +15392,14 @@ fi ;; esac -echo "$as_me:15387: checking if -lm needed for math functions" >&5 +echo "$as_me:15395: 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 15394 "configure" +#line 15402 "configure" #include "confdefs.h" #include @@ -15407,16 +15415,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:15410: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15418: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15413: \$? = $ac_status" >&5 + echo "$as_me:15421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15416: \"$ac_try\"") >&5 + { (eval echo "$as_me:15424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15419: \$? = $ac_status" >&5 + echo "$as_me:15427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -15426,7 +15434,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15429: result: $cf_cv_need_libm" >&5 +echo "$as_me:15437: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -15434,13 +15442,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:15437: checking for ANSI C header files" >&5 +echo "$as_me:15445: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15443 "configure" +#line 15451 "configure" #include "confdefs.h" #include #include @@ -15448,13 +15456,13 @@ else #include _ACEOF -if { (eval echo "$as_me:15451: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15459: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15457: \$? = $ac_status" >&5 + echo "$as_me:15465: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15476,7 +15484,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 15479 "configure" +#line 15487 "configure" #include "confdefs.h" #include @@ -15494,7 +15502,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 15497 "configure" +#line 15505 "configure" #include "confdefs.h" #include @@ -15515,7 +15523,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 15518 "configure" +#line 15526 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -15541,15 +15549,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15552: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15547: \$? = $ac_status" >&5 + echo "$as_me:15555: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15549: \"$ac_try\"") >&5 + { (eval echo "$as_me:15557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15552: \$? = $ac_status" >&5 + echo "$as_me:15560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15562,7 +15570,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:15565: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15573: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -15575,13 +15583,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:15578: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:15586: 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 15584 "configure" +#line 15592 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -15596,16 +15604,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15599: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15607: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15602: \$? = $ac_status" >&5 + echo "$as_me:15610: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15605: \"$ac_try\"") >&5 + { (eval echo "$as_me:15613: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15608: \$? = $ac_status" >&5 + echo "$as_me:15616: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -15615,7 +15623,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15618: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15626: result: `eval echo '${'$as_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:15639: 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 @@ -15636,7 +15644,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15639 "configure" +#line 15647 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15655,16 +15663,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15658: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15666: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15661: \$? = $ac_status" >&5 + echo "$as_me:15669: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15664: \"$ac_try\"") >&5 + { (eval echo "$as_me:15672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15667: \$? = $ac_status" >&5 + echo "$as_me:15675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -15675,14 +15683,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15678: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:15686: 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:15685: checking for opendir in -lx" >&5 + echo "$as_me:15693: 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 @@ -15690,7 +15698,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15693 "configure" +#line 15701 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15709,16 +15717,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15712: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15720: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15715: \$? = $ac_status" >&5 + echo "$as_me:15723: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15718: \"$ac_try\"") >&5 + { (eval echo "$as_me:15726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15721: \$? = $ac_status" >&5 + echo "$as_me:15729: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -15729,7 +15737,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15732: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:15740: 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" @@ -15737,13 +15745,13 @@ fi fi -echo "$as_me:15740: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:15748: 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 15746 "configure" +#line 15754 "configure" #include "confdefs.h" #include #include @@ -15759,16 +15767,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15762: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15770: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15765: \$? = $ac_status" >&5 + echo "$as_me:15773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15768: \"$ac_try\"") >&5 + { (eval echo "$as_me:15776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15771: \$? = $ac_status" >&5 + echo "$as_me:15779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -15778,7 +15786,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15781: result: $ac_cv_header_time" >&5 +echo "$as_me:15789: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -15797,13 +15805,13 @@ case $host_os in ;; esac -echo "$as_me:15800: checking for regcomp" >&5 +echo "$as_me:15808: 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 15806 "configure" +#line 15814 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -15834,16 +15842,16 @@ f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15837: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15845: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15840: \$? = $ac_status" >&5 + echo "$as_me:15848: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15843: \"$ac_try\"") >&5 + { (eval echo "$as_me:15851: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15846: \$? = $ac_status" >&5 + echo "$as_me:15854: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -15853,7 +15861,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15856: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:15864: 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 @@ -15862,7 +15870,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:15865: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:15873: 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 @@ -15870,7 +15878,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15873 "configure" +#line 15881 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15889,16 +15897,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15892: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15900: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15895: \$? = $ac_status" >&5 + echo "$as_me:15903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15898: \"$ac_try\"") >&5 + { (eval echo "$as_me:15906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15901: \$? = $ac_status" >&5 + echo "$as_me:15909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -15909,7 +15917,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15912: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:15920: 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 @@ -15938,13 +15946,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:15941: checking for compile" >&5 + echo "$as_me:15949: 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 15947 "configure" +#line 15955 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -15975,16 +15983,16 @@ f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15978: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15986: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15981: \$? = $ac_status" >&5 + echo "$as_me:15989: \$? = $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:15992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15987: \$? = $ac_status" >&5 + echo "$as_me:15995: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -15994,13 +16002,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15997: result: $ac_cv_func_compile" >&5 +echo "$as_me:16005: 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:16003: checking for compile in -lgen" >&5 + echo "$as_me:16011: 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 @@ -16008,7 +16016,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16011 "configure" +#line 16019 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16027,16 +16035,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16030: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16038: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16033: \$? = $ac_status" >&5 + echo "$as_me:16041: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16036: \"$ac_try\"") >&5 + { (eval echo "$as_me:16044: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16039: \$? = $ac_status" >&5 + echo "$as_me:16047: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -16047,7 +16055,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16050: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:16058: 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 @@ -16075,11 +16083,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:16078: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:16086: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:16082: checking for regular-expression headers" >&5 +echo "$as_me:16090: 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 @@ -16091,7 +16099,7 @@ case $cf_regex_func in for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 16094 "configure" +#line 16102 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -16106,16 +16114,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16109: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16117: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16112: \$? = $ac_status" >&5 + echo "$as_me:16120: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16115: \"$ac_try\"") >&5 + { (eval echo "$as_me:16123: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16118: \$? = $ac_status" >&5 + echo "$as_me:16126: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16132,7 +16140,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 16135 "configure" +#line 16143 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -16150,16 +16158,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16153: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16161: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16156: \$? = $ac_status" >&5 + echo "$as_me:16164: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16159: \"$ac_try\"") >&5 + { (eval echo "$as_me:16167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16162: \$? = $ac_status" >&5 + echo "$as_me:16170: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16175,11 +16183,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:16178: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:16186: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in - (no) { echo "$as_me:16182: WARNING: no regular expression header found" >&5 + (no) { echo "$as_me:16190: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; (regex.h) cat >>confdefs.h <<\EOF @@ -16218,23 +16226,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16221: checking for $ac_header" >&5 +echo "$as_me:16229: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16227 "configure" +#line 16235 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16231: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16239: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16237: \$? = $ac_status" >&5 + echo "$as_me:16245: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16253,7 +16261,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16256: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16264: result: `eval echo '${'$as_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:16277: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16275 "configure" +#line 16283 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16279: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16287: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16285: \$? = $ac_status" >&5 + echo "$as_me:16293: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16301,7 +16309,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16304: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16312: result: `eval echo '${'$as_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:16322: 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 @@ -16321,7 +16329,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 16324 "configure" +#line 16332 "configure" #include "confdefs.h" #include <$cf_header> @@ -16334,16 +16342,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16337: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16345: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16340: \$? = $ac_status" >&5 + echo "$as_me:16348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16343: \"$ac_try\"") >&5 + { (eval echo "$as_me:16351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16346: \$? = $ac_status" >&5 + echo "$as_me:16354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -16355,7 +16363,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16358: result: $cf_cv_getopt_header" >&5 +echo "$as_me:16366: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -16376,7 +16384,7 @@ fi # Note: even non-Posix ISC needs to declare fd_set if test "x$ISC" = xyes ; then -echo "$as_me:16379: checking for main in -lcposix" >&5 +echo "$as_me:16387: checking for main in -lcposix" >&5 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16384,7 +16392,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16387 "configure" +#line 16395 "configure" #include "confdefs.h" int @@ -16396,16 +16404,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16399: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16407: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16402: \$? = $ac_status" >&5 + echo "$as_me:16410: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16405: \"$ac_try\"") >&5 + { (eval echo "$as_me:16413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16408: \$? = $ac_status" >&5 + echo "$as_me:16416: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -16416,7 +16424,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16419: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:16427: result: $ac_cv_lib_cposix_main" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 if test $ac_cv_lib_cposix_main = yes; then cat >>confdefs.h <&5 + echo "$as_me:16438: checking for bzero in -linet" >&5 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_bzero+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16435,7 +16443,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16438 "configure" +#line 16446 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16454,16 +16462,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16457: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16465: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16460: \$? = $ac_status" >&5 + echo "$as_me:16468: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16463: \"$ac_try\"") >&5 + { (eval echo "$as_me:16471: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16466: \$? = $ac_status" >&5 + echo "$as_me:16474: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -16474,7 +16482,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16477: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:16485: result: $ac_cv_lib_inet_bzero" >&5 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 if test $ac_cv_lib_inet_bzero = yes; then @@ -16497,14 +16505,14 @@ LIBS="$cf_add_libs" fi fi -echo "$as_me:16500: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:16508: 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 16507 "configure" +#line 16515 "configure" #include "confdefs.h" #include @@ -16524,16 +16532,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16527: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16535: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16530: \$? = $ac_status" >&5 + echo "$as_me:16538: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16533: \"$ac_try\"") >&5 + { (eval echo "$as_me:16541: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16536: \$? = $ac_status" >&5 + echo "$as_me:16544: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -16545,7 +16553,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16548: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:16556: 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 @@ -16560,13 +16568,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:16563: checking for an ANSI C-conforming const" >&5 +echo "$as_me:16571: 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 16569 "configure" +#line 16577 "configure" #include "confdefs.h" int @@ -16624,16 +16632,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16627: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16635: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16630: \$? = $ac_status" >&5 + echo "$as_me:16638: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16633: \"$ac_try\"") >&5 + { (eval echo "$as_me:16641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16636: \$? = $ac_status" >&5 + echo "$as_me:16644: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -16643,7 +16651,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16646: result: $ac_cv_c_const" >&5 +echo "$as_me:16654: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -16653,7 +16661,7 @@ EOF fi -echo "$as_me:16656: checking for inline" >&5 +echo "$as_me:16664: 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 @@ -16661,7 +16669,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 16664 "configure" +#line 16672 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -16670,16 +16678,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16673: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16681: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16676: \$? = $ac_status" >&5 + echo "$as_me:16684: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16679: \"$ac_try\"") >&5 + { (eval echo "$as_me:16687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16682: \$? = $ac_status" >&5 + echo "$as_me:16690: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -16690,7 +16698,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16693: result: $ac_cv_c_inline" >&5 +echo "$as_me:16701: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -16716,7 +16724,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:16719: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:16727: 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 @@ -16725,7 +16733,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 16728 "configure" +#line 16736 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -16737,16 +16745,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16740: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16748: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16743: \$? = $ac_status" >&5 + echo "$as_me:16751: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16746: \"$ac_try\"") >&5 + { (eval echo "$as_me:16754: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16749: \$? = $ac_status" >&5 + echo "$as_me:16757: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -16758,7 +16766,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:16761: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:16769: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -16864,7 +16872,7 @@ fi fi fi -echo "$as_me:16867: checking for signal global datatype" >&5 +echo "$as_me:16875: 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 @@ -16876,7 +16884,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 16879 "configure" +#line 16887 "configure" #include "confdefs.h" #include @@ -16899,16 +16907,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16902: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16910: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16905: \$? = $ac_status" >&5 + echo "$as_me:16913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16908: \"$ac_try\"") >&5 + { (eval echo "$as_me:16916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16911: \$? = $ac_status" >&5 + echo "$as_me:16919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -16922,7 +16930,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16925: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:16933: 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:16942: 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 @@ -16941,7 +16949,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 16944 "configure" +#line 16952 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -16976,15 +16984,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16979: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16982: \$? = $ac_status" >&5 + echo "$as_me:16990: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16984: \"$ac_try\"") >&5 + { (eval echo "$as_me:16992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16987: \$? = $ac_status" >&5 + echo "$as_me:16995: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -16999,7 +17007,7 @@ fi fi -echo "$as_me:17002: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:17010: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:17022: 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 17021 "configure" +#line 17029 "configure" #include "confdefs.h" int @@ -17030,16 +17038,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17033: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17041: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17036: \$? = $ac_status" >&5 + echo "$as_me:17044: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17039: \"$ac_try\"") >&5 + { (eval echo "$as_me:17047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17042: \$? = $ac_status" >&5 + echo "$as_me:17050: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -17051,7 +17059,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17054: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:17062: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -17067,14 +17075,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:17070: checking if external errno is declared" >&5 +echo "$as_me:17078: 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 17077 "configure" +#line 17085 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -17092,16 +17100,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17103: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17098: \$? = $ac_status" >&5 + echo "$as_me:17106: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17101: \"$ac_try\"") >&5 + { (eval echo "$as_me:17109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17104: \$? = $ac_status" >&5 + echo "$as_me:17112: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -17112,7 +17120,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17115: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:17123: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -17127,14 +17135,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:17130: checking if external errno exists" >&5 +echo "$as_me:17138: 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 17137 "configure" +#line 17145 "configure" #include "confdefs.h" #undef errno @@ -17149,16 +17157,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17152: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17160: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17155: \$? = $ac_status" >&5 + echo "$as_me:17163: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17158: \"$ac_try\"") >&5 + { (eval echo "$as_me:17166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17161: \$? = $ac_status" >&5 + echo "$as_me:17169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -17169,7 +17177,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17172: result: $cf_cv_have_errno" >&5 +echo "$as_me:17180: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -17182,7 +17190,7 @@ EOF fi -echo "$as_me:17185: checking if data-only library module links" >&5 +echo "$as_me:17193: 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 @@ -17190,20 +17198,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17204: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17199: \$? = $ac_status" >&5 + echo "$as_me:17207: \$? = $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:17227: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17222: \$? = $ac_status" >&5 + echo "$as_me:17230: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -17232,7 +17240,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17235 "configure" +#line 17243 "configure" #include "confdefs.h" int main(void) @@ -17243,15 +17251,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17254: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17249: \$? = $ac_status" >&5 + echo "$as_me:17257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17251: \"$ac_try\"") >&5 + { (eval echo "$as_me:17259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17254: \$? = $ac_status" >&5 + echo "$as_me:17262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -17266,7 +17274,7 @@ fi fi -echo "$as_me:17269: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17277: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17305,13 +17313,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17308: checking for $ac_func" >&5 +echo "$as_me:17316: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17314 "configure" +#line 17322 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17342,16 +17350,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17345: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17353: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17348: \$? = $ac_status" >&5 + echo "$as_me:17356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17351: \"$ac_try\"") >&5 + { (eval echo "$as_me:17359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17354: \$? = $ac_status" >&5 + echo "$as_me:17362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17361,7 +17369,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17364: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17372: result: `eval echo '${'$as_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:17384: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:17383: checking for terminal-capability database functions" >&5 +echo "$as_me:17391: 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 17390 "configure" +#line 17398 "configure" #include "confdefs.h" #include @@ -17407,16 +17415,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17410: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17418: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17413: \$? = $ac_status" >&5 + echo "$as_me:17421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17416: \"$ac_try\"") >&5 + { (eval echo "$as_me:17424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17419: \$? = $ac_status" >&5 + echo "$as_me:17427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -17427,7 +17435,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17430: result: $cf_cv_cgetent" >&5 +echo "$as_me:17438: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -17437,14 +17445,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:17440: checking if cgetent uses const parameter" >&5 +echo "$as_me:17448: 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 17447 "configure" +#line 17455 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -17467,16 +17475,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17470: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17478: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17473: \$? = $ac_status" >&5 + echo "$as_me:17481: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17476: \"$ac_try\"") >&5 + { (eval echo "$as_me:17484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17479: \$? = $ac_status" >&5 + echo "$as_me:17487: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -17487,7 +17495,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17490: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:17498: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -17501,14 +17509,14 @@ fi fi -echo "$as_me:17504: checking for isascii" >&5 +echo "$as_me:17512: 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 17511 "configure" +#line 17519 "configure" #include "confdefs.h" #include int @@ -17520,16 +17528,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17523: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17526: \$? = $ac_status" >&5 + echo "$as_me:17534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17529: \"$ac_try\"") >&5 + { (eval echo "$as_me:17537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17532: \$? = $ac_status" >&5 + echo "$as_me:17540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -17540,7 +17548,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17543: result: $cf_cv_have_isascii" >&5 +echo "$as_me:17551: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -17548,10 +17556,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:17551: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:17559: 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 17554 "configure" +#line 17562 "configure" #include "confdefs.h" #include @@ -17565,16 +17573,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17576: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17571: \$? = $ac_status" >&5 + echo "$as_me:17579: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17574: \"$ac_try\"") >&5 + { (eval echo "$as_me:17582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17577: \$? = $ac_status" >&5 + echo "$as_me:17585: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -17582,7 +17590,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17585 "configure" +#line 17593 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -17597,16 +17605,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17608: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17603: \$? = $ac_status" >&5 + echo "$as_me:17611: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17606: \"$ac_try\"") >&5 + { (eval echo "$as_me:17614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17609: \$? = $ac_status" >&5 + echo "$as_me:17617: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -17622,11 +17630,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17625: result: $sigact_bad" >&5 +echo "$as_me:17633: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:17629: checking if nanosleep really works" >&5 +echo "$as_me:17637: 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 @@ -17636,7 +17644,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17639 "configure" +#line 17647 "configure" #include "confdefs.h" #include @@ -17661,15 +17669,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17664: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17672: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17667: \$? = $ac_status" >&5 + echo "$as_me:17675: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17669: \"$ac_try\"") >&5 + { (eval echo "$as_me:17677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17672: \$? = $ac_status" >&5 + echo "$as_me:17680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -17681,7 +17689,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17684: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:17692: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -17696,23 +17704,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17699: checking for $ac_header" >&5 +echo "$as_me:17707: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17705 "configure" +#line 17713 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17709: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17717: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17715: \$? = $ac_status" >&5 + echo "$as_me:17723: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17731,7 +17739,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17734: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17742: result: `eval echo '${'$as_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:17757: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17755 "configure" +#line 17763 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17759: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17767: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17765: \$? = $ac_status" >&5 + echo "$as_me:17773: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17781,7 +17789,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17784: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17792: result: `eval echo '${'$as_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:17810: 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 17805 "configure" +#line 17813 "configure" #include "confdefs.h" #include int @@ -17814,16 +17822,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17825: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17820: \$? = $ac_status" >&5 + echo "$as_me:17828: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17823: \"$ac_try\"") >&5 + { (eval echo "$as_me:17831: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17826: \$? = $ac_status" >&5 + echo "$as_me:17834: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -17831,7 +17839,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17834 "configure" +#line 17842 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -17845,16 +17853,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17848: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17856: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17851: \$? = $ac_status" >&5 + echo "$as_me:17859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17854: \"$ac_try\"") >&5 + { (eval echo "$as_me:17862: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17857: \$? = $ac_status" >&5 + echo "$as_me:17865: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -17870,19 +17878,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:17873: result: $termios_bad" >&5 + echo "$as_me:17881: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:17878: checking for tcgetattr" >&5 +echo "$as_me:17886: 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 17885 "configure" +#line 17893 "configure" #include "confdefs.h" #include @@ -17910,16 +17918,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17913: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17921: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17916: \$? = $ac_status" >&5 + echo "$as_me:17924: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17919: \"$ac_try\"") >&5 + { (eval echo "$as_me:17927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17922: \$? = $ac_status" >&5 + echo "$as_me:17930: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -17929,21 +17937,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17932: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:17940: 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:17939: checking for vsscanf function or workaround" >&5 +echo "$as_me:17947: 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 17946 "configure" +#line 17954 "configure" #include "confdefs.h" #include @@ -17959,16 +17967,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17962: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17970: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17965: \$? = $ac_status" >&5 + echo "$as_me:17973: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17968: \"$ac_try\"") >&5 + { (eval echo "$as_me:17976: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17971: \$? = $ac_status" >&5 + echo "$as_me:17979: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -17976,7 +17984,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17979 "configure" +#line 17987 "configure" #include "confdefs.h" #include @@ -17998,16 +18006,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18009: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18004: \$? = $ac_status" >&5 + echo "$as_me:18012: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18007: \"$ac_try\"") >&5 + { (eval echo "$as_me:18015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18010: \$? = $ac_status" >&5 + echo "$as_me:18018: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -18015,7 +18023,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18018 "configure" +#line 18026 "configure" #include "confdefs.h" #include @@ -18037,16 +18045,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18040: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18048: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18043: \$? = $ac_status" >&5 + echo "$as_me:18051: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18046: \"$ac_try\"") >&5 + { (eval echo "$as_me:18054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18049: \$? = $ac_status" >&5 + echo "$as_me:18057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -18061,7 +18069,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:18064: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:18072: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in @@ -18087,23 +18095,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18090: checking for $ac_header" >&5 +echo "$as_me:18098: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18096 "configure" +#line 18104 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18100: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18108: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18106: \$? = $ac_status" >&5 + echo "$as_me:18114: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18122,7 +18130,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18125: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18133: result: `eval echo '${'$as_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:18143: 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 @@ -18143,7 +18151,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 18146 "configure" +#line 18154 "configure" #include "confdefs.h" #include @@ -18184,15 +18192,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18187: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18195: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18190: \$? = $ac_status" >&5 + echo "$as_me:18198: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18192: \"$ac_try\"") >&5 + { (eval echo "$as_me:18200: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18195: \$? = $ac_status" >&5 + echo "$as_me:18203: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -18207,16 +18215,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18210: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:18218: 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:18213: checking for mkstemp" >&5 + echo "$as_me:18221: 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 18219 "configure" +#line 18227 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -18247,16 +18255,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18250: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18253: \$? = $ac_status" >&5 + echo "$as_me:18261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18256: \"$ac_try\"") >&5 + { (eval echo "$as_me:18264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18259: \$? = $ac_status" >&5 + echo "$as_me:18267: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -18266,7 +18274,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18269: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:18277: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -18287,21 +18295,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:18290: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:18298: 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:18293: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:18301: 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:18299: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18307: 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 18304 "configure" +#line 18312 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -18318,15 +18326,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18321: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18329: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18324: \$? = $ac_status" >&5 + echo "$as_me:18332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18326: \"$ac_try\"") >&5 + { (eval echo "$as_me:18334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18329: \$? = $ac_status" >&5 + echo "$as_me:18337: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -18339,7 +18347,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:18342: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:18350: 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 @@ -18350,13 +18358,13 @@ EOF fi fi -echo "$as_me:18353: checking for intptr_t" >&5 +echo "$as_me:18361: 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 18359 "configure" +#line 18367 "configure" #include "confdefs.h" $ac_includes_default int @@ -18371,16 +18379,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18382: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18377: \$? = $ac_status" >&5 + echo "$as_me:18385: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18380: \"$ac_try\"") >&5 + { (eval echo "$as_me:18388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18383: \$? = $ac_status" >&5 + echo "$as_me:18391: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -18390,7 +18398,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18393: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:18401: 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 : @@ -18402,13 +18410,13 @@ EOF fi -echo "$as_me:18405: checking for ssize_t" >&5 +echo "$as_me:18413: 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 18411 "configure" +#line 18419 "configure" #include "confdefs.h" $ac_includes_default int @@ -18423,16 +18431,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18426: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18434: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18429: \$? = $ac_status" >&5 + echo "$as_me:18437: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18432: \"$ac_try\"") >&5 + { (eval echo "$as_me:18440: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18435: \$? = $ac_status" >&5 + echo "$as_me:18443: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ssize_t=yes else @@ -18442,7 +18450,7 @@ ac_cv_type_ssize_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18445: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:18453: 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 : @@ -18454,14 +18462,14 @@ EOF fi -echo "$as_me:18457: checking for type sigaction_t" >&5 +echo "$as_me:18465: 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 18464 "configure" +#line 18472 "configure" #include "confdefs.h" #include @@ -18474,16 +18482,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18477: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18485: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18480: \$? = $ac_status" >&5 + echo "$as_me:18488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18483: \"$ac_try\"") >&5 + { (eval echo "$as_me:18491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18486: \$? = $ac_status" >&5 + echo "$as_me:18494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -18494,14 +18502,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18497: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:18505: 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:18504: checking declaration of size-change" >&5 +echo "$as_me:18512: 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 @@ -18516,7 +18524,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 18519 "configure" +#line 18527 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -18560,16 +18568,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18563: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18571: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18566: \$? = $ac_status" >&5 + echo "$as_me:18574: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18569: \"$ac_try\"") >&5 + { (eval echo "$as_me:18577: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18572: \$? = $ac_status" >&5 + echo "$as_me:18580: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -18588,7 +18596,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:18591: result: $cf_cv_sizechange" >&5 +echo "$as_me:18599: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -18606,13 +18614,13 @@ EOF esac fi -echo "$as_me:18609: checking for memmove" >&5 +echo "$as_me:18617: 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 18615 "configure" +#line 18623 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -18643,16 +18651,16 @@ f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18646: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18654: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18649: \$? = $ac_status" >&5 + echo "$as_me:18657: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18652: \"$ac_try\"") >&5 + { (eval echo "$as_me:18660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18655: \$? = $ac_status" >&5 + echo "$as_me:18663: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -18662,19 +18670,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18665: result: $ac_cv_func_memmove" >&5 +echo "$as_me:18673: 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:18671: checking for bcopy" >&5 +echo "$as_me:18679: 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 18677 "configure" +#line 18685 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -18705,16 +18713,16 @@ f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18708: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18711: \$? = $ac_status" >&5 + echo "$as_me:18719: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18714: \"$ac_try\"") >&5 + { (eval echo "$as_me:18722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18717: \$? = $ac_status" >&5 + echo "$as_me:18725: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -18724,11 +18732,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18727: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:18735: 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:18731: checking if bcopy does overlapping moves" >&5 + echo "$as_me:18739: 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 @@ -18738,7 +18746,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18741 "configure" +#line 18749 "configure" #include "confdefs.h" int main(void) { @@ -18752,15 +18760,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18755: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18763: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18758: \$? = $ac_status" >&5 + echo "$as_me:18766: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18760: \"$ac_try\"") >&5 + { (eval echo "$as_me:18768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18763: \$? = $ac_status" >&5 + echo "$as_me:18771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -18773,7 +18781,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18776: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:18784: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -18800,13 +18808,13 @@ tty 2>&1 >/dev/null || { for ac_func in posix_openpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18803: checking for $ac_func" >&5 +echo "$as_me:18811: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18809 "configure" +#line 18817 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -18837,16 +18845,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18840: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18848: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18843: \$? = $ac_status" >&5 + echo "$as_me:18851: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18846: \"$ac_try\"") >&5 + { (eval echo "$as_me:18854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18849: \$? = $ac_status" >&5 + echo "$as_me:18857: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -18856,7 +18864,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18859: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:18867: result: `eval echo '${'$as_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:18877: 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 @@ -18876,7 +18884,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18879 "configure" +#line 18887 "configure" #include "confdefs.h" #include @@ -18928,15 +18936,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18931: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18939: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18934: \$? = $ac_status" >&5 + echo "$as_me:18942: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18936: \"$ac_try\"") >&5 + { (eval echo "$as_me:18944: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18939: \$? = $ac_status" >&5 + echo "$as_me:18947: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -18948,21 +18956,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18951: result: $cf_cv_working_poll" >&5 +echo "$as_me:18959: 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:18958: checking for va_copy" >&5 +echo "$as_me:18966: 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 18965 "configure" +#line 18973 "configure" #include "confdefs.h" #include @@ -18979,16 +18987,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18982: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18990: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18985: \$? = $ac_status" >&5 + echo "$as_me:18993: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18988: \"$ac_try\"") >&5 + { (eval echo "$as_me:18996: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18991: \$? = $ac_status" >&5 + echo "$as_me:18999: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -18998,7 +19006,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19001: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:19009: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && @@ -19006,14 +19014,14 @@ cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:19009: checking for __va_copy" >&5 +echo "$as_me:19017: 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 19016 "configure" +#line 19024 "configure" #include "confdefs.h" #include @@ -19030,16 +19038,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19033: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19041: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19036: \$? = $ac_status" >&5 + echo "$as_me:19044: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19039: \"$ac_try\"") >&5 + { (eval echo "$as_me:19047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19042: \$? = $ac_status" >&5 + echo "$as_me:19050: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -19049,7 +19057,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19052: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:19060: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && @@ -19057,13 +19065,13 @@ cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:19060: checking for pid_t" >&5 +echo "$as_me:19068: 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 19066 "configure" +#line 19074 "configure" #include "confdefs.h" $ac_includes_default int @@ -19078,16 +19086,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19081: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19089: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19084: \$? = $ac_status" >&5 + echo "$as_me:19092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19087: \"$ac_try\"") >&5 + { (eval echo "$as_me:19095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19090: \$? = $ac_status" >&5 + echo "$as_me:19098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -19097,7 +19105,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19100: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:19108: 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 : @@ -19112,23 +19120,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:19115: checking for $ac_header" >&5 +echo "$as_me:19123: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19121 "configure" +#line 19129 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19125: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19133: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:19131: \$? = $ac_status" >&5 + echo "$as_me:19139: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19147,7 +19155,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19150: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19158: result: `eval echo '${'$as_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:19171: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19169 "configure" +#line 19177 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -19197,16 +19205,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19200: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19208: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19203: \$? = $ac_status" >&5 + echo "$as_me:19211: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19206: \"$ac_try\"") >&5 + { (eval echo "$as_me:19214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19209: \$? = $ac_status" >&5 + echo "$as_me:19217: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -19216,7 +19224,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19219: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:19227: result: `eval echo '${'$as_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:19239: 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 @@ -19251,15 +19259,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19254: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19262: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19257: \$? = $ac_status" >&5 + echo "$as_me:19265: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19259: \"$ac_try\"") >&5 + { (eval echo "$as_me:19267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19262: \$? = $ac_status" >&5 + echo "$as_me:19270: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -19271,7 +19279,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19274: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:19282: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -19285,12 +19293,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:19288: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19296: 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:19293: checking for working vfork" >&5 + echo "$as_me:19301: 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 @@ -19299,7 +19307,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 19302 "configure" +#line 19310 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -19396,15 +19404,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19399: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19407: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19402: \$? = $ac_status" >&5 + echo "$as_me:19410: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19404: \"$ac_try\"") >&5 + { (eval echo "$as_me:19412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19407: \$? = $ac_status" >&5 + echo "$as_me:19415: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -19416,13 +19424,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19419: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:19427: 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:19425: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19433: 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 @@ -19449,7 +19457,7 @@ fi # special check for test/ditto.c -echo "$as_me:19452: checking for openpty in -lutil" >&5 +echo "$as_me:19460: 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 @@ -19457,7 +19465,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19460 "configure" +#line 19468 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19476,16 +19484,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19479: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19487: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19482: \$? = $ac_status" >&5 + echo "$as_me:19490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19485: \"$ac_try\"") >&5 + { (eval echo "$as_me:19493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19488: \$? = $ac_status" >&5 + echo "$as_me:19496: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -19496,7 +19504,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19499: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19507: 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 @@ -19504,7 +19512,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19507: checking for openpty header" >&5 +echo "$as_me:19515: 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 @@ -19531,7 +19539,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 19534 "configure" +#line 19542 "configure" #include "confdefs.h" #include <$cf_header> @@ -19548,16 +19556,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19551: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19554: \$? = $ac_status" >&5 + echo "$as_me:19562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19557: \"$ac_try\"") >&5 + { (eval echo "$as_me:19565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19560: \$? = $ac_status" >&5 + echo "$as_me:19568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -19575,7 +19583,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:19578: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19586: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19645,7 +19653,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 19648 "configure" +#line 19656 "configure" #include "confdefs.h" #include int @@ -19657,16 +19665,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19668: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19663: \$? = $ac_status" >&5 + echo "$as_me:19671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19666: \"$ac_try\"") >&5 + { (eval echo "$as_me:19674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19669: \$? = $ac_status" >&5 + echo "$as_me:19677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -19683,7 +19691,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}:19686: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19694: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19719,7 +19727,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}:19722: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19730: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19730,7 +19738,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:19733: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:19741: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -19799,7 +19807,7 @@ if test -n "$cf_item" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 19802 "configure" +#line 19810 "configure" #include "confdefs.h" #include int @@ -19811,16 +19819,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19814: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19822: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19817: \$? = $ac_status" >&5 + echo "$as_me:19825: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19820: \"$ac_try\"") >&5 + { (eval echo "$as_me:19828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19823: \$? = $ac_status" >&5 + echo "$as_me:19831: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -19837,7 +19845,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}:19840: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19848: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19917,7 +19925,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}:19920: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19928: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19934,23 +19942,23 @@ fi fi esac -echo "$as_me:19937: checking for db.h" >&5 +echo "$as_me:19945: 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 19943 "configure" +#line 19951 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:19947: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19955: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:19953: \$? = $ac_status" >&5 + echo "$as_me:19961: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19969,11 +19977,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19972: result: $ac_cv_header_db_h" >&5 +echo "$as_me:19980: 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:19976: checking for version of db" >&5 +echo "$as_me:19984: 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 @@ -19984,10 +19992,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:19987: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:19995: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 19990 "configure" +#line 19998 "configure" #include "confdefs.h" $ac_includes_default @@ -20017,16 +20025,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20020: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20023: \$? = $ac_status" >&5 + echo "$as_me:20031: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20026: \"$ac_try\"") >&5 + { (eval echo "$as_me:20034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20029: \$? = $ac_status" >&5 + echo "$as_me:20037: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -20040,16 +20048,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:20043: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:20051: 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:20047: error: Cannot determine version of db" >&5 + { { echo "$as_me:20055: 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:20052: checking for db libraries" >&5 +echo "$as_me:20060: 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 @@ -20079,10 +20087,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:20082: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:20090: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 20085 "configure" +#line 20093 "configure" #include "confdefs.h" $ac_includes_default @@ -20137,16 +20145,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20140: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20143: \$? = $ac_status" >&5 + echo "$as_me:20151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20146: \"$ac_try\"") >&5 + { (eval echo "$as_me:20154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20149: \$? = $ac_status" >&5 + echo "$as_me:20157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -20166,11 +20174,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:20169: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:20177: 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:20173: error: Cannot determine library for db" >&5 + { { echo "$as_me:20181: 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 @@ -20196,7 +20204,7 @@ fi else - { { echo "$as_me:20199: error: Cannot find db.h" >&5 + { { echo "$as_me:20207: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -20211,7 +20219,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:20214: checking if we should include stdbool.h" >&5 +echo "$as_me:20222: 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 @@ -20219,7 +20227,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 20222 "configure" +#line 20230 "configure" #include "confdefs.h" int @@ -20231,23 +20239,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20237: \$? = $ac_status" >&5 + echo "$as_me:20245: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20240: \"$ac_try\"") >&5 + { (eval echo "$as_me:20248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20243: \$? = $ac_status" >&5 + echo "$as_me:20251: \$? = $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 20250 "configure" +#line 20258 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -20263,16 +20271,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20274: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20269: \$? = $ac_status" >&5 + echo "$as_me:20277: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20272: \"$ac_try\"") >&5 + { (eval echo "$as_me:20280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20275: \$? = $ac_status" >&5 + echo "$as_me:20283: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -20286,13 +20294,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:20289: result: yes" >&5 +then echo "$as_me:20297: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:20291: result: no" >&5 +else echo "$as_me:20299: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:20295: checking for builtin bool type" >&5 +echo "$as_me:20303: 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 @@ -20300,7 +20308,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 20303 "configure" +#line 20311 "configure" #include "confdefs.h" #include @@ -20315,16 +20323,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20318: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20326: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20321: \$? = $ac_status" >&5 + echo "$as_me:20329: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20324: \"$ac_try\"") >&5 + { (eval echo "$as_me:20332: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20327: \$? = $ac_status" >&5 + echo "$as_me:20335: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -20337,9 +20345,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:20340: result: yes" >&5 +then echo "$as_me:20348: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:20342: result: no" >&5 +else echo "$as_me:20350: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20356,10 +20364,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:20359: checking if we already have C++ library" >&5 + echo "$as_me:20367: 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 20362 "configure" +#line 20370 "configure" #include "confdefs.h" #include @@ -20373,16 +20381,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20376: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20384: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20379: \$? = $ac_status" >&5 + echo "$as_me:20387: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20382: \"$ac_try\"") >&5 + { (eval echo "$as_me:20390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20385: \$? = $ac_status" >&5 + echo "$as_me:20393: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_libstdcpp=yes else @@ -20391,7 +20399,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:20394: result: $cf_have_libstdcpp" >&5 + echo "$as_me:20402: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -20410,7 +20418,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:20413: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:20421: 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 @@ -20436,7 +20444,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 20439 "configure" +#line 20447 "configure" #include "confdefs.h" #include @@ -20450,16 +20458,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20453: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20461: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20456: \$? = $ac_status" >&5 + echo "$as_me:20464: \$? = $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:20467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20462: \$? = $ac_status" >&5 + echo "$as_me:20470: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -20471,7 +20479,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:20474: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:20482: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="-l$cf_stdcpp_libname" @@ -20493,7 +20501,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:20496: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:20504: 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 @@ -20508,15 +20516,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:20511: \"$ac_try\"") >&5 +if { (eval echo "$as_me:20519: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20514: \$? = $ac_status" >&5 + echo "$as_me:20522: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:20516: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:20524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20519: \$? = $ac_status" >&5 + echo "$as_me:20527: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -20527,10 +20535,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:20530: result: yes" >&5 + echo "$as_me:20538: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:20533: result: no" >&5 + echo "$as_me:20541: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20550,7 +20558,7 @@ case $cf_cv_system_name in ;; esac if test "$GXX" = yes; then - echo "$as_me:20553: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:20561: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -20571,7 +20579,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 20574 "configure" +#line 20582 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -20585,16 +20593,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20588: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20596: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20591: \$? = $ac_status" >&5 + echo "$as_me:20599: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20594: \"$ac_try\"") >&5 + { (eval echo "$as_me:20602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20597: \$? = $ac_status" >&5 + echo "$as_me:20605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -20631,7 +20639,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20634 "configure" +#line 20642 "configure" #include "confdefs.h" #include @@ -20645,16 +20653,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20648: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20656: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20651: \$? = $ac_status" >&5 + echo "$as_me:20659: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20654: \"$ac_try\"") >&5 + { (eval echo "$as_me:20662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20657: \$? = $ac_status" >&5 + echo "$as_me:20665: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -20687,7 +20695,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:20690: result: $cf_cxx_library" >&5 + echo "$as_me:20698: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -20703,7 +20711,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:20706: checking how to run the C++ preprocessor" >&5 +echo "$as_me:20714: 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 @@ -20720,18 +20728,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 20723 "configure" +#line 20731 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:20728: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20736: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20734: \$? = $ac_status" >&5 + echo "$as_me:20742: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20754,17 +20762,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 20757 "configure" +#line 20765 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20761: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20769: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20767: \$? = $ac_status" >&5 + echo "$as_me:20775: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20801,7 +20809,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:20804: result: $CXXCPP" >&5 +echo "$as_me:20812: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -20811,18 +20819,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 20814 "configure" +#line 20822 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:20819: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20827: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20825: \$? = $ac_status" >&5 + echo "$as_me:20833: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20845,17 +20853,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 20848 "configure" +#line 20856 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20852: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20860: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20858: \$? = $ac_status" >&5 + echo "$as_me:20866: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20883,7 +20891,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:20886: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:20894: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -20898,23 +20906,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:20901: checking for $ac_header" >&5 +echo "$as_me:20909: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20907 "configure" +#line 20915 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20911: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20919: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20917: \$? = $ac_status" >&5 + echo "$as_me:20925: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20933,7 +20941,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20936: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20944: result: `eval echo '${'$as_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:20957: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20955 "configure" +#line 20963 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20959: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20967: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20965: \$? = $ac_status" >&5 + echo "$as_me:20973: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20981,7 +20989,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20984: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20992: result: `eval echo '${'$as_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:21003: 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 20998 "configure" +#line 21006 "configure" #include "confdefs.h" #include @@ -21012,16 +21020,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21015: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21023: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21018: \$? = $ac_status" >&5 + echo "$as_me:21026: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21021: \"$ac_try\"") >&5 + { (eval echo "$as_me:21029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21024: \$? = $ac_status" >&5 + echo "$as_me:21032: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -21030,7 +21038,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:21033: result: $cf_iostream_namespace" >&5 + echo "$as_me:21041: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -21041,7 +21049,7 @@ EOF fi fi -echo "$as_me:21044: checking if we should include stdbool.h" >&5 +echo "$as_me:21052: 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 @@ -21049,7 +21057,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 21052 "configure" +#line 21060 "configure" #include "confdefs.h" int @@ -21061,23 +21069,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21064: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21072: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21067: \$? = $ac_status" >&5 + echo "$as_me:21075: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21070: \"$ac_try\"") >&5 + { (eval echo "$as_me:21078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21073: \$? = $ac_status" >&5 + echo "$as_me:21081: \$? = $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 21080 "configure" +#line 21088 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -21093,16 +21101,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21096: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21099: \$? = $ac_status" >&5 + echo "$as_me:21107: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21102: \"$ac_try\"") >&5 + { (eval echo "$as_me:21110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21105: \$? = $ac_status" >&5 + echo "$as_me:21113: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -21116,13 +21124,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:21119: result: yes" >&5 +then echo "$as_me:21127: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:21121: result: no" >&5 +else echo "$as_me:21129: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:21125: checking for builtin bool type" >&5 +echo "$as_me:21133: 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 @@ -21130,7 +21138,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 21133 "configure" +#line 21141 "configure" #include "confdefs.h" #include @@ -21145,16 +21153,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21148: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21156: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21151: \$? = $ac_status" >&5 + echo "$as_me:21159: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21154: \"$ac_try\"") >&5 + { (eval echo "$as_me:21162: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21157: \$? = $ac_status" >&5 + echo "$as_me:21165: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -21167,13 +21175,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:21170: result: yes" >&5 +then echo "$as_me:21178: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:21172: result: no" >&5 +else echo "$as_me:21180: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:21176: checking for size of bool" >&5 +echo "$as_me:21184: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21184,7 +21192,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21187 "configure" +#line 21195 "configure" #include "confdefs.h" #include @@ -21226,15 +21234,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21229: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21237: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21232: \$? = $ac_status" >&5 + echo "$as_me:21240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21234: \"$ac_try\"") >&5 + { (eval echo "$as_me:21242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21237: \$? = $ac_status" >&5 + echo "$as_me:21245: \$? = $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 @@ -21252,18 +21260,18 @@ fi fi rm -f cf_test.out -echo "$as_me:21255: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21263: 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:21261: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21269: 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:21266: checking for special defines needed for etip.h" >&5 +echo "$as_me:21274: 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" @@ -21281,7 +21289,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 21284 "configure" +#line 21292 "configure" #include "confdefs.h" #include @@ -21295,16 +21303,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21298: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21301: \$? = $ac_status" >&5 + echo "$as_me:21309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21304: \"$ac_try\"") >&5 + { (eval echo "$as_me:21312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21307: \$? = $ac_status" >&5 + echo "$as_me:21315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:21336: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:21333: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:21341: 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 @@ -21347,7 +21355,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21350 "configure" +#line 21358 "configure" #include "confdefs.h" class TEST { @@ -21366,15 +21374,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21369: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21377: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21372: \$? = $ac_status" >&5 + echo "$as_me:21380: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21374: \"$ac_try\"") >&5 + { (eval echo "$as_me:21382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21377: \$? = $ac_status" >&5 + echo "$as_me:21385: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -21393,7 +21401,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:21396: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:21404: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -21403,7 +21411,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:21406: checking if $CXX accepts static_cast" >&5 +echo "$as_me:21414: 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 @@ -21417,7 +21425,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 21420 "configure" +#line 21428 "configure" #include "confdefs.h" class NCursesPanel @@ -21461,16 +21469,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21464: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21467: \$? = $ac_status" >&5 + echo "$as_me:21475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21470: \"$ac_try\"") >&5 + { (eval echo "$as_me:21478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21473: \$? = $ac_status" >&5 + echo "$as_me:21481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -21488,7 +21496,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:21491: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:21499: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -21537,7 +21545,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:21540: checking for size of bool" >&5 +echo "$as_me:21548: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21548,7 +21556,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21551 "configure" +#line 21559 "configure" #include "confdefs.h" #include @@ -21590,15 +21598,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21593: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21601: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21596: \$? = $ac_status" >&5 + echo "$as_me:21604: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21598: \"$ac_try\"") >&5 + { (eval echo "$as_me:21606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21601: \$? = $ac_status" >&5 + echo "$as_me:21609: \$? = $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 @@ -21616,25 +21624,25 @@ fi fi rm -f cf_test.out -echo "$as_me:21619: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21627: 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:21625: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21633: 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:21631: checking for fallback type of bool" >&5 + echo "$as_me:21639: 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:21637: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:21645: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -21663,7 +21671,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:21666: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:21674: 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 @@ -21674,7 +21682,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:21677: checking for $ac_word" >&5 +echo "$as_me:21685: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21689,7 +21697,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_gnat_exists="yes" -echo "$as_me:21692: found $ac_dir/$ac_word" >&5 +echo "$as_me:21700: found $ac_dir/$ac_word" >&5 break done @@ -21698,10 +21706,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:21701: result: $gnat_exists" >&5 + echo "$as_me:21709: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:21704: result: no" >&5 + echo "$as_me:21712: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21710,12 +21718,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:21713: checking for gnat version" >&5 +echo "$as_me:21721: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:21718: result: $cf_gnat_version" >&5 +echo "$as_me:21726: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -21723,7 +21731,7 @@ case $cf_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:21726: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:21734: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -21731,7 +21739,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:21734: checking for $ac_word" >&5 +echo "$as_me:21742: 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 @@ -21746,7 +21754,7 @@ 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:21749: found $ac_dir/$ac_word" >&5 +echo "$as_me:21757: found $ac_dir/$ac_word" >&5 break done @@ -21755,10 +21763,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:21758: result: $M4_exists" >&5 + echo "$as_me:21766: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:21761: result: no" >&5 + echo "$as_me:21769: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21767,7 +21775,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:21770: checking if GNAT works" >&5 + echo "$as_me:21778: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -21795,7 +21803,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:21798: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:21806: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -21804,7 +21812,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:21807: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:21815: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -21821,10 +21829,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:21824: result: $ADAFLAGS" >&5 + echo "$as_me:21832: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:21827: checking if GNATPREP supports -T option" >&5 +echo "$as_me:21835: 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 @@ -21834,11 +21842,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:21837: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:21845: 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:21841: checking if GNAT supports generics" >&5 +echo "$as_me:21849: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in (3.[1-9]*|[4-9].*) @@ -21848,7 +21856,7 @@ case $cf_gnat_version in cf_gnat_generics=no ;; esac -echo "$as_me:21851: result: $cf_gnat_generics" >&5 +echo "$as_me:21859: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -21860,7 +21868,7 @@ else cf_generic_objects= fi -echo "$as_me:21863: checking if GNAT supports SIGINT" >&5 +echo "$as_me:21871: 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 @@ -21908,7 +21916,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:21911: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:21919: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -21921,7 +21929,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:21924: checking if GNAT supports project files" >&5 +echo "$as_me:21932: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in (3.[0-9]*) @@ -21981,15 +21989,15 @@ CF_EOF esac ;; esac -echo "$as_me:21984: result: $cf_gnat_projects" >&5 +echo "$as_me:21992: 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:21990: checking if GNAT supports libraries" >&5 + echo "$as_me:21998: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:21992: result: $cf_gnat_libraries" >&5 + echo "$as_me:22000: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -22009,7 +22017,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:22012: checking for ada-compiler" >&5 +echo "$as_me:22020: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -22020,12 +22028,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:22023: result: $cf_ada_compiler" >&5 +echo "$as_me:22031: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:22028: checking for ada-include" >&5 +echo "$as_me:22036: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -22061,7 +22069,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:22064: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:22072: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -22070,10 +22078,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:22073: result: $ADA_INCLUDE" >&5 +echo "$as_me:22081: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:22076: checking for ada-objects" >&5 +echo "$as_me:22084: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -22109,7 +22117,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:22112: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:22120: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -22118,10 +22126,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:22121: result: $ADA_OBJECTS" >&5 +echo "$as_me:22129: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:22124: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:22132: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -22131,7 +22139,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:22134: result: $with_ada_sharedlib" >&5 +echo "$as_me:22142: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -22154,13 +22162,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:22157: checking for wchar_t" >&5 + echo "$as_me:22165: 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 22163 "configure" +#line 22171 "configure" #include "confdefs.h" $ac_includes_default int @@ -22175,16 +22183,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22178: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22186: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22181: \$? = $ac_status" >&5 + echo "$as_me:22189: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22184: \"$ac_try\"") >&5 + { (eval echo "$as_me:22192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22187: \$? = $ac_status" >&5 + echo "$as_me:22195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -22194,10 +22202,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:22197: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:22205: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:22200: checking size of wchar_t" >&5 +echo "$as_me:22208: 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 @@ -22206,7 +22214,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 22209 "configure" +#line 22217 "configure" #include "confdefs.h" $ac_includes_default int @@ -22218,21 +22226,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22221: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22224: \$? = $ac_status" >&5 + echo "$as_me:22232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22227: \"$ac_try\"") >&5 + { (eval echo "$as_me:22235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22230: \$? = $ac_status" >&5 + echo "$as_me:22238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 22235 "configure" +#line 22243 "configure" #include "confdefs.h" $ac_includes_default int @@ -22244,16 +22252,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22247: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22255: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22250: \$? = $ac_status" >&5 + echo "$as_me:22258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22253: \"$ac_try\"") >&5 + { (eval echo "$as_me:22261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22256: \$? = $ac_status" >&5 + echo "$as_me:22264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -22269,7 +22277,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 22272 "configure" +#line 22280 "configure" #include "confdefs.h" $ac_includes_default int @@ -22281,16 +22289,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22292: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22287: \$? = $ac_status" >&5 + echo "$as_me:22295: \$? = $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:22298: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22293: \$? = $ac_status" >&5 + echo "$as_me:22301: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -22306,7 +22314,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 22309 "configure" +#line 22317 "configure" #include "confdefs.h" $ac_includes_default int @@ -22318,16 +22326,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22329: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22324: \$? = $ac_status" >&5 + echo "$as_me:22332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22327: \"$ac_try\"") >&5 + { (eval echo "$as_me:22335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22330: \$? = $ac_status" >&5 + echo "$as_me:22338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -22340,12 +22348,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:22343: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22351: 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 22348 "configure" +#line 22356 "configure" #include "confdefs.h" $ac_includes_default int @@ -22361,15 +22369,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22364: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22367: \$? = $ac_status" >&5 + echo "$as_me:22375: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22369: \"$ac_try\"") >&5 + { (eval echo "$as_me:22377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22372: \$? = $ac_status" >&5 + echo "$as_me:22380: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -22385,7 +22393,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:22388: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:22396: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&5 +echo "$as_me:22414: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -22445,7 +22453,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:22448: result: $LIB_SUBSETS" >&5 +echo "$as_me:22456: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -22476,7 +22484,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:22479: checking default library suffix" >&5 +echo "$as_me:22487: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -22487,10 +22495,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:22490: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:22498: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:22493: checking default library-dependency suffix" >&5 +echo "$as_me:22501: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -22548,10 +22556,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:22551: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:22559: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:22554: checking default object directory" >&5 +echo "$as_me:22562: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -22567,11 +22575,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:22570: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:22578: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:22574: checking c++ library-dependency suffix" >&5 +echo "$as_me:22582: 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++) @@ -22639,7 +22647,7 @@ else fi fi -echo "$as_me:22642: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:22650: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -22815,19 +22823,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:22818: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:22826: 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:22827: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22835: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22830: \$? = $ac_status" >&5 + echo "$as_me:22838: \$? = $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 @@ -22838,10 +22846,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22841 "configure" +#line 22849 "configure" #include "confdefs.h" -#line 22844 "configure" +#line 22852 "configure" #include int cf_ldflags_static(FILE *fp); @@ -22856,16 +22864,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22859: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22867: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22862: \$? = $ac_status" >&5 + echo "$as_me:22870: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22865: \"$ac_try\"") >&5 + { (eval echo "$as_me:22873: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22868: \$? = $ac_status" >&5 + echo "$as_me:22876: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -22888,7 +22896,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:22891: result: $cf_ldflags_static" >&5 + echo "$as_me:22899: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -22904,7 +22912,7 @@ fi ;; esac -echo "$as_me:22907: checking where we will install curses.h" >&5 +echo "$as_me:22915: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -22914,7 +22922,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:22917: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:22925: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -22922,7 +22930,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:22925: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:22933: 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 @@ -22940,7 +22948,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:22943: checking for src modules" >&5 +echo "$as_me:22951: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -23005,7 +23013,7 @@ EOF fi fi done -echo "$as_me:23008: result: $cf_cv_src_modules" >&5 +echo "$as_me:23016: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -23242,7 +23250,7 @@ fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:23245: checking for $ac_word" >&5 +echo "$as_me:23253: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23259,7 +23267,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC_PATH="$ac_dir/$ac_word" - echo "$as_me:23262: found $ac_dir/$ac_word" >&5 + echo "$as_me:23270: found $ac_dir/$ac_word" >&5 break fi done @@ -23271,10 +23279,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:23274: result: $TIC_PATH" >&5 + echo "$as_me:23282: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:23277: result: no" >&5 + echo "$as_me:23285: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23282,7 +23290,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:23285: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:23293: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -23318,7 +23326,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}:23321: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:23329: 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//'` @@ -23329,7 +23337,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:23332: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:23340: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN @@ -23345,7 +23353,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:23348: result: $PKG_CFLAGS" >&5 +echo "$as_me:23356: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -23402,7 +23410,7 @@ then cf_filter_syms=$cf_dft_filter_syms test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 -echo "${as_me:-configure}:23405: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:23413: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -23506,7 +23514,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:23509: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23517: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -23682,7 +23690,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23685: error: ambiguous option: $1 + { { echo "$as_me:23693: 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;} @@ -23701,7 +23709,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23704: error: unrecognized option: $1 + -*) { { echo "$as_me:23712: 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;} @@ -23820,7 +23828,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:23823: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23831: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24299,7 +24307,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24302: creating $ac_file" >&5 + { echo "$as_me:24310: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24317,7 +24325,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:24320: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24328: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24330,7 +24338,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:24333: error: cannot find input file: $f" >&5 + { { echo "$as_me:24341: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24346,7 +24354,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:24349: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24357: 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;} @@ -24355,7 +24363,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:24358: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24366: 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;} @@ -24392,7 +24400,7 @@ s,@INSTALL@,$ac_INSTALL,;t t 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:24395: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24403: 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;} @@ -24403,7 +24411,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:24406: WARNING: Some variables may not be substituted: + { echo "$as_me:24414: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24452,7 +24460,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:24455: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24463: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24463,7 +24471,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:24466: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24474: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24476,7 +24484,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:24479: error: cannot find input file: $f" >&5 + { { echo "$as_me:24487: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24534,7 +24542,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:24537: $ac_file is unchanged" >&5 + { echo "$as_me:24545: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -24879,7 +24887,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:24882: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:24890: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index cc7257e1..04e09bf3 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.638 2017/03/10 02:01:39 tom Exp $ +dnl $Id: configure.in,v 1.640 2017/04/01 21:10:59 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.638 $) +AC_REVISION($Revision: 1.640 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1026,18 +1026,18 @@ AC_ARG_ENABLE(ext-funcs, AC_MSG_RESULT($with_ext_funcs) if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 - AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS,1,[Define to 1 to enable assume_default_colors() function]) - AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 to enable curses_version() function]) - AC_DEFINE(HAVE_HAS_KEY,1,[Define to 1 to enable has_key() function]) - AC_DEFINE(HAVE_RESIZETERM,1,[Define to 1 to enable resizeterm() function]) - AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function]) - AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function]) - AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function]) - AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function]) - AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function]) - AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function]) - AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function]) AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 to enable ncurses extended functions]) + AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS,1,[Define to 1 to enable assume_default_colors() function in test-programs]) + AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 to enable curses_version() function in test-programs]) + AC_DEFINE(HAVE_HAS_KEY,1,[Define to 1 to enable has_key() function in test-programs]) + AC_DEFINE(HAVE_RESIZETERM,1,[Define to 1 to enable resizeterm() function in test-programs]) + AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function in test-programs]) + AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function in test-programs]) + AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function in test-programs]) + AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function in test-programs]) + AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function in test-programs]) + AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs]) + AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs]) GENERATED_EXT_FUNCS=generated test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no else @@ -1056,6 +1056,7 @@ AC_MSG_RESULT($with_sp_funcs) if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 AC_DEFINE(NCURSES_SP_FUNCS,1,[Define to 1 to enable SCREEN-extensions]) + AC_DEFINE(HAVE_TPUTS_SP,1,[Define to 1 to enable tputs_sp() function in test-programs]) GENERATED_SP_FUNCS=generated else NCURSES_SP_FUNCS=0 @@ -1110,6 +1111,7 @@ if test "x$with_ext_colors" = xyes ; then NCURSES_EXT_COLORS=1 AC_DEFINE(NCURSES_EXT_COLORS,1,[Define to 1 to compile for 256-color support]) AC_DEFINE(HAVE_ALLOC_PAIR,1,[Define to 1 to enable alloc_pair() function]) + AC_DEFINE(HAVE_INIT_EXTENDED_COLOR,1,[Define to 1 to enable init_extended_color() function in test-programs]) fi fi AC_SUBST(NCURSES_EXT_COLORS) diff --git a/dist.mk b/dist.mk index 239e3227..9fb361b6 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1153 2017/03/19 00:59:07 tom Exp $ +# $Id: dist.mk,v 1.1154 2017/03/26 13:39:03 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 0 -NCURSES_PATCH = 20170325 +NCURSES_PATCH = 20170401 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 89ef2934..ba334c32 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -131,7 +131,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 5a3f3b86..f047c732 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -198,7 +198,7 @@

SEE ALSO

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

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 4de38847..fa9c067f 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -147,7 +147,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index cca759ac..b0bb4980 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.49 2017/01/07 19:25:15 tom Exp @
+  * @Id: curs_attr.3x,v 1.53 2017/03/28 23:31:39 tom Exp @
   * attr_get
   * .br
   * .br
@@ -123,17 +123,23 @@
        clearing.
 
        Routines  which  do  not have a WINDOW* parameter apply to
-       stdscr.
+       stdscr.  For example, attr_set is the  stdscr  variant  of
+       wattr_set.

Window attributes

-       The attr_set and wattr_set functions set the  current  at-
-       tributes  of  the given window to attrs, with color speci-
-       fied by pair.  X/Open specified  an  additional  parameter
-       opts which is unused in all implementations.
+       There are two sets of functions:
 
-       Use  attr_get and wattr_get to retrieve attributes for the
-       given window.
+       o   functions  for  manipulating the window attributes and
+           color: wattr_set and wattr_get.
+
+       o   functions for manipulating only the window  attributes
+           (not color): wattr_on and wattr_off.
+
+       The  wattr_set function sets the current attributes of the
+       given window to attrs, with color specified by pair.
+
+       Use wattr_get to retrieve attributes for the given window.
 
        Use attr_on and wattr_on to  turn  on  window  attributes,
        i.e., values OR'd together in attr, without affecting oth-
@@ -173,35 +179,32 @@
 
        In these functions, the color pair argument  is  a  color-
        pair  index  (as  in  the first argument of init_pair, see
-       curs_color(3x)).  The opts argument is not presently used,
-       but is reserved for the future (leave it NULL).
+       curs_color(3x)).

Change window color

-       The  routine color_set sets the current color of the given
-       window to the foreground/background combination  described
-       by  the  color  pair parameter.  The parameter opts is re-
-       served for future use; applications  must  supply  a  null
-       pointer.
+       The routine color_set sets the current color of the  given
+       window  to the foreground/background combination described
+       by the color pair parameter.

Standout

-       The  routine  standout  is the same as attron(A_STANDOUT).
-       The routine standend is the same as  attrset(A_NORMAL)  or
+       The routine standout is the  same  as  attron(A_STANDOUT).
+       The  routine  standend is the same as attrset(A_NORMAL) or
        attrset(0), that is, it turns off all attributes.
 
        X/Open does not mark these "restricted", because
 
        o   they have well established legacy use, and
 
-       o   there  is  no  ambiguity  about the way the attributes
+       o   there is no ambiguity about  the  way  the  attributes
            might be combined with a color pair.

VIDEO ATTRIBUTES

        The following video attributes, defined in <curses.h>, can
        be passed to the routines attron, attroff, and attrset, or
-       OR'd with the characters passed to  addch  (see  curs_add-
+       OR'd  with  the  characters passed to addch (see curs_add-
        ch(3x)).
 
               Name           Description
@@ -232,52 +235,85 @@
               WA_TOP          Top highlight
               WA_VERTICAL     Vertical highlight
 
-       The  return values of many of these routines are not mean-
+       The return values of many of these routines are not  mean-
        ingful (they are implemented as macro-expanded assignments
-       and  simply  return their argument).  The SVr4 manual page
+       and simply return their argument).  The SVr4  manual  page
        claims (falsely) that these routines always return 1.

NOTES

-       These functions may be macros: attroff, wattroff,  attron,
-       wattron, attrset, wattrset, standend and standout.
-
-       Color  pair values can only be OR'd with attributes if the
-       pair number is less than  256.   The  alternate  functions
-       such  as  color_set  can pass a color pair value directly.
-       However, ncurses ABI 4 and 5 simply OR this  value  within
-       the  alternate  functions.   You must use ncurses ABI 6 to
+       These functions may be macros:
+
+              attroff,  wattroff,  attron, wattron, attrset, wat-
+              trset, standend and standout.
+
+       Color pair values can only be OR'd with attributes if  the
+       pair  number  is  less  than 256.  The alternate functions
+       such as color_set can pass a color  pair  value  directly.
+       However,  ncurses  ABI 4 and 5 simply OR this value within
+       the alternate functions.  You must use ncurses  ABI  6  to
        support more than 256 color pairs.
 
 
+

EXTENSIONS

+       This  implementation  provides  the A_ITALIC attribute for
+       terminals which have the enter_italics_mode (sitm) and ex-
+       it_italics_mode (ritm) capabilities.  Italics are not men-
+       tioned in X/Open  Curses.   Unlike  the  other  video  at-
+       tributes,  A_ITALIC is unrelated to the set_attributes ca-
+       pabilities.  This implementation makes the assumption that
+       exit_attribute_mode may also reset italics.
+
+       Each  of the functions added by XSI Curses has a parameter
+       opts, which X/Open Curses still (after  more  than  twenty
+       years)  documents  as reserved for future use, saying that
+       it should be NULL.  This implementation uses that  parame-
+       ter in ABI 6 for the functions which have a color-pair pa-
+       rameter to support extended color pairs:
+
+       o   For functions which modify the color, e.g., wattr_set,
+           if  opts is set it is treated as a pointer to int, and
+           used to set the color pair instead of the  short  pair
+           parameter.
+
+       o   For  functions  which  retrieve  the color, e.g., wat-
+           tr_get, if opts is set it is treated as a  pointer  to
+           int,  and  used  to  retrieve the color pair as an int
+           value, in addition  retrieving  it  via  the  standard
+           pointer to short parameter.
+
+       The remaining functions which have opts, but do not manip-
+       ulate color, e.g., wattr_on and wattr_off are not used  by
+       this implementation except to check that they are NULL.
+
+

PORTABILITY

-       These functions are supported in the XSI Curses  standard,
-       Issue  4.   The  standard  defined  the dedicated type for
-       highlights, attr_t, which is not defined in  SVr4  curses.
-       The  functions  taking  attr_t arguments are not supported
+       These  functions are supported in the XSI Curses standard,
+       Issue 4.  The standard  defined  the  dedicated  type  for
+       highlights,  attr_t, which was not defined in SVr4 curses.
+       The functions taking attr_t arguments were  not  supported
        under SVr4.
 
+       Very  old versions of this library did not force an update
+       of the screen when changing the attributes.  Use  touchwin
+       to force the screen to match the updated attributes.
+
        The XSI Curses standard states that whether the tradition-
-       al  functions  attron/attroff/attrset  can  manipulate at-
-       tributes other than  A_BLINK,  A_BOLD,  A_DIM,  A_REVERSE,
-       A_STANDOUT,  or  A_UNDERLINE is "unspecified".  Under this
-       implementation as well as  SVr4  curses,  these  functions
-       correctly  manipulate  all other highlights (specifically,
+       al functions  attron/attroff/attrset  can  manipulate  at-
+       tributes  other  than  A_BLINK,  A_BOLD, A_DIM, A_REVERSE,
+       A_STANDOUT, or A_UNDERLINE is "unspecified".   Under  this
+       implementation  as  well  as  SVr4 curses, these functions
+       correctly manipulate all other  highlights  (specifically,
        A_ALTCHARSET, A_PROTECT, and A_INVIS).
 
-       This implementation provides the  A_ITALIC  attribute  for
-       terminals which have the enter_italics_mode (sitm) and ex-
-       it_italics_mode (ritm) capabilities.  Italics are not men-
-       tioned  in  X/Open  Curses.   Unlike  the  other video at-
-       tributes, A_ITALIC is unrelated to the set_attributes  ca-
-       pabilities.  This implementation makes the assumption that
-       exit_attribute_mode may also reset italics.
+       XSI Curses added these entry points:
+
+              attr_get,  attr_on,  attr_off,  attr_set, wattr_on,
+              wattr_off, wattr_get, wattr_set
 
-       XSI Curses added the new entry points, attr_get,  attr_on,
-       attr_off,  attr_set,  wattr_on, wattr_off, wattr_get, wat-
-       tr_set.  These are intended to work with a new  series  of
-       highlight macros prefixed with WA_.  The older macros have
-       direct counterparts in the newer set of names:
+       The new functions are intended to work with a  new  series
+       of  highlight  macros prefixed with WA_.  The older macros
+       have direct counterparts in the newer set of names:
 
               Name            Description
               ------------------------------------------------------------
@@ -290,10 +326,6 @@
               WA_BOLD         Extra bright or bold
               WA_ALTCHARSET   Alternate character set
 
-       Very old versions of this library did not force an  update
-       of  the screen when changing the attributes.  Use touchwin
-       to force the screen to match the updated attributes.
-
        The XSI curses standard specifies that each pair of corre-
        sponding  A_  and WA_-using functions operates on the same
        current-highlight information.
@@ -318,6 +350,10 @@
        o   returns an error if the color pair parameter for wcol-
            or_set is outside the range 0..COLOR_PAIRS-1.
 
+       o   does not return an error if either of  the  parameters
+           of  wattr_get  used for retrieving attribute or color-
+           pair values is NULL.
+
        Functions with a "mv" prefix first perform a cursor  move-
        ment  using  wmove, and return an error if the position is
        outside the window, or if the window pointer is null.
@@ -346,6 +382,7 @@
 
 
  • VIDEO ATTRIBUTES
    • 
 
  • NOTES
    • 
+
  • EXTENSIONS
    • 
 
  • PORTABILITY
    • 
 
  • RETURN VALUE
    • 
 
  • SEE ALSO
    • 
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index d5e9959a..e4b0143d 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -96,7 +96,9 @@

    getbkgrnd

            The  getbkgrnd function returns the given window's current
-       background character/attribute pair via the wch pointer.
+       background character/attribute pair via the  wch  pointer.
+       If  the given window pointer is null, the character is not
+       updated (but no error returned).

    NOTES

    @@ -108,8 +110,11 @@
        value.
 
        Upon successful completion, the other functions return OK.
-       Otherwise, they return ERR.   A  null  window  pointer  is
-       treated as an error.
+       Otherwise, they return ERR:
+
+       o   A null window pointer is treated as an error.
+
+       o   A null character pointer is treated as an error.

    SEE ALSO

    diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 843ada75..bab33b32 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -26,10 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.47 2017/03/13 21:49:37 tom Exp @
-  * .br
-  * .br
-  * .br
+  * @Id: curs_color.3x,v 1.50 2017/04/01 19:57:19 tom Exp @
 -->
 
 
@@ -49,8 +46,8 @@

    NAME

    -       start_color, init_pair, init_color, color_content,
-       pair_content, has_colors, can_change_color, COLOR_PAIR,
+       start_color, has_colors, can_change_color, init_pair,
+       init_color, color_content, pair_content, COLOR_PAIR,
        PAIR_NUMBER - curses color manipulation routines
 
 
@@ -59,15 +56,22 @@
 
        int start_color(void);
 
+       bool has_colors(void);
+       bool can_change_color(void);
+
        int init_pair(short pair, short f, short b);
        int init_color(short color, short r, short g, short b);
+       /* extensions */
+       int init_extended_pair(int pair, int f, int b);
+       int init_extended_color(int color, int r, int g, int b);
 
        int  color_content(short  color, short *r, short *g, short
        *b);
        int pair_content(short pair, short *f, short *b);
-
-       bool has_colors(void);
-       bool can_change_color(void);
+       /* extensions */
+       int extended_color_content(int color, int *r, int *g,  int
+       *b);
+       int extended_pair_content(int pair, int *f, int *b);
 
        int COLOR_PAIR(int n);
        PAIR_NUMBER(attrs);
@@ -76,32 +80,32 @@

    DESCRIPTION

    Overview

    -       curses supports color attributes on  terminals  with  that
-       capability.   To  use  these  routines start_color must be
-       called, usually right after initscr.   Colors  are  always
-       used  in pairs (referred to as color-pairs).  A color-pair
-       consists of a foreground  color  (for  characters)  and  a
+       curses  supports  color  attributes on terminals with that
+       capability.  To use these  routines  start_color  must  be
+       called,  usually  right  after initscr.  Colors are always
+       used in pairs (referred to as color-pairs).  A  color-pair
+       consists  of  a  foreground  color  (for characters) and a
        background color (for the blank field on which the charac-
-       ters are displayed).  A programmer  initializes  a  color-
-       pair  with  the routine init_pair.  After it has been ini-
+       ters  are  displayed).   A programmer initializes a color-
+       pair with the routine init_pair.  After it has  been  ini-
        tialized, COLOR_PAIR(n) can be used to convert the pair to
        a video attribute.
 
-       If  a  terminal  is capable of redefining colors, the pro-
+       If a terminal is capable of redefining  colors,  the  pro-
        grammer can use the routine init_color to change the defi-
-       nition   of   a   color.    The  routines  has_colors  and
-       can_change_color  return  TRUE  or  FALSE,  depending   on
-       whether  the  terminal  has color capabilities and whether
-       the programmer can change the colors.   The  routine  col-
-       or_content  allows  a programmer to extract the amounts of
-       red, green, and blue components in an  initialized  color.
-       The  routine  pair_content allows a programmer to find out
+       nition  of  a  color.    The   routines   has_colors   and
+       can_change_color   return  TRUE  or  FALSE,  depending  on
+       whether the terminal has color  capabilities  and  whether
+       the  programmer  can  change the colors.  The routine col-
+       or_content allows a programmer to extract the  amounts  of
+       red,  green,  and blue components in an initialized color.
+       The routine pair_content allows a programmer to  find  out
        how a given color-pair is currently defined.

    Color Rendering

    -       The curses library combines these inputs  to  produce  the
-       actual  foreground  and  background  colors  shown  on the
+       The  curses  library  combines these inputs to produce the
+       actual foreground  and  background  colors  shown  on  the
        screen:
 
        o   per-character video attributes (e.g., via waddch),
@@ -110,12 +114,12 @@
 
        o   the background character (e.g., wbkgdset).
 
-       Per-character and window attributes are usually set  by  a
-       parameter  containing  video  attributes including a color
-       pair value.  Some functions such as wattr_set use a  sepa-
+       Per-character  and  window attributes are usually set by a
+       parameter containing video attributes  including  a  color
+       pair  value.  Some functions such as wattr_set use a sepa-
        rate parameter which is the color pair number.
 
-       The  background character is a special case: it includes a
+       The background character is a special case: it includes  a
        character value, just as if it were passed to waddch.
 
        The curses library does the actual work of combining these
@@ -127,24 +131,58 @@
            o   curses next checks the window attribute.
 
            o   If the window attribute does not use color pair 0,
-               curses  uses  the  color  pair from the window at-
+               curses uses the color pair  from  the  window  at-
                tribute.
 
            o   Otherwise, curses uses the background character.
 
-       o   If the parameter passed to waddch is not blank, or  it
-           does  not use the special color pair 0, curses prefers
-           the color pair from the parameter, if it  is  nonzero.
+       o   If  the parameter passed to waddch is not blank, or it
+           does not use the special color pair 0, curses  prefers
+           the  color  pair from the parameter, if it is nonzero.
            Otherwise, it tries the window attribute next, and fi-
            nally the background character.
 
-       Some curses functions such as wprintw call waddch.   Those
-       do  not  combine  its parameter with a color pair.  Conse-
-       quently those calls use only the window attribute  or  the
+       Some  curses functions such as wprintw call waddch.  Those
+       do not combine its parameter with a  color  pair.   Conse-
+       quently  those  calls use only the window attribute or the
        background character.
 
 
-

    Routine Descriptions

    +

    CONSTANTS

    +       In <curses.h> the following macros are defined.  These are
+       the  standard colors (ISO-6429).  curses also assumes that
+       COLOR_BLACK is the default background color for all termi-
+       nals.
+
+             COLOR_BLACK
+             COLOR_RED
+             COLOR_GREEN
+             COLOR_YELLOW
+             COLOR_BLUE
+             COLOR_MAGENTA
+             COLOR_CYAN
+             COLOR_WHITE
+
+       Some terminals support more than the eight (8) "ANSI" col-
+       ors.  There are no standard  names  for  those  additional
+       colors.
+
+
+

    VARIABLES

    +
+

    COLORS

    +       is  initialized  by  start_color  to the maximum number of
+       colors the terminal can support.
+
+
+

    COLOR_PAIRS

    +       is initialized by start_color to  the  maximum  number  of
+       color pairs the terminal can support.
+
+
+

    FUNCTIONS

    +
+

    start_color

            The start_color routine requires no arguments.  It must be
        called if the programmer wants to use colors,  and  before
        any  other  color  manipulation  routine is called.  It is
@@ -185,19 +223,17 @@
        a runtime error:
 
        o   COLORS corresponds to the terminal database's max_col-
-           ors capability, which is typically a signed 16-bit in-
-           teger (see terminfo(5)).
+           ors capability, (see terminfo(5)).
 
        o   color values are expected to be in the range 0 to COL-
            ORS-1, inclusive (including 0 and COLORS-1).
 
-       o   a  special  color value -1 is used in certain extended
-           functions to denote the  default  color  (see  use_de-
+       o   a special color value -1 is used in  certain  extended
+           functions  to  denote  the  default color (see use_de-
            fault_colors).
 
-       o   COLOR_PAIRS  corresponds  to  the  terminal database's
-           max_pairs capability,  which  is  typically  a  signed
-           16-bit integer (see terminfo(5)).
+       o   COLOR_PAIRS corresponds  to  the  terminal  database's
+           max_pairs capability, (see terminfo(5)).
 
        o   legal  color  pair  values  are in the range 1 to COL-
            OR_PAIRS-1, inclusive.
@@ -209,6 +245,24 @@
            is initialized.  It cannot be modified by the applica-
            tion.
 
+
+

    has_colors

    +       The  has_colors routine requires no arguments.  It returns
+       TRUE if the terminal can manipulate colors; otherwise,  it
+       returns FALSE.  This routine facilitates writing terminal-
+       independent programs.  For example, a programmer  can  use
+       it  to decide whether to use color or some other video at-
+       tribute.
+
+
+

    can_change_color

    +       The can_change_color routine requires  no  arguments.   It
+       returns  TRUE  if  the  terminal  supports  colors and can
+       change their definitions; other, it returns  FALSE.   This
+       routine facilitates writing terminal-independent programs.
+
+
+

    init_pair

            The  init_pair  routine changes the definition of a color-
        pair.  It takes three arguments: the number of the  color-
        pair  to  be changed, the foreground color number, and the
@@ -228,156 +282,159 @@
        changed to the new definition.
 
        As  an  extension,  ncurses allows you to set color pair 0
-       via the assume_default_colors routine, or to  specify  the
-       use  of  default colors (color number -1) if you first in-
-       voke the use_default_colors routine.
+       via the assume_default_colors(3x) routine, or  to  specify
+       the  use  of default colors (color number -1) if you first
+       invoke the use_default_colors(3x) routine.
+
 
+

    init_color

            The init_color routine changes the definition of a  color.
        It  takes  four  arguments:  the number of the color to be
        changed followed by three RGB values (for the  amounts  of
-       red, green, and blue components).  The first argument must
-       be a legal color value; default  colors  are  not  allowed
-       here.   (See  the section Colors for the default color in-
-       dex.)  Each of the last three arguments must be a value in
-       the  range  0  through 1000.  When init_color is used, all
-       occurrences of that color on the screen immediately change
-       to the new definition.
+       red, green, and blue components).
 
-       The  has_colors routine requires no arguments.  It returns
-       TRUE if the terminal can manipulate colors; otherwise,  it
-       returns FALSE.  This routine facilitates writing terminal-
-       independent programs.  For example, a programmer  can  use
-       it  to decide whether to use color or some other video at-
-       tribute.
+       o   The  first  argument  must be a legal color value; de-
+           fault colors are not allowed here.  (See  the  section
+           Colors for the default color index.)
+
+       o   Each  of  the  last three arguments must be a value in
+           the range 0 through 1000.
+
+       When init_color is used, all occurrences of that color  on
+       the screen immediately change to the new definition.
 
-       The can_change_color routine requires  no  arguments.   It
-       returns  TRUE  if  the  terminal  supports  colors and can
-       change their definitions; other, it returns  FALSE.   This
-       routine facilitates writing terminal-independent programs.
 
+

    color_content

            The  color_content routine gives programmers a way to find
        the intensity of the red, green, and blue (RGB) components
        in a color.  It requires four arguments: the color number,
        and three addresses of shorts for storing the  information
        about  the  amounts  of red, green, and blue components in
-       the given color.  The first argument must be a legal color
-       value,  i.e.,  0  through COLORS-1, inclusive.  The values
-       that are stored at the addresses pointed to  by  the  last
-       three  arguments are in the range 0 (no component) through
-       1000 (maximum amount of component), inclusive.
+       the given color.
 
+       o   The first argument must be a legal color value,  i.e.,
+           0 through COLORS-1, inclusive.
+
+       o   The values that are stored at the addresses pointed to
+           by the last three arguments are in  the  range  0  (no
+           component) through 1000 (maximum amount of component),
+           inclusive.
+
+
+

    pair_content

            The pair_content routine allows programmers  to  find  out
        what  colors  a given color-pair consists of.  It requires
        three arguments: the color-pair number, and two  addresses
        of  shorts  for  storing the foreground and the background
-       color numbers.  The first argument must be a  legal  color
-       value,  i.e., in the range 1 through COLOR_PAIRS-1, inclu-
-       sive.  The values that are stored at the addresses pointed
-       to  by  the  second and third arguments are in the range 0
-       through COLORS, inclusive.
+       color numbers.
 
-       PAIR_NUMBER(attrs) extracts the color value from its attrs
-       parameter  and returns it as a color pair number.  Its in-
-       verse COLOR_PAIR(n) converts a color pair number to an at-
-       tribute.   Attributes  can hold color pairs in the range 0
-       to 255.  If you need a color pair larger  than  that,  you
-       must  use functions such as attr_set (which pass the color
-       pair as a separate parameter) rather than the legacy func-
-       tions such as attrset.
+       o   The first argument must be a legal color value,  i.e.,
+           in the range 1 through COLOR_PAIRS-1, inclusive.
 
+       o   The values that are stored at the addresses pointed to
+           by the second and third arguments are in the  range  0
+           through COLORS, inclusive.
 
-

    Colors

    -       In <curses.h> the following macros are defined.  These are
-       the standard colors (ISO-6429).  curses also assumes  that
-       COLOR_BLACK is the default background color for all termi-
-       nals.
 
-             COLOR_BLACK
-             COLOR_RED
-             COLOR_GREEN
-             COLOR_YELLOW
-             COLOR_BLUE
-             COLOR_MAGENTA
-             COLOR_CYAN
-             COLOR_WHITE
+

    PAIR_NUMBER

    +       PAIR_NUMBER(attrs) extracts the color value from its attrs
+       parameter and returns it as a color pair number.
+
+
+

    COLOR_PAIR

    +       Its inverse COLOR_PAIR(n) converts a color pair number  to
+       an  attribute.   Attributes  can  hold  color pairs in the
+       range 0 to 255.  If you need  a  color  pair  larger  than
+       that,  you must use functions such as attr_set (which pass
+       the color pair as a separate parameter)  rather  than  the
+       legacy functions such as attrset.

    RETURN VALUE

    -       The routines can_change_color and has_colors  return  TRUE
+       The  routines  can_change_color and has_colors return TRUE
        or FALSE.
 
        All other routines return the integer ERR upon failure and
-       an OK (SVr4 specifies only "an integer  value  other  than
+       an  OK  (SVr4  specifies only "an integer value other than
        ERR") upon successful completion.
 
-       X/Open  defines  no error conditions.  This implementation
-       will return ERR on attempts to use  color  values  outside
-       the range 0 to COLORS-1 (except for the default colors ex-
-       tension), or use color pairs outside the range 0  to  COL-
-       OR_PAIRS-1.   Color  values  used in init_color must be in
-       the range 0 to 1000.  An error is returned from all  func-
-       tions  if the terminal has not been initialized.  An error
-       is returned from secondary functions such as init_pair  if
+       X/Open defines no error conditions.   This  implementation
+       will  return  ERR  on attempts to use color values outside
+       the range 0 to COLORS-1 (except for the default colors ex-
+       tension),  or  use color pairs outside the range 0 to COL-
+       OR_PAIRS-1.  Color values used in init_color  must  be  in
+       the  range 0 to 1000.  An error is returned from all func-
+       tions if the terminal has not been initialized.  An  error
+       is  returned from secondary functions such as init_pair if
        start_color was not called.
 
           init_color
-               returns  an error if the terminal does not support
-               this feature, e.g., if the initialize_color  capa-
+               returns an error if the terminal does not  support
+               this  feature, e.g., if the initialize_color capa-
                bility is absent from the terminal description.
 
           start_color
-               returns  an error if the color table cannot be al-
+               returns an error if the color table cannot be  al-
                located.

    NOTES

    -       In the ncurses implementation, there is a  separate  color
+       In  the  ncurses implementation, there is a separate color
        activation flag, color palette, color pairs table, and as-
-       sociated COLORS and COLOR_PAIRS counts  for  each  screen;
-       the  start_color function only affects the current screen.
+       sociated  COLORS  and  COLOR_PAIRS counts for each screen;
+       the start_color function only affects the current  screen.
        The SVr4/XSI interface is not really designed with this in
-       mind,  and  historical  implementations  may  use a single
+       mind, and historical  implementations  may  use  a  single
        shared color palette.
 
-       Note that setting an implicit background color via a color
-       pair  affects  only character cells that a character write
-       operation explicitly touches.  To  change  the  background
-       color  used  when parts of a window are blanked by erasing
-       or scrolling operations, see curs_bkgd(3x).
+       Setting  an implicit background color via a color pair af-
+       fects only character cells that a character  write  opera-
+       tion  explicitly  touches.  To change the background color
+       used when parts of a window  are  blanked  by  erasing  or
+       scrolling operations, see curs_bkgd(3x).
 
-       Several caveats apply on 386 and 486  machines  with  VGA-
-       compatible graphics:
+       Several  caveats  apply on older x86 machines (e.g., i386,
+       i486) with VGA-compatible graphics:
 
-       o   COLOR_YELLOW  is  actually  brown.  To get yellow, use
+       o   COLOR_YELLOW is actually brown.  To  get  yellow,  use
            COLOR_YELLOW combined with the A_BOLD attribute.
 
        o   The A_BLINK attribute should in theory cause the back-
-           ground  to  go  bright.  This often fails to work, and
+           ground to go bright.  This often fails  to  work,  and
            even some cards for which it mostly works (such as the
-           Paradise  and compatibles) do the wrong thing when you
-           try to set a bright "yellow"  background  (you  get  a
+           Paradise and compatibles) do the wrong thing when  you
+           try  to  set  a  bright "yellow" background (you get a
            blinking yellow foreground instead).
 
        o   Color RGB values are not settable.

    PORTABILITY

    -       This  implementation  satisfies XSI Curses's minimum maxi-
+       This implementation satisfies XSI Curses's  minimum  maxi-
        mums for COLORS and COLOR_PAIRS.
 
-       The init_pair routine accepts  negative  values  of  fore-
-       ground   and  background  color  to  support  the  use_de-
-       fault_colors extension, but only if that routine has  been
-       first invoked.
+       The  init_pair  routine  accepts  negative values of fore-
+       ground  and  background  color  to  support  the   use_de-
+       fault_colors(3x)  extension,  but only if that routine has
+       been first invoked.
 
-       The  assumption that COLOR_BLACK is the default background
-       color for all terminals can  be  modified  using  the  as-
-       sume_default_colors extension.
+       The assumption that COLOR_BLACK is the default  background
+       color  for  all  terminals  can  be modified using the as-
+       sume_default_colors(3x) extension.
 
-       This  implementation  checks  the  pointers, e.g., for the
-       values returned by  color_content  and  pair_content,  and
+       This implementation checks the  pointers,  e.g.,  for  the
+       values  returned  by  color_content  and pair_content, and
        will treat those as optional parameters when null.
 
+       X/Open Curses does not specify a limit for the  number  of
+       colors and color pairs which a terminal can support.  How-
+       ever, in its use of short for the parameters,  it  carries
+       over SVr4's implementation detail for the compiled termin-
+       fo database, which uses signed 16-bit numbers.   This  im-
+       plementation provides extended versions of those functions
+       which use short parameters, allowing applications  to  use
+       larger color- and pair-numbers.
+

    SEE ALSO

            curses(3x),  curs_initscr(3x),  curs_attr(3x),  curs_vari-
@@ -395,8 +452,26 @@
 
+
+
  • CONSTANTS
    • 
+
  • VARIABLES
+
+
    • 
+
  • FUNCTIONS
+
 
    • 
 
  • RETURN VALUE
    • 
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 224cbc66..73597971 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -117,10 +117,26 @@
            allowed.
 
 
-

    NOTES

    -       The  opts argument is reserved for future use.  Currently,
-       an application must provide a null pointer as opts.
+

    EXTENSIONS

    +       X/Open  Curses documents the opts argument as reserved for
+       future use, saying that it must be null.  This implementa-
+       tion  uses that parameter in ABI 6 for the functions which
+       have a color-pair  parameter  to  support  extended  color
+       pairs:
+
+       o   For   functions   which  modify the color, e.g., setc-
+           char, if opts is set it is treated  as  a  pointer  to
+           int,  and used to  set  the  color pair instead of the
+           short pair parameter.
+
+       o   For functions which retrieve the  color,  e.g.,  getc-
+           char,  if  opts  is  set it is treated as a pointer to
+           int, and  used  to  retrieve  the color pair as an int
+           value,  in  addition  retrieving  it  via the standard
+           pointer to short parameter.
 
+
+

    NOTES

            The wcval argument may be a value generated by a  call  to
        setcchar  or by a function that has a cchar_t output argu-
        ment.  If wcval is constructed by  any  other  means,  the
@@ -157,6 +173,7 @@
 
  • setcchar
    • 
 
 
+
  • EXTENSIONS
    • 
 
  • NOTES
    • 
 
  • RETURN VALUE
    • 
 
  • SEE ALSO
    • 
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 2fa0762c..7e26b7f7 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -105,7 +105,7 @@

    SEE ALSO

    -       curses(3x), printf(3), vprintf(3).
+       curses(3x), printf(3), vprintf(3).
 
 
 
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 40efdb9f..2a823bde 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.29 2017/03/18 01:00:30 tom Exp @
+  * @Id: curs_slk.3x,v 1.31 2017/03/31 11:09:28 tom Exp @
 -->
 
 
@@ -49,19 +49,19 @@
        slk_init, slk_set, slk_wset, slk_refresh, slk_noutrefresh,
        slk_label, slk_clear, slk_restore, slk_touch, slk_attron,
        slk_attrset, slk_attroff, slk_attr_on, slk_attr_set,
-       slk_attr_off, slk_attr, slk_color - curses soft label
-       routines
+       slk_attr_off, slk_attr, slk_color, extended_slk_color -
+       curses soft label routines

    SYNOPSIS

            #include <curses.h>
 
-       int slk_init(int fmt);
+       int slk_init(int fmt);
 
-       int slk_set(int labnum, const char *label, int fmt);
-       int slk_wset(int labnum, const wchar_t *label, int fmt);
+       int slk_set(int labnum, const char *label, int fmt);
+       int slk_wset(int labnum, const wchar_t *label, int fmt);
 
-       char *slk_label(int labnum);
+       char *slk_label(int labnum);
 
        int slk_refresh(void);
        int slk_noutrefresh(void);
@@ -69,17 +69,19 @@
        int slk_restore(void);
        int slk_touch(void);
 
-       int slk_attron(const chtype attrs);
-       int slk_attroff(const chtype attrs);
-       int slk_attrset(const chtype attrs);
-       int slk_attr_on(attr_t attrs, void* opts);
-       int slk_attr_off(const attr_t attrs, void * opts);
-       int  slk_attr_set(const  attr_t  attrs,  short pair, void*
-       opts);
+       int slk_attron(const chtype attrs);
+       int slk_attroff(const chtype attrs);
+       int slk_attrset(const chtype attrs);
+       int slk_attr_on(attr_t attrs, void* opts);
+       int slk_attr_off(const attr_t attrs, void * opts);
+       int  slk_attr_set(const  attr_t  attrs,  short pair, void*
+       opts);
 
        attr_t slk_attr(void);
 
-       int slk_color(short pair);
+       int slk_color(short pair);
+       /* extension */
+       int extended_slk_color(int pair);

    DESCRIPTION

    @@ -163,13 +165,18 @@
        effect  only  if  soft  labels are simulated on the bottom
        line of the screen.
 
+       Because slk_color accepts only short (signed 16-bit  inte-
+       ger)   values,   this   implementation   provides  extend-
+       ed_slk_color  which  accepts  an  integer   value,   e.g.,
+       32-bits.
+

    RETURN VALUE

            These routines return ERR upon failure and OK (SVr4 speci-
        fies only "an integer value other than ERR") upon success-
        ful completion.
 
-       X/Open defines no error conditions.  In  this  implementa-
+       X/Open  defines  no error conditions.  In this implementa-
        tion
 
           slk_attr
@@ -177,38 +184,51 @@
 
           slk_attroff, slk_attron, slk_clear, slk_noutrefresh,
           slk_refresh, slk_touch
-               return an error if the terminal  or  the  softkeys
+               return  an  error  if the terminal or the softkeys
                were not initialized.
 
           slk_attrset
-               returns  an  error if the terminal or the softkeys
+               returns an error if the terminal or  the  softkeys
                were not initialized.
 
           slk_attr_set
-               returns an error if the terminal or  the  softkeys
+               returns  an  error if the terminal or the softkeys
                were not initialized, or the color pair is outside
-               the range 0..COLOR_PAIRS-1, or opts is not null.
+               the range 0..COLOR_PAIRS-1.
 
           slk_color
-               returns an error if the terminal or  the  softkeys
+               returns  an  error if the terminal or the softkeys
                were not initialized, or the color pair is outside
                the range 0..COLOR_PAIRS-1.
 
           slk_init
-               returns an error if the format parameter  is  out-
+               returns  an  error if the format parameter is out-
                side the range 0..3.
 
           slk_label
                returns NULL on error.
 
           slk_set
-               returns  an  error if the terminal or the softkeys
-               were not initialized, or the labnum  parameter  is
-               outside  the range of label counts, or if the for-
-               mat parameter is outside the  range  0..2,  or  if
+               returns an error if the terminal or  the  softkeys
+               were  not  initialized, or the labnum parameter is
+               outside the range of label counts, or if the  for-
+               mat  parameter  is  outside  the range 0..2, or if
                memory for the labels cannot be allocated.
 
 
+

    EXTENSIONS

    +       X/Open Curses documents the opts argument as reserved  for
+       future use, saying that it must be null.  This implementa-
+       tion uses that parameter in ABI 6 for the functions  which
+       have  a  color-pair  parameter  to  support extended color
+       pairs.
+
+       For  functions  which  modify  the  color,  e.g.,  slk_at-
+       tr_set,  if opts is set it is treated as a pointer to int,
+       and used to  set  the  color pair  instead  of  the  short
+       pair parameter.
+
+

    NOTES

            Most applications would use slk_noutrefresh because a wre-
        fresh is likely to follow soon.
@@ -218,13 +238,17 @@
        The XSI Curses standard, Issue 4, described  the  soft-key
        functions, with some differences from SVr4 curses:
 
-       o   It added functions like the SVr4 the attribute-manipu-
-           lation functions slk_attron, slk_attroff,  slk_attrset
-           which  use  attr_t  parameters,  along with a reserved
-           opts parameter.
+       o   It  added  functions like the SVr4 attribute-manipula-
+           tion functions slk_attron,  slk_attroff,  slk_attrset,
+           but  which use attr_t parameters (rather than chtype),
+           along with a reserved opts parameter.
+
+           Two of these new functions (unlike the SVr4 functions)
+           have  no  provision for color: slk_attr_on and slk_at-
+           tr_off.
 
-           One of these new functions (slk_attr_set) also  has  a
-           color-pair parameter.
+           The third function (slk_attr_set) has a color-pair pa-
+           rameter.
 
        o   It  added const qualifiers to parameters (unnecessari-
            ly), and
@@ -234,9 +258,18 @@
        The format codes 2 and 3 for  slk_init  and  the  function
        slk_attr are specific to ncurses.
 
+       X/Open  Curses  does not specify a limit for the number of
+       colors and color pairs which a terminal can support.  How-
+       ever,  in  its use of short for the parameters, it carries
+       over SVr4's implementation detail for the compiled termin-
+       fo  database,  which uses signed 16-bit numbers.  This im-
+       plementation provides extended versions of those functions
+       which  use  short parameters, allowing applications to use
+       larger color- and pair-numbers.
+

    SEE ALSO

    -       curses(3x),   curs_attr(3x),   curs_initscr(3x),  curs_re-
+       curses(3x),  curs_attr(3x),   curs_initscr(3x),   curs_re-
        fresh(3x), curs_variables(3x).
 
 
@@ -257,6 +290,7 @@
 
 
 
  • RETURN VALUE
    • 
+
  • EXTENSIONS
    • 
 
  • NOTES
    • 
 
  • PORTABILITY
    • 
 
  • SEE ALSO
    • 
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index db948fe0..527a22a7 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -60,7 +60,7 @@
        sonable optimization.  This implementation is "new curses"
        (ncurses) and is the approved replacement for 4.4BSD clas-
        sic  curses,  which has been discontinued.  This describes
-       ncurses version 6.0 (patch 20170318).
+       ncurses version 6.0 (patch 20170401).
 
        The ncurses library emulates the curses library of  System
        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
@@ -298,460 +298,465 @@
        flagged with "*" are ncurses-specific,  not  described  by
        XPG4 or present in SVr4.
 
-              curses Routine Name     Manual Page Name
-              --------------------------------------------
-              COLOR_PAIR              curs_color(3x)
-              PAIR_NUMBER             curs_attr(3x)
-              _nc_free_and_exit       curs_memleaks(3x)*
-              _nc_freeall             curs_memleaks(3x)*
-              _nc_tracebits           curs_trace(3x)*
-              _traceattr              curs_trace(3x)*
-              _traceattr2             curs_trace(3x)*
-              _tracechar              curs_trace(3x)*
-              _tracechtype            curs_trace(3x)*
-              _tracechtype2           curs_trace(3x)*
-              _tracedump              curs_trace(3x)*
-              _tracef                 curs_trace(3x)*
-
-              _tracemouse             curs_trace(3x)*
-              add_wch                 curs_add_wch(3x)
-              add_wchnstr             curs_add_wchstr(3x)
-              add_wchstr              curs_add_wchstr(3x)
-              addch                   curs_addch(3x)
-              addchnstr               curs_addchstr(3x)
-              addchstr                curs_addchstr(3x)
-              addnstr                 curs_addstr(3x)
-              addnwstr                curs_addwstr(3x)
-              addstr                  curs_addstr(3x)
-              addwstr                 curs_addwstr(3x)
-              alloc_pair              new_pair(3x)*
-              assume_default_colors   default_colors(3x)*
-              attr_get                curs_attr(3x)
-              attr_off                curs_attr(3x)
-              attr_on                 curs_attr(3x)
-              attr_set                curs_attr(3x)
-              attroff                 curs_attr(3x)
-              attron                  curs_attr(3x)
-              attrset                 curs_attr(3x)
-              baudrate                curs_termattrs(3x)
-              beep                    curs_beep(3x)
-              bkgd                    curs_bkgd(3x)
-              bkgdset                 curs_bkgd(3x)
-              bkgrnd                  curs_bkgrnd(3x)
-              bkgrndset               curs_bkgrnd(3x)
-              border                  curs_border(3x)
-              border_set              curs_border_set(3x)
-              box                     curs_border(3x)
-              box_set                 curs_border_set(3x)
-              can_change_color        curs_color(3x)
-              cbreak                  curs_inopts(3x)
-              chgat                   curs_attr(3x)
-              clear                   curs_clear(3x)
-              clearok                 curs_outopts(3x)
-              clrtobot                curs_clear(3x)
-              clrtoeol                curs_clear(3x)
-              color_content           curs_color(3x)
-              color_set               curs_attr(3x)
-              copywin                 curs_overlay(3x)
-              curs_set                curs_kernel(3x)
-              curses_version          curs_extend(3x)*
-              def_prog_mode           curs_kernel(3x)
-              def_shell_mode          curs_kernel(3x)
-              define_key              define_key(3x)*
-              del_curterm             curs_terminfo(3x)
-              delay_output            curs_util(3x)
-              delch                   curs_delch(3x)
-              deleteln                curs_deleteln(3x)
-              delscreen               curs_initscr(3x)
-              delwin                  curs_window(3x)
-              derwin                  curs_window(3x)
-              doupdate                curs_refresh(3x)
-              dupwin                  curs_window(3x)
-              echo                    curs_inopts(3x)
-              echo_wchar              curs_add_wch(3x)
-              echochar                curs_addch(3x)
-              endwin                  curs_initscr(3x)
-              erase                   curs_clear(3x)
-              erasechar               curs_termattrs(3x)
-              erasewchar              curs_termattrs(3x)
-              filter                  curs_util(3x)
-              find_pair               new_pair(3x)*
-              flash                   curs_beep(3x)
-              flushinp                curs_util(3x)
-
-              free_pair               new_pair(3x)*
-              get_wch                 curs_get_wch(3x)
-              get_wstr                curs_get_wstr(3x)
-              getattrs                curs_attr(3x)
-              getbegx                 curs_legacy(3x)*
-              getbegy                 curs_legacy(3x)*
-              getbegyx                curs_getyx(3x)
-              getbkgd                 curs_bkgd(3x)
-              getbkgrnd               curs_bkgrnd(3x)
-              getcchar                curs_getcchar(3x)
-              getch                   curs_getch(3x)
-              getcurx                 curs_legacy(3x)*
-              getcury                 curs_legacy(3x)*
-              getmaxx                 curs_legacy(3x)*
-              getmaxy                 curs_legacy(3x)*
-              getmaxyx                curs_getyx(3x)
-              getmouse                curs_mouse(3x)*
-              getn_wstr               curs_get_wstr(3x)
-              getnstr                 curs_getstr(3x)
-              getparx                 curs_legacy(3x)*
-              getpary                 curs_legacy(3x)*
-              getparyx                curs_getyx(3x)
-              getstr                  curs_getstr(3x)
-              getsyx                  curs_kernel(3x)
-              getwin                  curs_util(3x)
-              getyx                   curs_getyx(3x)
-              halfdelay               curs_inopts(3x)
-              has_colors              curs_color(3x)
-              has_ic                  curs_termattrs(3x)
-              has_il                  curs_termattrs(3x)
-              has_key                 curs_getch(3x)*
-              hline                   curs_border(3x)
-              hline_set               curs_border_set(3x)
-              idcok                   curs_outopts(3x)
-              idlok                   curs_outopts(3x)
-              immedok                 curs_outopts(3x)
-              in_wch                  curs_in_wch(3x)
-              in_wchnstr              curs_in_wchstr(3x)
-              in_wchstr               curs_in_wchstr(3x)
-              inch                    curs_inch(3x)
-              inchnstr                curs_inchstr(3x)
-              inchstr                 curs_inchstr(3x)
-              init_color              curs_color(3x)
-              init_pair               curs_color(3x)
-              initscr                 curs_initscr(3x)
-              innstr                  curs_instr(3x)
-              innwstr                 curs_inwstr(3x)
-              ins_nwstr               curs_ins_wstr(3x)
-              ins_wch                 curs_ins_wch(3x)
-              ins_wstr                curs_ins_wstr(3x)
-              insch                   curs_insch(3x)
-              insdelln                curs_deleteln(3x)
-              insertln                curs_deleteln(3x)
-              insnstr                 curs_insstr(3x)
-              insstr                  curs_insstr(3x)
-              instr                   curs_instr(3x)
-              intrflush               curs_inopts(3x)
-              inwstr                  curs_inwstr(3x)
-              is_cleared              curs_opaque(3x)*
-              is_idcok                curs_opaque(3x)*
-              is_idlok                curs_opaque(3x)*
-              is_immedok              curs_opaque(3x)*
-              is_keypad               curs_opaque(3x)*
-              is_leaveok              curs_opaque(3x)*
-              is_linetouched          curs_touch(3x)
-
-              is_nodelay              curs_opaque(3x)*
-              is_notimeout            curs_opaque(3x)*
-              is_pad                  curs_opaque(3x)*
-              is_scrollok             curs_opaque(3x)*
-              is_subwin               curs_opaque(3x)*
-              is_syncok               curs_opaque(3x)*
-              is_term_resized         resizeterm(3x)*
-              is_wintouched           curs_touch(3x)
-              isendwin                curs_initscr(3x)
-              key_defined             key_defined(3x)*
-              key_name                curs_util(3x)
-              keybound                keybound(3x)*
-              keyname                 curs_util(3x)
-              keyok                   keyok(3x)*
-              keypad                  curs_inopts(3x)
-              killchar                curs_termattrs(3x)
-              killwchar               curs_termattrs(3x)
-              leaveok                 curs_outopts(3x)
-              longname                curs_termattrs(3x)
-              mcprint                 curs_print(3x)*
-              meta                    curs_inopts(3x)
-              mouse_trafo             curs_mouse(3x)*
-              mouseinterval           curs_mouse(3x)*
-              mousemask               curs_mouse(3x)*
-              move                    curs_move(3x)
-              mvadd_wch               curs_add_wch(3x)
-              mvadd_wchnstr           curs_add_wchstr(3x)
-              mvadd_wchstr            curs_add_wchstr(3x)
-              mvaddch                 curs_addch(3x)
-              mvaddchnstr             curs_addchstr(3x)
-              mvaddchstr              curs_addchstr(3x)
-              mvaddnstr               curs_addstr(3x)
-              mvaddnwstr              curs_addwstr(3x)
-              mvaddstr                curs_addstr(3x)
-              mvaddwstr               curs_addwstr(3x)
-              mvchgat                 curs_attr(3x)
-              mvcur                   curs_terminfo(3x)
-              mvdelch                 curs_delch(3x)
-              mvderwin                curs_window(3x)
-              mvget_wch               curs_get_wch(3x)
-              mvget_wstr              curs_get_wstr(3x)
-              mvgetch                 curs_getch(3x)
-              mvgetn_wstr             curs_get_wstr(3x)
-              mvgetnstr               curs_getstr(3x)
-              mvgetstr                curs_getstr(3x)
-              mvhline                 curs_border(3x)
-              mvhline_set             curs_border_set(3x)
-              mvin_wch                curs_in_wch(3x)
-              mvin_wchnstr            curs_in_wchstr(3x)
-              mvin_wchstr             curs_in_wchstr(3x)
-              mvinch                  curs_inch(3x)
-              mvinchnstr              curs_inchstr(3x)
-              mvinchstr               curs_inchstr(3x)
-              mvinnstr                curs_instr(3x)
-              mvinnwstr               curs_inwstr(3x)
-              mvins_nwstr             curs_ins_wstr(3x)
-              mvins_wch               curs_ins_wch(3x)
-              mvins_wstr              curs_ins_wstr(3x)
-              mvinsch                 curs_insch(3x)
-              mvinsnstr               curs_insstr(3x)
-              mvinsstr                curs_insstr(3x)
-              mvinstr                 curs_instr(3x)
-              mvinwstr                curs_inwstr(3x)
-              mvprintw                curs_printw(3x)
-              mvscanw                 curs_scanw(3x)
-
-              mvvline                 curs_border(3x)
-              mvvline_set             curs_border_set(3x)
-              mvwadd_wch              curs_add_wch(3x)
-              mvwadd_wchnstr          curs_add_wchstr(3x)
-              mvwadd_wchstr           curs_add_wchstr(3x)
-              mvwaddch                curs_addch(3x)
-              mvwaddchnstr            curs_addchstr(3x)
-              mvwaddchstr             curs_addchstr(3x)
-              mvwaddnstr              curs_addstr(3x)
-              mvwaddnwstr             curs_addwstr(3x)
-              mvwaddstr               curs_addstr(3x)
-              mvwaddwstr              curs_addwstr(3x)
-              mvwchgat                curs_attr(3x)
-              mvwdelch                curs_delch(3x)
-              mvwget_wch              curs_get_wch(3x)
-              mvwget_wstr             curs_get_wstr(3x)
-              mvwgetch                curs_getch(3x)
-              mvwgetn_wstr            curs_get_wstr(3x)
-              mvwgetnstr              curs_getstr(3x)
-              mvwgetstr               curs_getstr(3x)
-              mvwhline                curs_border(3x)
-              mvwhline_set            curs_border_set(3x)
-              mvwin                   curs_window(3x)
-              mvwin_wch               curs_in_wch(3x)
-              mvwin_wchnstr           curs_in_wchstr(3x)
-              mvwin_wchstr            curs_in_wchstr(3x)
-              mvwinch                 curs_inch(3x)
-              mvwinchnstr             curs_inchstr(3x)
-              mvwinchstr              curs_inchstr(3x)
-              mvwinnstr               curs_instr(3x)
-              mvwinnwstr              curs_inwstr(3x)
-              mvwins_nwstr            curs_ins_wstr(3x)
-              mvwins_wch              curs_ins_wch(3x)
-              mvwins_wstr             curs_ins_wstr(3x)
-              mvwinsch                curs_insch(3x)
-              mvwinsnstr              curs_insstr(3x)
-              mvwinsstr               curs_insstr(3x)
-              mvwinstr                curs_instr(3x)
-              mvwinwstr               curs_inwstr(3x)
-              mvwprintw               curs_printw(3x)
-              mvwscanw                curs_scanw(3x)
-              mvwvline                curs_border(3x)
-              mvwvline_set            curs_border_set(3x)
-              napms                   curs_kernel(3x)
-              newpad                  curs_pad(3x)
-              newterm                 curs_initscr(3x)
-              newwin                  curs_window(3x)
-              nl                      curs_outopts(3x)
-              nocbreak                curs_inopts(3x)
-              nodelay                 curs_inopts(3x)
-              noecho                  curs_inopts(3x)
-              nofilter                curs_util(3x)*
-              nonl                    curs_outopts(3x)
-              noqiflush               curs_inopts(3x)
-              noraw                   curs_inopts(3x)
-              notimeout               curs_inopts(3x)
-              overlay                 curs_overlay(3x)
-              overwrite               curs_overlay(3x)
-              pair_content            curs_color(3x)
-              pechochar               curs_pad(3x)
-              pnoutrefresh            curs_pad(3x)
-              prefresh                curs_pad(3x)
-              printw                  curs_printw(3x)
-              putp                    curs_terminfo(3x)
-              putwin                  curs_util(3x)
-
-              qiflush                 curs_inopts(3x)
-              raw                     curs_inopts(3x)
-              redrawwin               curs_refresh(3x)
-              refresh                 curs_refresh(3x)
-              reset_prog_mode         curs_kernel(3x)
-              reset_shell_mode        curs_kernel(3x)
-              resetty                 curs_kernel(3x)
-              resize_term             resizeterm(3x)*
-              resizeterm              resizeterm(3x)*
-              restartterm             curs_terminfo(3x)
-              ripoffline              curs_kernel(3x)
-              savetty                 curs_kernel(3x)
-              scanw                   curs_scanw(3x)
-              scr_dump                curs_scr_dump(3x)
-              scr_init                curs_scr_dump(3x)
-              scr_restore             curs_scr_dump(3x)
-              scr_set                 curs_scr_dump(3x)
-              scrl                    curs_scroll(3x)
-              scroll                  curs_scroll(3x)
-              scrollok                curs_outopts(3x)
-              set_curterm             curs_terminfo(3x)
-              set_term                curs_initscr(3x)
-              setcchar                curs_getcchar(3x)
-              setscrreg               curs_outopts(3x)
-              setsyx                  curs_kernel(3x)
-              setterm                 curs_terminfo(3x)
-              setupterm               curs_terminfo(3x)
-              slk_attr                curs_slk(3x)*
-              slk_attr_off            curs_slk(3x)
-              slk_attr_on             curs_slk(3x)
-              slk_attr_set            curs_slk(3x)
-              slk_attroff             curs_slk(3x)
-              slk_attron              curs_slk(3x)
-              slk_attrset             curs_slk(3x)
-              slk_clear               curs_slk(3x)
-              slk_color               curs_slk(3x)
-              slk_init                curs_slk(3x)
-              slk_label               curs_slk(3x)
-              slk_noutrefresh         curs_slk(3x)
-              slk_refresh             curs_slk(3x)
-              slk_restore             curs_slk(3x)
-              slk_set                 curs_slk(3x)
-              slk_touch               curs_slk(3x)
-              standend                curs_attr(3x)
-              standout                curs_attr(3x)
-              start_color             curs_color(3x)
-              subpad                  curs_pad(3x)
-              subwin                  curs_window(3x)
-              syncok                  curs_window(3x)
-              term_attrs              curs_termattrs(3x)
-              termattrs               curs_termattrs(3x)
-              termname                curs_termattrs(3x)
-              tgetent                 curs_termcap(3x)
-              tgetflag                curs_termcap(3x)
-              tgetnum                 curs_termcap(3x)
-              tgetstr                 curs_termcap(3x)
-              tgoto                   curs_termcap(3x)
-              tigetflag               curs_terminfo(3x)
-              tigetnum                curs_terminfo(3x)
-              tigetstr                curs_terminfo(3x)
-              tiparm                  curs_terminfo(3x)*
-              timeout                 curs_inopts(3x)
-              touchline               curs_touch(3x)
-              touchwin                curs_touch(3x)
-              tparm                   curs_terminfo(3x)
-
-              tputs                   curs_termcap(3x)
-              tputs                   curs_terminfo(3x)
-              trace                   curs_trace(3x)*
-              typeahead               curs_inopts(3x)
-              unctrl                  curs_util(3x)
-              unget_wch               curs_get_wch(3x)
-              ungetch                 curs_getch(3x)
-              ungetmouse              curs_mouse(3x)*
-              untouchwin              curs_touch(3x)
-              use_default_colors      default_colors(3x)*
-              use_env                 curs_util(3x)
-              use_extended_names      curs_extend(3x)*
-              use_legacy_coding       legacy_coding(3x)*
-              use_tioctl              curs_util(3x)
-              vid_attr                curs_terminfo(3x)
-              vid_puts                curs_terminfo(3x)
-              vidattr                 curs_terminfo(3x)
-              vidputs                 curs_terminfo(3x)
-              vline                   curs_border(3x)
-              vline_set               curs_border_set(3x)
-              vw_printw               curs_printw(3x)
-              vw_scanw                curs_scanw(3x)
-              vwprintw                curs_printw(3x)
-              vwscanw                 curs_scanw(3x)
-              wadd_wch                curs_add_wch(3x)
-              wadd_wchnstr            curs_add_wchstr(3x)
-              wadd_wchstr             curs_add_wchstr(3x)
-              waddch                  curs_addch(3x)
-              waddchnstr              curs_addchstr(3x)
-              waddchstr               curs_addchstr(3x)
-              waddnstr                curs_addstr(3x)
-              waddnwstr               curs_addwstr(3x)
-              waddstr                 curs_addstr(3x)
-              waddwstr                curs_addwstr(3x)
-              wattr_get               curs_attr(3x)
-              wattr_off               curs_attr(3x)
-              wattr_on                curs_attr(3x)
-              wattr_set               curs_attr(3x)
-              wattroff                curs_attr(3x)
-              wattron                 curs_attr(3x)
-              wattrset                curs_attr(3x)
-              wbkgd                   curs_bkgd(3x)
-              wbkgdset                curs_bkgd(3x)
-              wbkgrnd                 curs_bkgrnd(3x)
-              wbkgrndset              curs_bkgrnd(3x)
-              wborder                 curs_border(3x)
-              wborder_set             curs_border_set(3x)
-              wchgat                  curs_attr(3x)
-              wclear                  curs_clear(3x)
-              wclrtobot               curs_clear(3x)
-              wclrtoeol               curs_clear(3x)
-              wcolor_set              curs_attr(3x)
-              wcursyncup              curs_window(3x)
-              wdelch                  curs_delch(3x)
-              wdeleteln               curs_deleteln(3x)
-              wecho_wchar             curs_add_wch(3x)
-              wechochar               curs_addch(3x)
-              wenclose                curs_mouse(3x)*
-              werase                  curs_clear(3x)
-              wget_wch                curs_get_wch(3x)
-              wget_wstr               curs_get_wstr(3x)
-              wgetbkgrnd              curs_bkgrnd(3x)
-              wgetch                  curs_getch(3x)
-              wgetdelay               curs_opaque(3x)*
-              wgetn_wstr              curs_get_wstr(3x)
-
-              wgetnstr                curs_getstr(3x)
-              wgetparent              curs_opaque(3x)*
-              wgetscrreg              curs_opaque(3x)*
-              wgetstr                 curs_getstr(3x)
-              whline                  curs_border(3x)
-              whline_set              curs_border_set(3x)
-              win_wch                 curs_in_wch(3x)
-              win_wchnstr             curs_in_wchstr(3x)
-              win_wchstr              curs_in_wchstr(3x)
-              winch                   curs_inch(3x)
-              winchnstr               curs_inchstr(3x)
-              winchstr                curs_inchstr(3x)
-              winnstr                 curs_instr(3x)
-              winnwstr                curs_inwstr(3x)
-              wins_nwstr              curs_ins_wstr(3x)
-              wins_wch                curs_ins_wch(3x)
-              wins_wstr               curs_ins_wstr(3x)
-              winsch                  curs_insch(3x)
-              winsdelln               curs_deleteln(3x)
-              winsertln               curs_deleteln(3x)
-              winsnstr                curs_insstr(3x)
-              winsstr                 curs_insstr(3x)
-              winstr                  curs_instr(3x)
-              winwstr                 curs_inwstr(3x)
-              wmouse_trafo            curs_mouse(3x)*
-              wmove                   curs_move(3x)
-              wnoutrefresh            curs_refresh(3x)
-              wprintw                 curs_printw(3x)
-              wredrawln               curs_refresh(3x)
-              wrefresh                curs_refresh(3x)
-              wresize                 wresize(3x)*
-              wscanw                  curs_scanw(3x)
-              wscrl                   curs_scroll(3x)
-              wsetscrreg              curs_outopts(3x)
-              wstandend               curs_attr(3x)
-              wstandout               curs_attr(3x)
-              wsyncdown               curs_window(3x)
-              wsyncup                 curs_window(3x)
-              wtimeout                curs_inopts(3x)
-              wtouchln                curs_touch(3x)
-              wunctrl                 curs_util(3x)
-              wvline                  curs_border(3x)
-              wvline_set              curs_border_set(3x)
+              curses Routine Name      Manual Page Name
+              ---------------------------------------------
+              COLOR_PAIR               curs_color(3x)
+              PAIR_NUMBER              curs_attr(3x)
+              _nc_free_and_exit        curs_memleaks(3x)*
+              _nc_freeall              curs_memleaks(3x)*
+              _nc_tracebits            curs_trace(3x)*
+              _traceattr               curs_trace(3x)*
+              _traceattr2              curs_trace(3x)*
+              _tracechar               curs_trace(3x)*
+              _tracechtype             curs_trace(3x)*
+              _tracechtype2            curs_trace(3x)*
+              _tracedump               curs_trace(3x)*
+              _tracef                  curs_trace(3x)*
+
+              _tracemouse              curs_trace(3x)*
+              add_wch                  curs_add_wch(3x)
+              add_wchnstr              curs_add_wchstr(3x)
+              add_wchstr               curs_add_wchstr(3x)
+              addch                    curs_addch(3x)
+              addchnstr                curs_addchstr(3x)
+              addchstr                 curs_addchstr(3x)
+              addnstr                  curs_addstr(3x)
+              addnwstr                 curs_addwstr(3x)
+              addstr                   curs_addstr(3x)
+              addwstr                  curs_addwstr(3x)
+              alloc_pair               new_pair(3x)*
+              assume_default_colors    default_colors(3x)*
+              attr_get                 curs_attr(3x)
+              attr_off                 curs_attr(3x)
+              attr_on                  curs_attr(3x)
+              attr_set                 curs_attr(3x)
+              attroff                  curs_attr(3x)
+              attron                   curs_attr(3x)
+              attrset                  curs_attr(3x)
+              baudrate                 curs_termattrs(3x)
+              beep                     curs_beep(3x)
+              bkgd                     curs_bkgd(3x)
+              bkgdset                  curs_bkgd(3x)
+              bkgrnd                   curs_bkgrnd(3x)
+              bkgrndset                curs_bkgrnd(3x)
+              border                   curs_border(3x)
+              border_set               curs_border_set(3x)
+              box                      curs_border(3x)
+              box_set                  curs_border_set(3x)
+              can_change_color         curs_color(3x)
+              cbreak                   curs_inopts(3x)
+              chgat                    curs_attr(3x)
+              clear                    curs_clear(3x)
+              clearok                  curs_outopts(3x)
+              clrtobot                 curs_clear(3x)
+              clrtoeol                 curs_clear(3x)
+              color_content            curs_color(3x)
+              color_set                curs_attr(3x)
+              copywin                  curs_overlay(3x)
+              curs_set                 curs_kernel(3x)
+              curses_version           curs_extend(3x)*
+              def_prog_mode            curs_kernel(3x)
+              def_shell_mode           curs_kernel(3x)
+              define_key               define_key(3x)*
+              del_curterm              curs_terminfo(3x)
+              delay_output             curs_util(3x)
+              delch                    curs_delch(3x)
+              deleteln                 curs_deleteln(3x)
+              delscreen                curs_initscr(3x)
+              delwin                   curs_window(3x)
+              derwin                   curs_window(3x)
+              doupdate                 curs_refresh(3x)
+              dupwin                   curs_window(3x)
+              echo                     curs_inopts(3x)
+              echo_wchar               curs_add_wch(3x)
+              echochar                 curs_addch(3x)
+              endwin                   curs_initscr(3x)
+              erase                    curs_clear(3x)
+              erasechar                curs_termattrs(3x)
+              erasewchar               curs_termattrs(3x)
+              extended_color_content   curs_color(3x)*
+              extended_pair_content    curs_color(3x)*
+              extended_slk_color       curs_slk(3x)*
+              filter                   curs_util(3x)
+
+              find_pair                new_pair(3x)*
+              flash                    curs_beep(3x)
+              flushinp                 curs_util(3x)
+              free_pair                new_pair(3x)*
+              get_wch                  curs_get_wch(3x)
+              get_wstr                 curs_get_wstr(3x)
+              getattrs                 curs_attr(3x)
+              getbegx                  curs_legacy(3x)*
+              getbegy                  curs_legacy(3x)*
+              getbegyx                 curs_getyx(3x)
+              getbkgd                  curs_bkgd(3x)
+              getbkgrnd                curs_bkgrnd(3x)
+              getcchar                 curs_getcchar(3x)
+              getch                    curs_getch(3x)
+              getcurx                  curs_legacy(3x)*
+              getcury                  curs_legacy(3x)*
+              getmaxx                  curs_legacy(3x)*
+              getmaxy                  curs_legacy(3x)*
+              getmaxyx                 curs_getyx(3x)
+              getmouse                 curs_mouse(3x)*
+              getn_wstr                curs_get_wstr(3x)
+              getnstr                  curs_getstr(3x)
+              getparx                  curs_legacy(3x)*
+              getpary                  curs_legacy(3x)*
+              getparyx                 curs_getyx(3x)
+              getstr                   curs_getstr(3x)
+              getsyx                   curs_kernel(3x)
+              getwin                   curs_util(3x)
+              getyx                    curs_getyx(3x)
+              halfdelay                curs_inopts(3x)
+              has_colors               curs_color(3x)
+              has_ic                   curs_termattrs(3x)
+              has_il                   curs_termattrs(3x)
+              has_key                  curs_getch(3x)*
+              hline                    curs_border(3x)
+              hline_set                curs_border_set(3x)
+              idcok                    curs_outopts(3x)
+              idlok                    curs_outopts(3x)
+              immedok                  curs_outopts(3x)
+              in_wch                   curs_in_wch(3x)
+              in_wchnstr               curs_in_wchstr(3x)
+              in_wchstr                curs_in_wchstr(3x)
+              inch                     curs_inch(3x)
+              inchnstr                 curs_inchstr(3x)
+              inchstr                  curs_inchstr(3x)
+              init_color               curs_color(3x)
+              init_extended_color      curs_color(3x)*
+              init_extended_pair       curs_color(3x)*
+              init_pair                curs_color(3x)
+              initscr                  curs_initscr(3x)
+              innstr                   curs_instr(3x)
+              innwstr                  curs_inwstr(3x)
+              ins_nwstr                curs_ins_wstr(3x)
+              ins_wch                  curs_ins_wch(3x)
+              ins_wstr                 curs_ins_wstr(3x)
+              insch                    curs_insch(3x)
+              insdelln                 curs_deleteln(3x)
+              insertln                 curs_deleteln(3x)
+              insnstr                  curs_insstr(3x)
+              insstr                   curs_insstr(3x)
+              instr                    curs_instr(3x)
+              intrflush                curs_inopts(3x)
+              inwstr                   curs_inwstr(3x)
+              is_cleared               curs_opaque(3x)*
+              is_idcok                 curs_opaque(3x)*
+
+              is_idlok                 curs_opaque(3x)*
+              is_immedok               curs_opaque(3x)*
+              is_keypad                curs_opaque(3x)*
+              is_leaveok               curs_opaque(3x)*
+              is_linetouched           curs_touch(3x)
+              is_nodelay               curs_opaque(3x)*
+              is_notimeout             curs_opaque(3x)*
+              is_pad                   curs_opaque(3x)*
+              is_scrollok              curs_opaque(3x)*
+              is_subwin                curs_opaque(3x)*
+              is_syncok                curs_opaque(3x)*
+              is_term_resized          resizeterm(3x)*
+              is_wintouched            curs_touch(3x)
+              isendwin                 curs_initscr(3x)
+              key_defined              key_defined(3x)*
+              key_name                 curs_util(3x)
+              keybound                 keybound(3x)*
+              keyname                  curs_util(3x)
+              keyok                    keyok(3x)*
+              keypad                   curs_inopts(3x)
+              killchar                 curs_termattrs(3x)
+              killwchar                curs_termattrs(3x)
+              leaveok                  curs_outopts(3x)
+              longname                 curs_termattrs(3x)
+              mcprint                  curs_print(3x)*
+              meta                     curs_inopts(3x)
+              mouse_trafo              curs_mouse(3x)*
+              mouseinterval            curs_mouse(3x)*
+              mousemask                curs_mouse(3x)*
+              move                     curs_move(3x)
+              mvadd_wch                curs_add_wch(3x)
+              mvadd_wchnstr            curs_add_wchstr(3x)
+              mvadd_wchstr             curs_add_wchstr(3x)
+              mvaddch                  curs_addch(3x)
+              mvaddchnstr              curs_addchstr(3x)
+              mvaddchstr               curs_addchstr(3x)
+              mvaddnstr                curs_addstr(3x)
+              mvaddnwstr               curs_addwstr(3x)
+              mvaddstr                 curs_addstr(3x)
+              mvaddwstr                curs_addwstr(3x)
+              mvchgat                  curs_attr(3x)
+              mvcur                    curs_terminfo(3x)
+              mvdelch                  curs_delch(3x)
+              mvderwin                 curs_window(3x)
+              mvget_wch                curs_get_wch(3x)
+              mvget_wstr               curs_get_wstr(3x)
+              mvgetch                  curs_getch(3x)
+              mvgetn_wstr              curs_get_wstr(3x)
+              mvgetnstr                curs_getstr(3x)
+              mvgetstr                 curs_getstr(3x)
+              mvhline                  curs_border(3x)
+              mvhline_set              curs_border_set(3x)
+              mvin_wch                 curs_in_wch(3x)
+              mvin_wchnstr             curs_in_wchstr(3x)
+              mvin_wchstr              curs_in_wchstr(3x)
+              mvinch                   curs_inch(3x)
+              mvinchnstr               curs_inchstr(3x)
+              mvinchstr                curs_inchstr(3x)
+              mvinnstr                 curs_instr(3x)
+              mvinnwstr                curs_inwstr(3x)
+              mvins_nwstr              curs_ins_wstr(3x)
+              mvins_wch                curs_ins_wch(3x)
+              mvins_wstr               curs_ins_wstr(3x)
+              mvinsch                  curs_insch(3x)
+              mvinsnstr                curs_insstr(3x)
+
+              mvinsstr                 curs_insstr(3x)
+              mvinstr                  curs_instr(3x)
+              mvinwstr                 curs_inwstr(3x)
+              mvprintw                 curs_printw(3x)
+              mvscanw                  curs_scanw(3x)
+              mvvline                  curs_border(3x)
+              mvvline_set              curs_border_set(3x)
+              mvwadd_wch               curs_add_wch(3x)
+              mvwadd_wchnstr           curs_add_wchstr(3x)
+              mvwadd_wchstr            curs_add_wchstr(3x)
+              mvwaddch                 curs_addch(3x)
+              mvwaddchnstr             curs_addchstr(3x)
+              mvwaddchstr              curs_addchstr(3x)
+              mvwaddnstr               curs_addstr(3x)
+              mvwaddnwstr              curs_addwstr(3x)
+              mvwaddstr                curs_addstr(3x)
+              mvwaddwstr               curs_addwstr(3x)
+              mvwchgat                 curs_attr(3x)
+              mvwdelch                 curs_delch(3x)
+              mvwget_wch               curs_get_wch(3x)
+              mvwget_wstr              curs_get_wstr(3x)
+              mvwgetch                 curs_getch(3x)
+              mvwgetn_wstr             curs_get_wstr(3x)
+              mvwgetnstr               curs_getstr(3x)
+              mvwgetstr                curs_getstr(3x)
+              mvwhline                 curs_border(3x)
+              mvwhline_set             curs_border_set(3x)
+              mvwin                    curs_window(3x)
+              mvwin_wch                curs_in_wch(3x)
+              mvwin_wchnstr            curs_in_wchstr(3x)
+              mvwin_wchstr             curs_in_wchstr(3x)
+              mvwinch                  curs_inch(3x)
+              mvwinchnstr              curs_inchstr(3x)
+              mvwinchstr               curs_inchstr(3x)
+              mvwinnstr                curs_instr(3x)
+              mvwinnwstr               curs_inwstr(3x)
+              mvwins_nwstr             curs_ins_wstr(3x)
+              mvwins_wch               curs_ins_wch(3x)
+              mvwins_wstr              curs_ins_wstr(3x)
+              mvwinsch                 curs_insch(3x)
+              mvwinsnstr               curs_insstr(3x)
+              mvwinsstr                curs_insstr(3x)
+              mvwinstr                 curs_instr(3x)
+              mvwinwstr                curs_inwstr(3x)
+              mvwprintw                curs_printw(3x)
+              mvwscanw                 curs_scanw(3x)
+              mvwvline                 curs_border(3x)
+              mvwvline_set             curs_border_set(3x)
+              napms                    curs_kernel(3x)
+              newpad                   curs_pad(3x)
+              newterm                  curs_initscr(3x)
+              newwin                   curs_window(3x)
+              nl                       curs_outopts(3x)
+              nocbreak                 curs_inopts(3x)
+              nodelay                  curs_inopts(3x)
+              noecho                   curs_inopts(3x)
+              nofilter                 curs_util(3x)*
+              nonl                     curs_outopts(3x)
+              noqiflush                curs_inopts(3x)
+              noraw                    curs_inopts(3x)
+              notimeout                curs_inopts(3x)
+              overlay                  curs_overlay(3x)
+              overwrite                curs_overlay(3x)
+              pair_content             curs_color(3x)
+              pechochar                curs_pad(3x)
+
+              pnoutrefresh             curs_pad(3x)
+              prefresh                 curs_pad(3x)
+              printw                   curs_printw(3x)
+              putp                     curs_terminfo(3x)
+              putwin                   curs_util(3x)
+              qiflush                  curs_inopts(3x)
+              raw                      curs_inopts(3x)
+              redrawwin                curs_refresh(3x)
+              refresh                  curs_refresh(3x)
+              reset_prog_mode          curs_kernel(3x)
+              reset_shell_mode         curs_kernel(3x)
+              resetty                  curs_kernel(3x)
+              resize_term              resizeterm(3x)*
+              resizeterm               resizeterm(3x)*
+              restartterm              curs_terminfo(3x)
+              ripoffline               curs_kernel(3x)
+              savetty                  curs_kernel(3x)
+              scanw                    curs_scanw(3x)
+              scr_dump                 curs_scr_dump(3x)
+              scr_init                 curs_scr_dump(3x)
+              scr_restore              curs_scr_dump(3x)
+              scr_set                  curs_scr_dump(3x)
+              scrl                     curs_scroll(3x)
+              scroll                   curs_scroll(3x)
+              scrollok                 curs_outopts(3x)
+              set_curterm              curs_terminfo(3x)
+              set_term                 curs_initscr(3x)
+              setcchar                 curs_getcchar(3x)
+              setscrreg                curs_outopts(3x)
+              setsyx                   curs_kernel(3x)
+              setterm                  curs_terminfo(3x)
+              setupterm                curs_terminfo(3x)
+              slk_attr                 curs_slk(3x)*
+              slk_attr_off             curs_slk(3x)
+              slk_attr_on              curs_slk(3x)
+              slk_attr_set             curs_slk(3x)
+              slk_attroff              curs_slk(3x)
+              slk_attron               curs_slk(3x)
+              slk_attrset              curs_slk(3x)
+              slk_clear                curs_slk(3x)
+              slk_color                curs_slk(3x)
+              slk_init                 curs_slk(3x)
+              slk_label                curs_slk(3x)
+              slk_noutrefresh          curs_slk(3x)
+              slk_refresh              curs_slk(3x)
+              slk_restore              curs_slk(3x)
+              slk_set                  curs_slk(3x)
+              slk_touch                curs_slk(3x)
+              standend                 curs_attr(3x)
+              standout                 curs_attr(3x)
+              start_color              curs_color(3x)
+              subpad                   curs_pad(3x)
+              subwin                   curs_window(3x)
+              syncok                   curs_window(3x)
+              term_attrs               curs_termattrs(3x)
+              termattrs                curs_termattrs(3x)
+              termname                 curs_termattrs(3x)
+              tgetent                  curs_termcap(3x)
+              tgetflag                 curs_termcap(3x)
+              tgetnum                  curs_termcap(3x)
+              tgetstr                  curs_termcap(3x)
+              tgoto                    curs_termcap(3x)
+              tigetflag                curs_terminfo(3x)
+              tigetnum                 curs_terminfo(3x)
+              tigetstr                 curs_terminfo(3x)
+
+              timeout                  curs_inopts(3x)
+              tiparm                   curs_terminfo(3x)*
+              touchline                curs_touch(3x)
+              touchwin                 curs_touch(3x)
+              tparm                    curs_terminfo(3x)
+              tputs                    curs_termcap(3x)
+              tputs                    curs_terminfo(3x)
+              trace                    curs_trace(3x)*
+              typeahead                curs_inopts(3x)
+              unctrl                   curs_util(3x)
+              unget_wch                curs_get_wch(3x)
+              ungetch                  curs_getch(3x)
+              ungetmouse               curs_mouse(3x)*
+              untouchwin               curs_touch(3x)
+              use_default_colors       default_colors(3x)*
+              use_env                  curs_util(3x)
+              use_extended_names       curs_extend(3x)*
+              use_legacy_coding        legacy_coding(3x)*
+              use_tioctl               curs_util(3x)
+              vid_attr                 curs_terminfo(3x)
+              vid_puts                 curs_terminfo(3x)
+              vidattr                  curs_terminfo(3x)
+              vidputs                  curs_terminfo(3x)
+              vline                    curs_border(3x)
+              vline_set                curs_border_set(3x)
+              vw_printw                curs_printw(3x)
+              vw_scanw                 curs_scanw(3x)
+              vwprintw                 curs_printw(3x)
+              vwscanw                  curs_scanw(3x)
+              wadd_wch                 curs_add_wch(3x)
+              wadd_wchnstr             curs_add_wchstr(3x)
+              wadd_wchstr              curs_add_wchstr(3x)
+              waddch                   curs_addch(3x)
+              waddchnstr               curs_addchstr(3x)
+              waddchstr                curs_addchstr(3x)
+              waddnstr                 curs_addstr(3x)
+              waddnwstr                curs_addwstr(3x)
+              waddstr                  curs_addstr(3x)
+              waddwstr                 curs_addwstr(3x)
+              wattr_get                curs_attr(3x)
+              wattr_off                curs_attr(3x)
+              wattr_on                 curs_attr(3x)
+              wattr_set                curs_attr(3x)
+              wattroff                 curs_attr(3x)
+              wattron                  curs_attr(3x)
+              wattrset                 curs_attr(3x)
+              wbkgd                    curs_bkgd(3x)
+              wbkgdset                 curs_bkgd(3x)
+              wbkgrnd                  curs_bkgrnd(3x)
+              wbkgrndset               curs_bkgrnd(3x)
+              wborder                  curs_border(3x)
+              wborder_set              curs_border_set(3x)
+              wchgat                   curs_attr(3x)
+              wclear                   curs_clear(3x)
+              wclrtobot                curs_clear(3x)
+              wclrtoeol                curs_clear(3x)
+              wcolor_set               curs_attr(3x)
+              wcursyncup               curs_window(3x)
+              wdelch                   curs_delch(3x)
+              wdeleteln                curs_deleteln(3x)
+              wecho_wchar              curs_add_wch(3x)
+              wechochar                curs_addch(3x)
+              wenclose                 curs_mouse(3x)*
+              werase                   curs_clear(3x)
+              wget_wch                 curs_get_wch(3x)
+
+              wget_wstr                curs_get_wstr(3x)
+              wgetbkgrnd               curs_bkgrnd(3x)
+              wgetch                   curs_getch(3x)
+              wgetdelay                curs_opaque(3x)*
+              wgetn_wstr               curs_get_wstr(3x)
+              wgetnstr                 curs_getstr(3x)
+              wgetparent               curs_opaque(3x)*
+              wgetscrreg               curs_opaque(3x)*
+              wgetstr                  curs_getstr(3x)
+              whline                   curs_border(3x)
+              whline_set               curs_border_set(3x)
+              win_wch                  curs_in_wch(3x)
+              win_wchnstr              curs_in_wchstr(3x)
+              win_wchstr               curs_in_wchstr(3x)
+              winch                    curs_inch(3x)
+              winchnstr                curs_inchstr(3x)
+              winchstr                 curs_inchstr(3x)
+              winnstr                  curs_instr(3x)
+              winnwstr                 curs_inwstr(3x)
+              wins_nwstr               curs_ins_wstr(3x)
+              wins_wch                 curs_ins_wch(3x)
+              wins_wstr                curs_ins_wstr(3x)
+              winsch                   curs_insch(3x)
+              winsdelln                curs_deleteln(3x)
+              winsertln                curs_deleteln(3x)
+              winsnstr                 curs_insstr(3x)
+              winsstr                  curs_insstr(3x)
+              winstr                   curs_instr(3x)
+              winwstr                  curs_inwstr(3x)
+              wmouse_trafo             curs_mouse(3x)*
+              wmove                    curs_move(3x)
+              wnoutrefresh             curs_refresh(3x)
+              wprintw                  curs_printw(3x)
+              wredrawln                curs_refresh(3x)
+              wrefresh                 curs_refresh(3x)
+              wresize                  wresize(3x)*
+              wscanw                   curs_scanw(3x)
+              wscrl                    curs_scroll(3x)
+              wsetscrreg               curs_outopts(3x)
+              wstandend                curs_attr(3x)
+              wstandout                curs_attr(3x)
+              wsyncdown                curs_window(3x)
+              wsyncup                  curs_window(3x)
+              wtimeout                 curs_inopts(3x)
+              wtouchln                 curs_touch(3x)
+              wunctrl                  curs_util(3x)
+              wvline                   curs_border(3x)
+              wvline_set               curs_border_set(3x)

    RETURN VALUE

    diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 132455f1..4de87bd8 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -114,7 +114,7 @@

    SEE ALSO

            curses(3x)
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index da1bb8da..aac83ee2 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -208,7 +208,7 @@

    SEE ALSO

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

    AUTHOR

    diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index dc08e966..f56a417e 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -170,7 +170,7 @@

    SEE ALSO

            tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index a5f900a1..1f1f78f3 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -75,7 +75,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).

    Terminfo Entry Syntax

    diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index f25e2442..1fac3285 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -403,7 +403,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).

    AUTHOR

    diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index bcb2f5d8..4756f93d 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -120,7 +120,7 @@
        tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index ae2ccc70..2f0ba370 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -530,7 +530,7 @@
        clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
        curs_termcap(3x).
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index ccf46a1f..1e0f8698 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -435,7 +435,7 @@
        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
        terminfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 6.0 (patch 20170318).
+       This describes ncurses version 6.0 (patch 20170401).
 
 
 
diff --git a/include/curses.h.in b/include/curses.h.in
index 0a6fa823..fd62181e 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.248 2017/03/09 09:43:50 tom Exp $ */
+/* $Id: curses.h.in,v 1.255 2017/04/01 22:15:00 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -89,7 +89,7 @@
 #define NCURSES_INLINE @NCURSES_INLINE@
 
 /*
- * The internal type used for color values, and for color-pairs.  The latter
+ * The standard type used for color values, and for color-pairs.  The latter
  * allows the curses library to enumerate the combinations of foreground and
  * background colors used by an application, and is normally the product of the
  * total foreground and background colors.
@@ -248,6 +248,8 @@ extern "C" {
 #define NCURSES_CAST(type,value) (type)(value)
 #endif
 
+#define NCURSES_OK_ADDR(p) (0 != NCURSES_CAST(const void *, (p)))
+
 /*
  * X/Open attributes.  In the ncurses implementation, they are identical to the
  * A_ attributes.
@@ -728,9 +730,9 @@ extern NCURSES_EXPORT(int) mvwscanw (WINDOW *,int,int, NCURSES_CONST char *,...)
 		GCC_SCANFLIKE(4,5);
 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);	/* generated */
 extern NCURSES_EXPORT(int) napms (int);					/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);		       	/* implemented */
+extern NCURSES_EXPORT(WINDOW *) newpad (int,int);			/* implemented */
 extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);	       	/* implemented */
+extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);		/* implemented */
 extern NCURSES_EXPORT(int) nl (void);					/* implemented */
 extern NCURSES_EXPORT(int) nocbreak (void);				/* implemented */
 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);			/* implemented */
@@ -784,7 +786,7 @@ extern NCURSES_EXPORT(int) slk_noutrefresh (void);			/* implemented */
 extern NCURSES_EXPORT(int) slk_refresh (void);				/* implemented */
 extern NCURSES_EXPORT(int) slk_restore (void);				/* implemented */
 extern NCURSES_EXPORT(int) slk_set (int,const char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) slk_touch (void);	      	       		/* implemented */
+extern NCURSES_EXPORT(int) slk_touch (void);				/* implemented */
 extern NCURSES_EXPORT(int) standout (void);				/* generated */
 extern NCURSES_EXPORT(int) standend (void);				/* generated */
 extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
@@ -916,9 +918,14 @@ extern NCURSES_EXPORT(const char *) curses_version (void);
 extern NCURSES_EXPORT(int) alloc_pair (int, int);
 extern NCURSES_EXPORT(int) assume_default_colors (int, int);
 extern NCURSES_EXPORT(int) define_key (const char *, int);
+extern NCURSES_EXPORT(int) extended_color_content(int, int *, int *, int *);
+extern NCURSES_EXPORT(int) extended_pair_content(int, int *, int *);
+extern NCURSES_EXPORT(int) extended_slk_color(int);
 extern NCURSES_EXPORT(int) find_pair (int, int);
 extern NCURSES_EXPORT(int) free_pair (int);
 extern NCURSES_EXPORT(int) get_escdelay (void);
+extern NCURSES_EXPORT(int) init_extended_color(int, int, int, int);
+extern NCURSES_EXPORT(int) init_extended_pair(int, int, int);
 extern NCURSES_EXPORT(int) key_defined (const char *);
 extern NCURSES_EXPORT(int) keyok (int, bool);
 extern NCURSES_EXPORT(int) resize_term (int, int);
@@ -1050,9 +1057,14 @@ extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);	/*
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(alloc_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(extended_color_content) (SCREEN*, int, int *, int *, int *);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(extended_pair_content) (SCREEN*, int, int *, int *);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(extended_slk_color) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(find_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(free_pair) (SCREEN*, int); /* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_extended_color) (SCREEN*, int, int, int, int);	/* implemented:EXT_SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_extended_pair) (SCREEN*, int, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined) (SCREEN*, const char *);	/* implemented:EXT_SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool);	/* implemented:EXT_SP_FUNC */
@@ -1110,7 +1122,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/*
  * These pseudo functions are always implemented as macros:
  */
 
-#define getyx(win,y,x)   	(y = getcury(win), x = getcurx(win))
+#define getyx(win,y,x)		(y = getcury(win), x = getcurx(win))
 #define getbegyx(win,y,x)	(y = getbegy(win), x = getbegx(win))
 #define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
 #define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
@@ -1153,19 +1165,19 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/*
 
 /* It seems older SYSV curses versions define these */
 #if !NCURSES_OPAQUE
-#define getattrs(win)		NCURSES_CAST(int, (win) ? (win)->_attrs : A_NORMAL)
-#define getcurx(win)		((win) ? (win)->_curx : ERR)
-#define getcury(win)		((win) ? (win)->_cury : ERR)
-#define getbegx(win)		((win) ? (win)->_begx : ERR)
-#define getbegy(win)		((win) ? (win)->_begy : ERR)
-#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-#define getparx(win)		((win) ? (win)->_parx : ERR)
-#define getpary(win)		((win) ? (win)->_pary : ERR)
+#define getattrs(win)		NCURSES_CAST(int, NCURSES_OK_ADDR(win) ? (win)->_attrs : A_NORMAL)
+#define getcurx(win)		(NCURSES_OK_ADDR(win) ? (win)->_curx : ERR)
+#define getcury(win)		(NCURSES_OK_ADDR(win) ? (win)->_cury : ERR)
+#define getbegx(win)		(NCURSES_OK_ADDR(win) ? (win)->_begx : ERR)
+#define getbegy(win)		(NCURSES_OK_ADDR(win) ? (win)->_begy : ERR)
+#define getmaxx(win)		(NCURSES_OK_ADDR(win) ? ((win)->_maxx + 1) : ERR)
+#define getmaxy(win)		(NCURSES_OK_ADDR(win) ? ((win)->_maxy + 1) : ERR)
+#define getparx(win)		(NCURSES_OK_ADDR(win) ? (win)->_parx : ERR)
+#define getpary(win)		(NCURSES_OK_ADDR(win) ? (win)->_pary : ERR)
 #endif /* NCURSES_OPAQUE */
 
-#define wstandout(win)      	(wattrset(win,A_STANDOUT))
-#define wstandend(win)      	(wattrset(win,A_NORMAL))
+#define wstandout(win)		(wattrset(win,A_STANDOUT))
+#define wstandend(win)		(wattrset(win,A_NORMAL))
 
 #define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
 #define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
@@ -1173,16 +1185,18 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/*
 #if !NCURSES_OPAQUE
 #if NCURSES_WATTR_MACROS
 #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
-#define wattrset(win,at)	((win) \
-				  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
-                                     (win)->_attrs = NCURSES_CAST(attr_t, at), \
-                                     OK) \
-				  : ERR)
+#define wattrset(win,at) \
+	(NCURSES_OK_ADDR(win) \
+	  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
+	     (win)->_attrs = NCURSES_CAST(attr_t, at), \
+	     OK) \
+	  : ERR)
 #else
-#define wattrset(win,at)        ((win) \
-				  ? ((win)->_attrs = NCURSES_CAST(attr_t, at), \
-				     OK) \
-				  : ERR)
+#define wattrset(win,at) \
+	(NCURSES_OK_ADDR(win) \
+	  ? ((win)->_attrs = NCURSES_CAST(attr_t, at), \
+	     OK) \
+	  : ERR)
 #endif
 #endif /* NCURSES_WATTR_MACROS */
 #endif /* NCURSES_OPAQUE */
@@ -1203,7 +1217,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/*
 #define winsstr(w, s)		winsnstr(w, s, -1)
 
 #if !NCURSES_OPAQUE
-#define redrawwin(win)		wredrawln(win, 0, ((win) ? (win)->_maxy+1 : -1))
+#define redrawwin(win)		wredrawln(win, 0, (NCURSES_OK_ADDR(win) ? (win)->_maxy+1 : -1))
 #endif /* NCURSES_OPAQUE */
 
 #define waddstr(win,str)	waddnstr(win,str,-1)
@@ -1314,7 +1328,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/*
  * Some wide-character functions can be implemented without the extensions.
  */
 #if !NCURSES_OPAQUE
-#define getbkgd(win)                    ((win) ? ((win)->_bkgd) : 0)
+#define getbkgd(win)                    (NCURSES_OK_ADDR(win) ? ((win)->_bkgd) : 0)
 #endif /* NCURSES_OPAQUE */
 
 #define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
@@ -1323,23 +1337,43 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/*
 #if !NCURSES_OPAQUE
 #if NCURSES_WATTR_MACROS
 #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
-#define wattr_set(win,a,p,opts)		(((win) \
-					  ? ((win)->_attrs = ((a) & ~A_COLOR), \
-					     (win)->_color = (p)) \
-					  : OK), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? (win)->_color : 0)) : OK), \
-					 OK)
-#else
-#define wattr_set(win,a,p,opts)		(((win) \
-					  ? ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p))) \
-					  : OK), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? PAIR_NUMBER((win)->_attrs) : 0)) : OK), \
-					 OK)
-#endif
+#define wattr_set(win,a,p,opts) \
+	(NCURSES_OK_ADDR(win) \
+	 ? ((void)((win)->_attrs = ((a) & ~A_COLOR), \
+		   (win)->_color = (opts) ? *(int *)(opts) : (p)), \
+	    OK) \
+	 : ERR)
+#define wattr_get(win,a,p,opts) \
+	(NCURSES_OK_ADDR(win) \
+	 ? ((void)(NCURSES_OK_ADDR(a) \
+		   ? (*(a) = (win)->_attrs) \
+		   : OK), \
+	    (void)(NCURSES_OK_ADDR(p) \
+		   ? (*(p) = (NCURSES_PAIRS_T) (win)->_color) \
+		   : OK), \
+	    (void)(NCURSES_OK_ADDR(opts) \
+		   ? (*(int *)(opts) = (win)->_color) \
+		   : OK), \
+	    OK) \
+	 : ERR)
+#else /* !(NCURSES_WIDECHAR && NCURSES_EXE_COLORS) */
+#define wattr_set(win,a,p,opts) \
+	 (NCURSES_OK_ADDR(win) \
+	  ? ((void)((win)->_attrs = (((a) & ~A_COLOR) | \
+				     (attr_t)COLOR_PAIR(p))), \
+	     OK) \
+	  : ERR)
+#define wattr_get(win,a,p,opts) \
+	(NCURSES_OK_ADDR(win) \
+	 ? ((void)(NCURSES_OK_ADDR(a) \
+		   ? (*(a) = (win)->_attrs) \
+		   : OK), \
+	    (void)(NCURSES_OK_ADDR(p) \
+		   ? (*(p) = (NCURSES_PAIRS_T) PAIR_NUMBER((win)->_attrs)) \
+		   : OK), \
+	    OK) \
+	 : ERR)
+#endif /* (NCURSES_WIDECHAR && NCURSES_EXE_COLORS) */
 #endif /* NCURSES_WATTR_MACROS */
 #endif /* NCURSES_OPAQUE */
 
@@ -1365,21 +1399,21 @@ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
  */
 #if @NCURSES_EXT_FUNCS@
 #if !NCURSES_OPAQUE
-#define is_cleared(win)		((win) ? (win)->_clear : FALSE)
-#define is_idcok(win)		((win) ? (win)->_idcok : FALSE)
-#define is_idlok(win)		((win) ? (win)->_idlok : FALSE)
-#define is_immedok(win)		((win) ? (win)->_immed : FALSE)
-#define is_keypad(win)		((win) ? (win)->_use_keypad : FALSE)
-#define is_leaveok(win)		((win) ? (win)->_leaveok : FALSE)
-#define is_nodelay(win)		((win) ? ((win)->_delay == 0) : FALSE)
-#define is_notimeout(win)	((win) ? (win)->_notimeout : FALSE)
-#define is_pad(win)		((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE)
-#define is_scrollok(win)	((win) ? (win)->_scroll : FALSE)
-#define is_subwin(win)		((win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
-#define is_syncok(win)		((win) ? (win)->_sync : FALSE)
-#define wgetdelay(win)		((win) ? (win)->_delay : 0)
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
+#define is_cleared(win)		(NCURSES_OK_ADDR(win) ? (win)->_clear : FALSE)
+#define is_idcok(win)		(NCURSES_OK_ADDR(win) ? (win)->_idcok : FALSE)
+#define is_idlok(win)		(NCURSES_OK_ADDR(win) ? (win)->_idlok : FALSE)
+#define is_immedok(win)		(NCURSES_OK_ADDR(win) ? (win)->_immed : FALSE)
+#define is_keypad(win)		(NCURSES_OK_ADDR(win) ? (win)->_use_keypad : FALSE)
+#define is_leaveok(win)		(NCURSES_OK_ADDR(win) ? (win)->_leaveok : FALSE)
+#define is_nodelay(win)		(NCURSES_OK_ADDR(win) ? ((win)->_delay == 0) : FALSE)
+#define is_notimeout(win)	(NCURSES_OK_ADDR(win) ? (win)->_notimeout : FALSE)
+#define is_pad(win)		(NCURSES_OK_ADDR(win) ? ((win)->_flags & _ISPAD) != 0 : FALSE)
+#define is_scrollok(win)	(NCURSES_OK_ADDR(win) ? (win)->_scroll : FALSE)
+#define is_subwin(win)		(NCURSES_OK_ADDR(win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
+#define is_syncok(win)		(NCURSES_OK_ADDR(win) ? (win)->_sync : FALSE)
+#define wgetdelay(win)		(NCURSES_OK_ADDR(win) ? (win)->_delay : 0)
+#define wgetparent(win)		(NCURSES_OK_ADDR(win) ? (win)->_parent : 0)
+#define wgetscrreg(win,t,b)	(NCURSES_OK_ADDR(win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
 #endif
 #endif
 
diff --git a/include/curses.wide b/include/curses.wide
index 58ccd150..7a8ae7d5 100644
--- a/include/curses.wide
+++ b/include/curses.wide
@@ -1,4 +1,4 @@
-/* $Id: curses.wide,v 1.49 2017/03/26 00:04:04 tom Exp $ */
+/* $Id: curses.wide,v 1.50 2017/03/26 16:05:21 tom Exp $ */
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
@@ -204,7 +204,7 @@ extern NCURSES_EXPORT(int) wecho_wchar (WINDOW *, const cchar_t *);	/* implement
 extern NCURSES_EXPORT(int) wget_wch (WINDOW *, wint_t *);		/* implemented */
 extern NCURSES_EXPORT(int) wget_wstr (WINDOW *, wint_t *);		/* generated:WIDEC */
 extern NCURSES_EXPORT(int) wgetbkgrnd (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetn_wstr (WINDOW *,wint_t *, int);		/* implemented */
+extern NCURSES_EXPORT(int) wgetn_wstr (WINDOW *, wint_t *, int);	/* implemented */
 extern NCURSES_EXPORT(int) whline_set (WINDOW *, const cchar_t *, int);	/* implemented */
 extern NCURSES_EXPORT(int) win_wch (WINDOW *, cchar_t *);		/* implemented */
 extern NCURSES_EXPORT(int) win_wchnstr (WINDOW *, cchar_t *, int);	/* implemented */
@@ -261,7 +261,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_puts) (SCREEN*, attr_t, NCURSES_P
 #define wins_wstr(w,t)			wins_nwstr((w),(t),-1)
 
 #if !NCURSES_OPAQUE
-#define wgetbkgrnd(win,wch)		((0 != (const void*)(wch)) ? ((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK) : ERR)
+#define wgetbkgrnd(win,wch)		(NCURSES_OK_ADDR(wch) ? ((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK) : ERR)
 #endif
 
 #define mvadd_wch(y,x,c)		mvwadd_wch(stdscr,(y),(x),(c))
diff --git a/include/ncurses_defs b/include/ncurses_defs
index 2baa5e53..647aa565 100644
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.71 2017/03/06 09:51:33 tom Exp $
+# $Id: ncurses_defs,v 1.72 2017/03/31 13:00:11 tom Exp $
 ##############################################################################
 # Copyright (c) 2000-2016,2017 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -45,8 +45,8 @@ HAVE_ALLOC_PAIR
 HAVE_ASSUME_DEFAULT_COLORS
 HAVE_BIG_CORE
 HAVE_BSD_CGETENT
-HAVE_BSD_STRING_H
 HAVE_BSD_SIGNAL_H
+HAVE_BSD_STRING_H
 HAVE_BTOWC 
 HAVE_BUILTIN_H
 HAVE_CHGAT	1
@@ -72,6 +72,7 @@ HAVE_GPM_H
 HAVE_GPP_BUILTIN_H
 HAVE_GXX_BUILTIN_H
 HAVE_HAS_KEY
+HAVE_INIT_EXTENDED_COLOR
 HAVE_INTTYPES_H
 HAVE_IOSTREAM
 HAVE_ISASCII
@@ -158,6 +159,7 @@ HAVE_TGETENT	1
 HAVE_TIGETNUM	1
 HAVE_TIGETSTR	1
 HAVE_TIMES
+HAVE_TPUTS_SP
 HAVE_TTYENT_H
 HAVE_TYPEAHEAD	1
 HAVE_TYPEINFO
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index f1983b7a..4d336083 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.49 2017/01/07 19:25:15 tom Exp $
+.\" $Id: curs_attr.3x,v 1.53 2017/03/28 23:31:39 tom Exp $
 .TH curs_attr 3X ""
 .de bP
 .IP \(bu 4
@@ -138,16 +138,23 @@ See \fBcurs_bkgd\fR(3X) for functions which modify the attributes used for
 erasing and clearing.
 .PP
 Routines which do not have a \fBWINDOW*\fP parameter apply to \fBstdscr\fP.
+For example,
+\fBattr_set\fP is the \fBstdscr\fP variant of \fBwattr_set\fP.
 .\" ---------------------------------------------------------------------------
 .SS Window attributes
 .PP
-The \fBattr_set\fP and \fBwattr_set\fP functions set the current attributes
+There are two sets of functions:
+.bP
+functions for manipulating the window attributes and color:
+\fBwattr_set\fP and \fBwattr_get\fP.
+.bP
+functions for manipulating only the window attributes (not color):
+\fBwattr_on\fP and \fBwattr_off\fP.
+.PP
+The \fBwattr_set\fP function sets the current attributes
 of the given window to \fIattrs\fP, with color specified by \fIpair\fP.
-X/Open specified an additional parameter \fIopts\fP which is unused in
-all implementations.
 .PP
-Use \fBattr_get\fP and \fBwattr_get\fP to retrieve attributes for
-the given window.
+Use \fBwattr_get\fP to retrieve attributes for the given window.
 .PP
 Use \fBattr_on\fP and \fBwattr_on\fP to turn on window attributes, i.e.,
 values OR'd together in \fIattr\fP,
@@ -187,14 +194,10 @@ the \fBmvwchgat\fR function does a cursor move before acting.
 In these functions,
 the color \fIpair\fP argument is a color-pair index
 (as in the first argument of \fBinit_pair\fR, see \fBcurs_color\fR(3X)).
-The \fBopts\fR argument is not
-presently used, but is reserved for the future (leave it \fBNULL\fR).
 .\" ---------------------------------------------------------------------------
 .SS Change window color
 The routine \fBcolor_set\fR sets the current color of the given window to the
 foreground/background combination described by the color \fIpair\fP parameter.
-The parameter \fIopts\fP is reserved for future use;
-applications must supply a null pointer.
 .\" ---------------------------------------------------------------------------
 .SS Standout
 .PP
@@ -259,8 +262,11 @@ implemented as macro-expanded assignments and simply return their argument).
 The SVr4 manual page claims (falsely) that these routines always return \fB1\fR.
 .SH NOTES
 These functions may be macros:
+.sp
+.RS
 \fBattroff\fR, \fBwattroff\fR, \fBattron\fR, \fBwattron\fR,
 \fBattrset\fR, \fBwattrset\fR, \fBstandend\fR and \fBstandout\fR.
+.RE
 .PP
 Color pair values can only be OR'd with attributes if the pair
 number is less than 256.
@@ -268,13 +274,48 @@ The alternate functions such as \fBcolor_set\fP can pass a color pair
 value directly.
 However, ncurses ABI 4 and 5 simply OR this value within the alternate functions.
 You must use ncurses ABI 6 to support more than 256 color pairs.
+.SH EXTENSIONS
+.PP
+This implementation provides the \fBA_ITALIC\fP attribute for terminals
+which have the \fBenter_italics_mode\fP (\fBsitm\fP)
+and \fBexit_italics_mode\fP (\fBritm\fP) capabilities.
+Italics are not mentioned in X/Open Curses.
+Unlike the other video attributes, \fBA_ITALIC\fP is unrelated
+to the \fBset_attributes\fP capabilities.
+This implementation makes the assumption that
+\fBexit_attribute_mode\fP may also reset italics.
+.PP
+Each of the functions added by XSI Curses has a parameter \fIopts\fP,
+which X/Open Curses still (after more than twenty years) documents
+as reserved for future use, saying that it should be \fBNULL\fP.
+This implementation uses that parameter in ABI 6 for the functions which
+have a color-pair parameter to support \fIextended color pairs\fP:
+.bP
+For functions which modify the color, e.g.,
+\fBwattr_set\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and used to set the color pair instead of the \fBshort\fP \fIpair\fP parameter.
+.bP
+For functions which retrieve the color, e.g.,
+\fBwattr_get\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and used to retrieve the color pair as an \fBint\fP value,
+in addition
+retrieving it via the standard pointer to \fBshort\fP parameter.
+.PP
+The remaining functions which have \fIopts\fP,
+but do not manipulate color,
+e.g., \fBwattr_on\fP and \fBwattr_off\fP
+are not used by this implementation except to check that they are \fBNULL\fP.
 .SH PORTABILITY
 These functions are supported in the XSI Curses standard, Issue 4.
-The
-standard defined the dedicated type for highlights, \fBattr_t\fR, which is not
-defined in SVr4 curses.
-The functions taking \fBattr_t\fR arguments are
-not supported under SVr4.
+The standard defined the dedicated type for highlights,
+\fBattr_t\fR, which was not defined in SVr4 curses.
+The functions taking \fBattr_t\fR arguments were not supported under SVr4.
+.PP
+Very old versions of this library did not force an update of the screen
+when changing the attributes.
+Use \fBtouchwin\fR to force the screen to match the updated attributes.
 .PP
 The XSI Curses standard states that whether the traditional functions
 \fBattron\fR/\fBattroff\fR/\fBattrset\fR can manipulate attributes other than
@@ -284,19 +325,15 @@ Under this implementation as well as
 SVr4 curses, these functions correctly manipulate all other highlights
 (specifically, \fBA_ALTCHARSET\fR, \fBA_PROTECT\fR, and \fBA_INVIS\fR).
 .PP
-This implementation provides the \fBA_ITALIC\fP attribute for terminals
-which have the \fBenter_italics_mode\fP (\fBsitm\fP)
-and \fBexit_italics_mode\fP (\fBritm\fP) capabilities.
-Italics are not mentioned in X/Open Curses.
-Unlike the other video attributes, \fBA_ITALIC\fP is unrelated
-to the \fBset_attributes\fP capabilities.
-This implementation makes the assumption that
-\fBexit_attribute_mode\fP may also reset italics.
-.PP
-XSI Curses added the new entry points, \fBattr_get\fR, \fBattr_on\fR,
+XSI Curses added these entry points:
+.sp
+.RS
+\fBattr_get\fR, \fBattr_on\fR,
 \fBattr_off\fR, \fBattr_set\fR, \fBwattr_on\fR, \fBwattr_off\fR,
-\fBwattr_get\fR, \fBwattr_set\fR.
-These are intended to work with
+\fBwattr_get\fR, \fBwattr_set\fR
+.RE
+.PP
+The new functions are intended to work with
 a new series of highlight macros prefixed with \fBWA_\fR.
 The older macros have direct counterparts in the newer set of names:
 .PP
@@ -318,10 +355,6 @@ l l .
 .TE
 .RE
 .PP
-Very old versions of this library did not force an update of the screen
-when changing the attributes.
-Use \fBtouchwin\fR to force the screen to match the updated attributes.
-.PP
 The XSI curses standard specifies that each pair of corresponding \fBA_\fR
 and \fBWA_\fR-using functions operates on the same current-highlight
 information.
@@ -343,6 +376,9 @@ returns an error if the window pointer is null.
 .bP
 returns an error if the color pair parameter
 for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
+.bP
+does not return an error if either of the parameters of \fBwattr_get\fP
+used for retrieving attribute or color-pair values is \fBNULL\fP.
 .PP
 Functions with a "mv" prefix first perform a cursor movement using
 \fBwmove\fP, and return an error if the position is outside the window,
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 47f59659..bbb2e3f0 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.47 2017/03/13 21:49:37 tom Exp $
+.\" $Id: curs_color.3x,v 1.50 2017/04/01 19:57:19 tom Exp $
 .TH curs_color 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -40,15 +40,12 @@
 .hy 0
 .SH NAME
 \fBstart_color\fR,
+\fBhas_colors\fR,
+\fBcan_change_color\fR,
 \fBinit_pair\fR,
 \fBinit_color\fR,
-.\" .br
 \fBcolor_content\fR,
 \fBpair_content\fR,
-.\" .br
-\fBhas_colors\fR,
-\fBcan_change_color\fR,
-.\" .br
 \fBCOLOR_PAIR\fR,
 \fBPAIR_NUMBER\fR \- \fBcurses\fR color manipulation routines
 .ad
@@ -58,17 +55,29 @@
 .sp
 \fBint start_color(void);\fR
 .sp
+\fBbool has_colors(void);\fR
+.br
+\fBbool can_change_color(void);\fR
+.sp
 \fBint init_pair(short pair, short f, short b);\fR
 .br
 \fBint init_color(short color, short r, short g, short b);\fR
+.br
+/* extensions */
+.br
+\fBint init_extended_pair(int pair, int f, int b);\fR
+.br
+\fBint init_extended_color(int color, int r, int g, int b);\fR
 .sp
 \fBint color_content(short color, short *r, short *g, short *b);\fR
 .br
 \fBint pair_content(short pair, short *f, short *b);\fR
-.sp
-\fBbool has_colors(void);\fR
 .br
-\fBbool can_change_color(void);\fR
+/* extensions */
+.br
+\fBint extended_color_content(int color, int *r, int *g, int *b);\fR
+.br
+\fBint extended_pair_content(int pair, int *f, int *b);\fR
 .sp
 \fBint COLOR_PAIR(int n);\fR
 .br
@@ -141,7 +150,35 @@ Some \fBcurses\fP functions such as \fBwprintw\fP call \fBwaddch\fP.
 Those do not combine its parameter with a color pair.
 Consequently those calls use only the window attribute or
 the background character.
-.SS Routine Descriptions
+.SH CONSTANTS
+.PP
+In \fB\fR the following macros are defined.
+These are the standard colors (ISO-6429).
+\fBcurses\fR also assumes that \fBCOLOR_BLACK\fR is the default
+background color for all terminals.
+.PP
+.nf
+      \fBCOLOR_BLACK\fR
+      \fBCOLOR_RED\fR
+      \fBCOLOR_GREEN\fR
+      \fBCOLOR_YELLOW\fR
+      \fBCOLOR_BLUE\fR
+      \fBCOLOR_MAGENTA\fR
+      \fBCOLOR_CYAN\fR
+      \fBCOLOR_WHITE\fR
+.fi
+.PP
+Some terminals support more than the eight (8) \*(lqANSI\*(rq colors.
+There are no standard names for those additional colors. 
+.SH VARIABLES
+.SS COLORS
+is initialized by \fBstart_color\fP to the maximum number of colors
+the terminal can support.
+.SS COLOR_PAIRS
+is initialized by \fBstart_color\fP to the maximum number of color pairs
+the terminal can support.
+.SH FUNCTIONS
+.SS start_color
 The \fBstart_color\fR routine requires no arguments.
 It must be called if the programmer wants to use colors, and before any other
 color manipulation routine is called.
@@ -180,8 +217,8 @@ along with the terminal's color.
 These limits apply to color values and color pairs.
 Values outside these limits are not legal, and may result in a runtime error:
 .bP
-\fBCOLORS\fP corresponds to the terminal database's \fBmax_colors\fP capability,
-which is typically a signed 16-bit integer (see \fBterminfo\fR(\*n)).
+\fBCOLORS\fP corresponds to the terminal database's \fBmax_colors\fR capability,
+(see \fBterminfo\fR(\*n)).
 .bP
 color values are expected to be in the range \fB0\fP to \fBCOLORS\-1\fP,
 inclusive (including \fB0\fP and \fBCOLORS\-1\fP).
@@ -190,7 +227,7 @@ a special color value \fB\-1\fP is used in certain extended functions
 to denote the \fIdefault color\fP (see \fBuse_default_colors\fP).
 .bP
 \fBCOLOR_PAIRS\fP corresponds to the terminal database's \fBmax_pairs\fP capability,
-which is typically a signed 16-bit integer (see \fBterminfo\fR(\*n)).
+(see \fBterminfo\fR(\*n)).
 .bP
 legal color pair values are in the range \fB1\fP to \fBCOLOR_PAIRS\-1\fP,
 inclusive.
@@ -200,6 +237,22 @@ color pair \fB0\fP is special; it denotes \*(``no color\*(''.
 Color pair \fB0\fP is assumed to be white on black,
 but is actually whatever the terminal implements before color is initialized.
 It cannot be modified by the application.
+.SS has_colors
+.PP
+The \fBhas_colors\fR routine requires no arguments.
+It returns \fBTRUE\fR if
+the terminal can manipulate colors; otherwise, it returns \fBFALSE\fR.
+This routine facilitates writing terminal-independent programs.
+For example, a programmer can use it to decide
+whether to use color or some other video attribute.
+.SS can_change_color
+.PP
+The \fBcan_change_color\fR routine requires no arguments.
+It returns \fBTRUE\fR if the terminal supports colors
+and can change their definitions;
+other, it returns \fBFALSE\fR.
+This routine facilitates writing terminal-independent programs.
+.SS init_pair
 .PP
 The \fBinit_pair\fR routine changes the definition of a color-pair.
 It takes three arguments: the number of the color-pair to be changed, the foreground
@@ -218,34 +271,26 @@ the screen is refreshed and all occurrences of that color-pair
 are changed to the new definition.
 .PP
 As an extension, ncurses allows you to set color pair \fB0\fP via
-the \fBassume_default_colors\fR routine, or to specify the use of
+the \fBassume_default_colors\fR(3X) routine, or to specify the use of
 default colors (color number \fB\-1\fR) if you first invoke the
-\fBuse_default_colors\fR routine.
+\fBuse_default_colors\fR(3X) routine.
+.SS init_color
 .PP
 The \fBinit_color\fR routine changes the definition of a color.
 It takes four arguments: the number of the color to be changed followed by three RGB values
 (for the amounts of red, green, and blue components).
+.bP
 The first argument must be a legal color value;
 default colors are not allowed here.
 (See the section \fBColors\fR for the default color index.)
+.bP
 Each of the last three arguments
 must be a value in the range \fB0\fP through \fB1000\fP.
+.PP
 When \fBinit_color\fR is used, all
 occurrences of that color on the screen immediately change to the new
 definition.
-.PP
-The \fBhas_colors\fR routine requires no arguments.
-It returns \fBTRUE\fR if
-the terminal can manipulate colors; otherwise, it returns \fBFALSE\fR.
-This routine facilitates writing terminal-independent programs.
-For example, a programmer can use it to decide
-whether to use color or some other video attribute.
-.PP
-The \fBcan_change_color\fR routine requires no arguments.
-It returns \fBTRUE\fR if the terminal supports colors
-and can change their definitions;
-other, it returns \fBFALSE\fR.
-This routine facilitates writing terminal-independent programs.
+.SS color_content
 .PP
 The \fBcolor_content\fR routine gives programmers a way to find the intensity
 of the red, green, and blue (RGB) components in a color.
@@ -253,47 +298,38 @@ It requires four arguments: the color number, and three addresses
 of \fBshort\fRs for storing
 the information about the amounts of red, green, and blue components in the
 given color.
+.bP
 The first argument must be a legal color value, i.e.,
 \fB0\fP through \fBCOLORS\-1\fP, inclusive.
+.bP
 The values that are stored at the addresses pointed to by the
 last three arguments are in the range
 \fB0\fP (no component) through \fB1000\fP (maximum amount of component), inclusive.
+.SS pair_content
 .PP
 The \fBpair_content\fR routine allows programmers to find out what colors a
 given color-pair consists of.
 It requires three arguments: the color-pair
 number, and two addresses of \fBshort\fRs for storing the foreground and the
 background color numbers.
+.bP
 The first argument must be a legal color value,
 i.e., in the range \fB1\fP through \fBCOLOR_PAIRS\-1\fR, inclusive.
+.bP
 The values that are stored at the addresses pointed
 to by the second and third arguments are in the
 range \fB0\fP through \fBCOLORS\fR, inclusive.
+.SS PAIR_NUMBER
 .PP
 \fBPAIR_NUMBER(\fR\fIattrs\fR) extracts the color
 value from its \fIattrs\fP parameter and returns it as a color pair number.
+.SS COLOR_PAIR
 Its inverse \fBCOLOR_PAIR(\fR\fIn\fR\fB)\fR converts a color pair number
 to an attribute.
 Attributes can hold color pairs in the range 0 to 255.
 If you need a color pair larger than that, you must use functions
 such as \fBattr_set\fP (which pass the color pair as a separate parameter)
 rather than the legacy functions such as \fBattrset\fP.
-.SS Colors
-In \fB\fR the following macros are defined.
-These are the standard colors (ISO-6429).
-\fBcurses\fR also assumes that \fBCOLOR_BLACK\fR is the default
-background color for all terminals.
-.PP
-.nf
-      \fBCOLOR_BLACK\fR
-      \fBCOLOR_RED\fR
-      \fBCOLOR_GREEN\fR
-      \fBCOLOR_YELLOW\fR
-      \fBCOLOR_BLUE\fR
-      \fBCOLOR_MAGENTA\fR
-      \fBCOLOR_CYAN\fR
-      \fBCOLOR_WHITE\fR
-.fi
 .SH RETURN VALUE
 The routines \fBcan_change_color\fR and \fBhas_colors\fR return \fBTRUE\fR
 or \fBFALSE\fR.
@@ -304,7 +340,7 @@ completion.
 .PP
 X/Open defines no error conditions.
 This implementation will return \fBERR\fR on attempts to
-use color values outside the range \fB0\fP to COLORS\-1
+use color values outside the range \fB0\fP to \fBCOLORS\fP\-1
 (except for the default colors extension),
 or use color pairs outside the range \fB0\fP to \fBCOLOR_PAIRS\-1\fP.
 Color values used in \fBinit_color\fP must be in the range \fB0\fP to \fB1000\fP.
@@ -324,19 +360,19 @@ returns an error if the color table cannot be allocated.
 .RE
 .SH NOTES
 In the \fBncurses\fR implementation, there is a separate color activation flag,
-color palette, color pairs table, and associated COLORS and COLOR_PAIRS counts
+color palette, color pairs table, and associated \fBCOLORS\fP and \fBCOLOR_PAIRS\fP counts
 for each screen; the \fBstart_color\fR function only affects the current
 screen.
 The SVr4/XSI interface is not really designed with this in mind, and
 historical implementations may use a single shared color palette.
 .PP
-Note that setting an implicit background color via a color pair affects only
+Setting an implicit background color via a color pair affects only
 character cells that a character write operation explicitly touches.
 To change
 the background color used when parts of a window are blanked by erasing or
 scrolling operations, see \fBcurs_bkgd\fR(3X).
 .PP
-Several caveats apply on 386 and 486 machines with VGA-compatible graphics:
+Several caveats apply on older x86 machines (e.g., i386, i486) with VGA-compatible graphics:
 .bP
 COLOR_YELLOW is actually brown.
 To get yellow, use COLOR_YELLOW combined with the \fBA_BOLD\fR attribute.
@@ -353,17 +389,26 @@ This implementation satisfies XSI Curses's minimum maximums
 for \fBCOLORS\fR and \fBCOLOR_PAIRS\fR.
 .PP
 The \fBinit_pair\fP routine accepts negative values of foreground
-and background color to support the \fBuse_default_colors\fP extension,
+and background color to support the \fBuse_default_colors\fR(3X) extension,
 but only if that routine has been first invoked.
 .PP
 The assumption that \fBCOLOR_BLACK\fR is the default
 background color for all terminals can be modified using the
-\fBassume_default_colors\fP extension.
+\fBassume_default_colors\fR(3X) extension.
 .PP
 This implementation checks the pointers,
 e.g., for the values returned by
 \fBcolor_content\fP and \fBpair_content\fP,
 and will treat those as optional parameters when null.
+.PP
+X/Open Curses does not specify a limit for the number of colors and
+color pairs which a terminal can support.
+However, in its use of \fBshort\fP for the parameters,
+it carries over SVr4's implementation detail for the compiled
+terminfo database, which uses signed 16-bit numbers.
+This implementation provides extended versions of those functions
+which use \fBshort\fP parameters,
+allowing applications to use larger color- and pair-numbers.
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_initscr\fR(3X),
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 4c5b2291..a106a223 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2001-2012,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.17 2015/07/21 09:30:38 tom Exp $
+.\" $Id: curs_getcchar.3x,v 1.18 2017/03/31 10:50:54 tom Exp $
 .TH curs_getcchar 3X ""
 .de bP
 .IP \(bu 4
@@ -110,10 +110,23 @@ Additional nonspacing characters are ignored.
 .IP
 The string may contain a single control character instead.
 In that case, no nonspacing characters are allowed.
-.SH NOTES
+.SH EXTENSIONS
 .PP
-The \fIopts\fP argument is reserved for future use.
-Currently, an application must provide a null pointer as \fIopts\fP.
+X/Open Curses documents the \fIopts\fP argument as reserved for future use,
+saying that it must be null.
+This implementation 
+uses that parameter in ABI 6 for the functions which have a color-pair
+parameter to support extended color pairs:
+.bP
+For  functions  which modify the color, e.g., \fBsetcchar\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
+.bP
+For functions which retrieve the color, e.g., \fBgetcchar\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and  used  to  retrieve  the color pair as an \fBint\fP value,
+in addition retrieving it via the standard pointer to \fBshort\fP parameter.
+.SH NOTES
 .PP
 The \fIwcval\fP argument may be a value generated by a call to
 \fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index d1927a10..0b9b1d0b 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.29 2017/03/18 01:00:30 tom Exp $
+.\" $Id: curs_slk.3x,v 1.31 2017/03/31 11:09:28 tom Exp $
 .TH curs_slk 3X ""
 .de bP
 .IP \(bu 4
@@ -50,19 +50,20 @@
 \fBslk_attr_set\fR,
 \fBslk_attr_off\fR,
 \fBslk_attr\fR,
-\fBslk_color\fR \- \fBcurses\fR soft label routines
+\fBslk_color\fR,
+\fBextended_slk_color\fR \- \fBcurses\fR soft label routines
 .ad
 .hy
 .SH SYNOPSIS
 \fB#include \fR
 .sp
-\fBint slk_init(int fmt);\fR
+\fBint slk_init(int \fP\fIfmt\fP\fB);\fR
 .sp
-\fBint slk_set(int labnum, const char *label, int fmt);\fR
+\fBint slk_set(int \fP\fIlabnum\fP\fB, const char *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR
 .br
-\fBint slk_wset(int labnum, const wchar_t *label, int fmt);\fR
+\fBint slk_wset(int \fP\fIlabnum\fP\fB, const wchar_t *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR
 .sp
-\fBchar *slk_label(int labnum);\fR
+\fBchar *slk_label(int \fP\fIlabnum\fP\fB);\fR
 .sp
 \fBint slk_refresh(void);\fR
 .br
@@ -74,21 +75,25 @@
 .br
 \fBint slk_touch(void);\fR
 .sp
-\fBint slk_attron(const chtype attrs);\fR
+\fBint slk_attron(const chtype \fP\fIattrs\fP\fB);\fR
 .br
-\fBint slk_attroff(const chtype attrs);\fR
+\fBint slk_attroff(const chtype \fP\fIattrs\fP\fB);\fR
 .br
-\fBint slk_attrset(const chtype attrs);\fR
+\fBint slk_attrset(const chtype \fP\fIattrs\fP\fB);\fR
 .br
-\fBint slk_attr_on(attr_t attrs, void* opts);\fR
+\fBint slk_attr_on(attr_t \fP\fIattrs\fP\fB, void* \fP\fIopts\fP\fB);\fR
 .br
-\fBint slk_attr_off(const attr_t attrs, void * opts);\fR
+\fBint slk_attr_off(const attr_t \fP\fIattrs\fP\fB, void * \fP\fIopts\fP\fB);\fR
 .br
-\fBint slk_attr_set(const attr_t attrs, short pair, void* opts);\fR
+\fBint slk_attr_set(const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fR
 .sp
 \fBattr_t slk_attr(void);\fR
 .sp
-\fBint slk_color(short pair);\fR
+\fBint slk_color(short \fP\fIpair\fP\fB);\fR
+.br
+/* extension */
+.br
+\fBint extended_slk_color(int \fP\fIpair\fP\fB);\fR
 .SH DESCRIPTION
 The slk* functions manipulate the set of soft function-key labels that exist on
 many terminals.
@@ -181,6 +186,10 @@ System V curses, which does not document this fact).
 The \fBslk_color\fR routine corresponds to \fBcolor_set\fR.
 It has an effect only
 if soft labels are simulated on the bottom line of the screen.
+.PP
+Because \fBslk_color\fR accepts only \fBshort\fP (signed 16-bit integer) values,
+this implementation provides 
+\fBextended_slk_color\fR which accepts an integer value, e.g., 32-bits.
 .
 .SH RETURN VALUE
 These routines return \fBERR\fR upon failure and OK (SVr4 specifies only "an
@@ -208,8 +217,7 @@ if the terminal or the softkeys were not initialized.
 \fBslk_attr_set\fP
 returns an error
 if the terminal or the softkeys were not initialized, or
-the color pair is outside the range 0..COLOR_PAIRS\-1,
-or opts is not null.
+the color pair is outside the range 0..COLOR_PAIRS\-1.
 .TP 5
 \fBslk_color\fP
 returns an error
@@ -230,6 +238,17 @@ the \fIlabnum\fP parameter is outside the range of label counts, or
 if the format parameter is outside the range 0..2, or if
 memory for the labels cannot be allocated.
 .RE
+.SH EXTENSIONS
+.PP
+X/Open Curses documents the \fIopts\fP argument as reserved for future use,
+saying that it must be null.
+This implementation 
+uses that parameter in ABI 6 for the functions which have a color-pair
+parameter to support extended color pairs.
+.PP
+For  functions  which modify the color, e.g., \fBslk_attr_set\fP,
+if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
 .SH NOTES
 Most applications would use \fBslk_noutrefresh\fR because a
 \fBwrefresh\fR is likely to follow soon.
@@ -237,14 +256,16 @@ Most applications would use \fBslk_noutrefresh\fR because a
 The XSI Curses standard, Issue 4, described the soft-key functions,
 with some differences from SVr4 curses:
 .bP
-It
-added functions like the SVr4
-the attribute-manipulation functions \fBslk_attron\fR,
-\fBslk_attroff\fR, \fBslk_attrset\fR
-which use \fBattr_t\fR parameters,
+It added functions like the SVr4
+attribute-manipulation functions \fBslk_attron\fR,
+\fBslk_attroff\fR, \fBslk_attrset\fR,
+but which use \fBattr_t\fR parameters (rather than \fBchtype\fP),
 along with a reserved \fIopts\fP parameter.
 .IP
-One of these new functions (\fBslk_attr_set\fP) also has a color-pair parameter.
+Two of these new functions (unlike the SVr4 functions) have no provision
+for color: \fBslk_attr_on\fP and \fBslk_attr_off\fP.
+.IP
+The third function (\fBslk_attr_set\fP) has a color-pair parameter.
 .bP
 It added \fBconst\fR qualifiers to parameters (unnecessarily), and
 .bP
@@ -252,6 +273,15 @@ It added \fBslk_color\fP.
 .PP
 The format codes \fB2\fR and \fB3\fR for \fBslk_init\fR and the
 function \fBslk_attr\fR are specific to ncurses.
+.PP
+X/Open Curses does not specify a limit for the number of colors and
+color pairs which a terminal can support.
+However, in its use of \fBshort\fP for the parameters,
+it carries over SVr4's implementation detail for the compiled
+terminfo database, which uses signed 16-bit numbers.
+This implementation provides extended versions of those functions
+which use \fBshort\fP parameters,
+allowing applications to use larger color- and pair-numbers.
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_attr\fR(3X),
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index f7369762..3414bddc 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.8 2017/03/25 18:08:33 tom Exp $
+.\" $Id: curs_sp_funcs.3x,v 1.9 2017/03/27 08:35:44 tom Exp $
 .TH curs_sp_funcs 3X ""
 .na
 .hy 0
@@ -70,6 +70,12 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint erasechar_sp(SCREEN*);\fR
 .br
+\fBint extended_color_content_sp(SCREEN *, int, int *, int *, int *);\fR
+.br
+\fBint extended_pair_content_sp(SCREEN*, int, int *, int *);\fR
+.br
+\fBint extended_slk_color_sp(SCREEN*, int);\fR
+.br
 \fBint filter_sp(SCREEN*);\fR
 .br
 \fBint find_pair_sp(SCREEN*, int, int);\fR
@@ -100,6 +106,10 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBint init_color_sp(SCREEN*, short, short, short, short);\fR
 .br
+\fBint init_extended_color_sp(SCREEN*, int, int, int, int);\fR
+.br
+\fBint init_extended_pair_sp(SCREEN*, int, int, int);\fR
+.br
 \fBint init_pair_sp(SCREEN*, short, short, short);\fR
 .br
 \fBint intrflush_sp(SCREEN*, WINDOW*, bool);\fR
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 3072a2d6..0b75f564 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1999-2013,2016 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1999-2016,2017 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.46 2016/10/15 17:27:48 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.55 2017/03/31 15:16:15 tom Exp $
 .TH curs_terminfo 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -63,23 +63,35 @@
 \fB#include \fR
 .br
 \fB#include \fR
-.PP
-\fBint setupterm(char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
+.sp
+\fBTERMINAL *cur_term;\fR
+.sp
+\fBconst char * const boolnames[];\fP
+\fBconst char * const boolcodes[];\fP
+\fBconst char * const boolfnames[];\fP
+\fBconst char * const numnames[];\fP
+\fBconst char * const numcodes[];\fP
+\fBconst char * const numfnames[];\fP
+\fBconst char * const strnames[];\fP
+\fBconst char * const strcodes[];\fP
+\fBconst char * const strfnames[];\fP
+.sp
+\fBint setupterm(const char *\fR\fIterm\fR\fB, int \fR\fIfiledes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
 .br
-\fBint setterm(char *\fR\fIterm\fR\fB);\fR
+\fBint setterm(const char *\fR\fIterm\fR\fB);\fR
 .br
 \fBTERMINAL *set_curterm(TERMINAL *\fR\fInterm\fR\fB);\fR
 .br
 \fBint del_curterm(TERMINAL *\fR\fIoterm\fR\fB);\fR
 .br
-\fBint restartterm(char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
-.br
-\fBchar *tparm(char *\fR\fIstr\fR\fB, ...);\fR
+\fBint restartterm(const char *\fR\fIterm\fR\fB, int \fR\fIfiledes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
+.sp
+\fBchar *tparm(const char *\fR\fIstr\fR\fB, ...);\fR
 .br
 \fBint tputs(const char *\fR\fIstr\fR\fB, int \fR\fIaffcnt\fR\fB, int (*\fR\fIputc\fR\fB)(int));\fR
 .br
 \fBint putp(const char *\fR\fIstr\fR\fB);\fR
-.br
+.sp
 \fBint vidputs(chtype \fR\fIattrs\fR\fB, int (*\fR\fIputc\fR\fB)(int));\fR
 .br
 \fBint vidattr(chtype \fR\fIattrs\fR\fB);\fR
@@ -87,15 +99,15 @@
 \fBint vid_puts(attr_t \fR\fIattrs\fR\fB, short \fR\fIpair\fR\fB, void *\fR\fIopts\fR\fB, int (*\fR\fIputc\fR\fB)(int));\fR
 .br
 \fBint vid_attr(attr_t \fR\fIattrs\fR\fB, short \fR\fIpair\fR\fB, void *\fR\fIopts\fR\fB);\fR
-.br
+.sp
 \fBint mvcur(int \fR\fIoldrow\fR\fB, int \fR\fIoldcol\fR\fB, int \fR\fInewrow\fR, int \fR\fInewcol\fR\fB);\fR
+.sp
+\fBint tigetflag(const char *\fR\fIcapname\fR\fB);\fR
 .br
-\fBint tigetflag(char *\fR\fIcapname\fR\fB);\fR
-.br
-\fBint tigetnum(char *\fR\fIcapname\fR\fB);\fR
-.br
-\fBchar *tigetstr(char *\fR\fIcapname\fR\fB);\fR
+\fBint tigetnum(const char *\fR\fIcapname\fR\fB);\fR
 .br
+\fBchar *tigetstr(const char *\fR\fIcapname\fR\fB);\fR
+.sp
 \fBchar *tiparm(const char *\fR\fIstr\fR\fB, ...);\fR
 .br
 .fi
@@ -107,12 +119,13 @@ functionality, \fBcurses\fR routines are more suitable and their use is
 recommended.
 .SS Initialization
 .PP
-Initially, \fBsetupterm\fR should be called.  Note that
-\fBsetupterm\fR is automatically called by \fBinitscr\fR and
-\fBnewterm\fR.  This defines the set of terminal-dependent variables
+Initially, \fBsetupterm\fR should be called.
+The high-level curses functions \fBinitscr\fR and
+\fBnewterm\fR call \fBsetupterm\fP to initialize the
+low-level set of terminal-dependent variables
 [listed in \fBterminfo\fR(\*n)].
 .PP
-Each initialization routine provides applications with the
+Applications can use the
 terminal capabilities either directly (via header definitions),
 or by special functions.
 The header files \fBcurses.h\fR and \fBterm.h\fR should be included (in this
@@ -156,17 +169,29 @@ call \fBreset_prog_mode\fR after returning from the shell.
 .PP
 The \fBsetupterm\fR routine reads in the \fBterminfo\fR database,
 initializing the \fBterminfo\fR structures, but does not set up the
-output virtualization structures used by \fBcurses\fR.  The terminal
-type is the character string \fIterm\fR; if \fIterm\fR is null, the
-environment variable \fBTERM\fR is used.
-All output is to file descriptor \fBfildes\fR which is initialized for output.
+output virtualization structures used by \fBcurses\fR.
+These are its parameters:
+.RS 3
+.TP 5
+\fIterm\fP
+is the terminal type, a character string.
+If \fIterm\fR is null, the environment variable \fBTERM\fR is used.
+.TP 5
+\fIfiledes\fP
+is the file descriptor used for all output.
+.TP 5
+\fIerrret\fP
+points to an optional location where an error status can be returned to
+the caller.
 If \fIerrret\fR is not null,
 then \fBsetupterm\fR returns \fBOK\fR or
 \fBERR\fR and stores a status value in the integer pointed to by
 \fIerrret\fR.
 A return value of \fBOK\fR combined with status of \fB1\fR in \fIerrret\fR
 is normal.
+.IP
 If \fBERR\fR is returned, examine \fIerrret\fR:
+.RS
 .TP 5
 .B 1
 means that the terminal is hardcopy, cannot be used for curses applications.
@@ -184,7 +209,8 @@ checking the \fBgn\fP (\fBgeneric\fP) capability.
 .TP 5
 .B \-1
 means that the \fBterminfo\fR database could not be found.
-.PP
+.RE
+.IP
 If \fIerrret\fR is
 null, \fBsetupterm\fR prints an error message upon finding an error
 and exits.  Thus, the simplest call is:
@@ -192,6 +218,7 @@ and exits.  Thus, the simplest call is:
       \fBsetupterm((char *)0, 1, (int *)0);\fR,
 .sp
 which uses all the defaults and sends the output to \fBstdout\fR.
+.RE
 .PP
 The \fBsetterm\fR routine was replaced by \fBsetupterm\fR.  The call:
 .sp
@@ -241,6 +268,13 @@ calls \fBsetupterm\fP, and then restores the bits.
 The \fBtparm\fR routine instantiates the string \fIstr\fR with
 parameters \fIpi\fR.  A pointer is returned to the result of \fIstr\fR
 with the parameters applied.
+Application developers should keep in mind these quirks of the interface:
+.bP
+Although \fBtparm\fP's actual parameters may be integers or strings,
+the prototype expects \fBlong\fP (integer) values.
+.bP
+Aside from the \fBset_attributes\fP (\fBsgr\fP) capability,
+most terminal capabilities require no more than one or two parameters.
 .PP
 \fBtiparm\fP is a newer form of \fBtparm\fP which uses \fI\fP
 rather than a fixed-parameter list.
@@ -262,8 +296,8 @@ not applicable.
 the characters are passed, one at a time.
 .PP
 The \fBputp\fR routine calls \fBtputs(\fR\fIstr\fR\fB, 1, putchar)\fR.
-Note that the output of \fBputp\fR always goes to \fBstdout\fR, not to
-the \fIfildes\fR specified in \fBsetupterm\fR.
+The output of \fBputp\fR always goes to \fBstdout\fR, rather than
+the \fIfiledes\fR specified in \fBsetupterm\fR.
 .PP
 The \fBvidputs\fR routine displays the string on the terminal in the
 video attribute mode \fIattrs\fR, which is any combination of the
@@ -277,12 +311,19 @@ The \fBvid_attr\fR and \fBvid_puts\fR routines correspond to vidattr and vidputs
 respectively.
 They use a set of arguments for representing the video attributes plus color,
 i.e.,
-one of type attr_t for the attributes and one of short for
-the color_pair number.
+.bP
+\fIattrs\fP of type \fBattr_t\fP for the attributes and
+.bP
+\fIpair\fP of type \fBshort\fP for the color-pair number.
+.PP
 The \fBvid_attr\fR and \fBvid_puts\fR routines
 are designed to use the attribute constants with the \fIWA_\fR prefix.
-The opts argument is reserved for future use.
-Currently, applications must provide a null pointer for that argument.
+.PP
+X/Open Curses reserves the \fIopts\fP argument for future use,
+saying that applications must provide a null pointer for that argument.
+As an extension,
+this implementation allows \fIopts\fP to be used as a pointer to \fBint\fP,
+which overrides the \fIpair\fP (\fBshort\fP) argument.
 .PP
 The \fBmvcur\fR routine provides low-level cursor motion.  It takes
 effect immediately (rather than at the next refresh).
@@ -324,27 +365,34 @@ or
 if it is canceled or absent from the terminal description.
 .\" ***************************************************************************
 .SS Terminal Capability Names
+.PP
 These null-terminated arrays contain
-the short terminfo names ("codes"),
-the \fBtermcap\fR names, and the long terminfo names ("fnames")
+.bP
+the short terminfo names (\*(``codes\*(''),
+.bP
+the \fBtermcap\fR names (\*(``names\*('', and
+.bP
+the long terminfo names (\*(``fnames\*('')
+.PP
 for each of the predefined \fBterminfo\fR variables:
-.RS
-\fBchar *boolnames[]\fR, \fB*boolcodes[]\fR, \fB*boolfnames[]\fR
-.sp
-\fBchar *numnames[]\fR, \fB*numcodes[]\fR, \fB*numfnames[]\fR
 .sp
-\fBchar *strnames[]\fR, \fB*strcodes[]\fR, \fB*strfnames[]\fR
+.RS
+\fBconst char *boolnames[]\fR, \fB*boolcodes[]\fR, \fB*boolfnames[]\fR
+.br
+\fBconst char *numnames[]\fR, \fB*numcodes[]\fR, \fB*numfnames[]\fR
+.br
+\fBconst char *strnames[]\fR, \fB*strcodes[]\fR, \fB*strfnames[]\fR
 .RE
 .SH RETURN VALUE
 Routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
+(SVr4 only specifies \*(``an integer value other than \fBERR\fR\*('') upon successful
 completion, unless otherwise noted in the preceding routine descriptions.
 .PP
 Routines that return pointers always return \fBNULL\fR on error.
 .PP
 X/Open defines no error conditions.
 In this implementation
-.RS 5
+.RS 3
 .TP 5
 \fBdel_curterm\fP
 returns an error
@@ -370,24 +418,25 @@ X/Open states that \fBtputs\fP ignores the return value
 of the output function \fIputc\fP.
 .RE
 .SH PORTABILITY
+.SS Legacy functions
+.PP
 X/Open notes that \fBvidattr\fR and \fBvidputs\fR may be macros.
 .PP
 The function \fBsetterm\fR is not described by X/Open and must
 be considered non-portable.
 All other functions are as described by X/Open.
+.SS Legacy data
 .PP
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
 .PP
-If configured to use the terminal-driver,
-e.g., for the MinGW port,
-.bP
-\fBsetupterm\fP interprets a missing/empty TERM variable as the
-special value \*(``unknown\*(''.
-.bP
-\fBsetupterm\fP allows explicit use of the
-the windows console driver by checking if $TERM is set to
-\*(``#win32con\*('' or an abbreviation of that string.
+Other implementions may not declare the capability name arrays.
+Some provide them without declaring them.
+X/Open does not specify them.
+.PP
+Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP,
+are not stored in the arrays described here.
+.SS Output buffering
 .PP
 Older versions of \fBncurses\fP assumed that the file descriptor passed to
 \fBsetupterm\fP from \fBinitscr\fP or \fBnewterm\fP uses buffered I/O,
@@ -396,13 +445,54 @@ In addition to the limitation that the terminal was left in block-buffered
 mode on exit (like System V curses),
 it was problematic because \fBncurses\fP
 did not allow a reliable way to cleanup on receiving SIGTSTP.
-The current version uses output buffers managed directly by \fBncurses\fP.
+.PP
+The current version (ncurses6)
+uses output buffers managed directly by \fBncurses\fP.
 Some of the low-level functions described in this manual page write
 to the standard output.
 They are not signal-safe.
 The high-level functions in \fBncurses\fP use
 alternate versions of these functions
 using the more reliable buffering scheme.
+.SS Function prototypes
+.PP
+The X/Open Curses prototypes are based on the SVr4 curses header declarations,
+which were defined at the same time the C language was first standardized in
+the late 1980s.
+.bP
+X/Open Curses uses \fBconst\fP less effectively than a later design might,
+in some cases applying it needlessly to values are already constant,
+and in most cases overlooking parameters which normally would use \fBconst\fP.
+Using constant parameters for functions which do not use \fBconst\fP
+may prevent the program from compiling.
+On the other hand, \fIwritable strings\fP are an obsolescent feature.
+.IP
+As an extension, this implementation can be configured to change the
+function prototypes to use the \fBconst\fP keyword.
+The ncurses ABI 6 enables this feature by default.
+.bP
+X/Open Curses prototypes \fBtparm\fR with a fixed number of parameters,
+rather than a variable argument list.
+.IP
+This implementation uses a variable argument list, but can be
+configured to use the fixed-parameter list.
+Portable applications should provide 9 parameters after the format;
+zeroes are fine for this purpose.
+.IP
+In response to review comments by Thomas E. Dickey,
+X/Open Curses Issue 7 proposed the \fBtiparm\fP function in mid-2009.
+.SS Special TERM treatment
+.PP
+If configured to use the terminal-driver,
+e.g., for the MinGW port,
+.bP
+\fBsetupterm\fP interprets a missing/empty TERM variable as the
+special value \*(``unknown\*(''.
+.bP
+\fBsetupterm\fP allows explicit use of the
+the windows console driver by checking if $TERM is set to
+\*(``#win32con\*('' or an abbreviation of that string.
+.SS Other portability issues
 .PP
 In System V Release 4, \fBset_curterm\fR has an \fBint\fR return type and
 returns \fBOK\fR or \fBERR\fR.  We have chosen to implement the X/Open Curses
@@ -415,16 +505,6 @@ At least one implementation of X/Open Curses (Solaris) returns a value
 other than OK/ERR from \fBtputs\fP.
 That returns the length of the string, and does no error-checking.
 .PP
-X/Open Curses prototypes \fBtparm\fR with a fixed number of parameters,
-rather than a variable argument list.
-This implementation uses a variable argument list, but can be
-configured to use the fixed-parameter list.
-Portable applications should provide 9 parameters after the format;
-zeroes are fine for this purpose.
-.PP
-In response to comments by Thomas E. Dickey,
-X/Open Curses Issue 7 proposed the \fBtiparm\fP function in mid-2009.
-.PP
 X/Open notes that after calling \fBmvcur\fR, the curses state may not match the
 actual terminal state, and that an application should touch and refresh
 the window before resuming normal curses calls.
@@ -436,13 +516,6 @@ So though it is documented as a terminfo function,
 X/Open states that the old location must be given for \fBmvcur\fP.
 This implementation allows the caller to use \-1's for the old ordinates.
 In that case, the old location is unknown.
-.PP
-Other implementions may not declare the capability name arrays.
-Some provide them without declaring them.
-X/Open does not specify them.
-.PP
-Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP,
-are not stored in the arrays described here.
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_initscr\fR(3X),
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 48008694..f150e73e 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.4 2017/03/12 09:36:37 tom Exp $
+# $Id: manhtml.externs,v 1.5 2017/04/01 19:58:38 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright (c) 2013,2017 Free Software Foundation, Inc.                   *
@@ -49,4 +49,5 @@ system(3)
 termio(7)
 tty(4)
 ttys(5)
+vprintf(3)
 wcwidth(3)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index c45dafdf..796e6c10 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.130 2017/03/09 10:21:11 tom Exp $
+.\" $Id: ncurses.3x,v 1.131 2017/03/25 20:45:48 tom Exp $
 .hy 0
 .TH ncurses 3X ""
 .ie \n(.g .ds `` \(lq
@@ -389,6 +389,9 @@ endwin/\fBcurs_initscr\fR(3X)
 erase/\fBcurs_clear\fR(3X)
 erasechar/\fBcurs_termattrs\fR(3X)
 erasewchar/\fBcurs_termattrs\fR(3X)
+extended_color_content/\fBcurs_color\fR(3X)*
+extended_pair_content/\fBcurs_color\fR(3X)*
+extended_slk_color/\fBcurs_slk\fR(3X)*
 filter/\fBcurs_util\fR(3X)
 find_pair/\fBnew_pair\fR(3X)*
 flash/\fBcurs_beep\fR(3X)
@@ -436,6 +439,8 @@ inch/\fBcurs_inch\fR(3X)
 inchnstr/\fBcurs_inchstr\fR(3X)
 inchstr/\fBcurs_inchstr\fR(3X)
 init_color/\fBcurs_color\fR(3X)
+init_extended_color/\fBcurs_color\fR(3X)*
+init_extended_pair/\fBcurs_color\fR(3X)*
 init_pair/\fBcurs_color\fR(3X)
 initscr/\fBcurs_initscr\fR(3X)
 innstr/\fBcurs_instr\fR(3X)
@@ -648,8 +653,8 @@ tgoto/\fBcurs_termcap\fR(3X)
 tigetflag/\fBcurs_terminfo\fR(3X)
 tigetnum/\fBcurs_terminfo\fR(3X)
 tigetstr/\fBcurs_terminfo\fR(3X)
-tiparm/\fBcurs_terminfo\fR(3X)*
 timeout/\fBcurs_inopts\fR(3X)
+tiparm/\fBcurs_terminfo\fR(3X)*
 touchline/\fBcurs_touch\fR(3X)
 touchwin/\fBcurs_touch\fR(3X)
 tparm/\fBcurs_terminfo\fR(3X)
diff --git a/misc/terminfo.src b/misc/terminfo.src
index f6d1cf40..a1fde0c3 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.595 $
-#	$Date: 2017/03/11 23:17:18 $
+#	$Revision: 1.598 $
+#	$Date: 2017/04/01 20:40:04 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -465,6 +465,9 @@ ecma+color|color control for ECMA-48-compatible terminals,
 ecma+sgr|attribute capabilities for true ECMA-48 terminals,
 	rmso=\E[27m, rmul=\E[24m, use=klone+sgr8,
 
+ecma+strikeout|ECMA-48 strikeout/crossed-out,
+	rmxx=\E[29m, smxx=\E[9m,
+
 # For comparison, here are all the capabilities implied by the Intel
 # Binary Compatibility Standard (level 2) that fit within terminfo.
 # For more detail on this rather pathetic standard, see the comments
@@ -1844,10 +1847,9 @@ fbterm|FbTerm for Linux with framebuffer,
 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
 	initc=\E[3;%p1%d;%p2%d;%p3%d;%p4%d}, rmacs=\E[10m,
-	setab=\E[2;%p1%d}, setaf=\E[1;%p1%d}, setb=\E[2;%p1%d},
-	setf=\E[1;%p1%d},
+	setab=\E[2;%p1%d}, setaf=\E[1;%p1%d},
 	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,
+	    %t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
 	sgr0=\E[0;10m, smacs=\E[11m, use=linux,
 
 # 16-color linux console entry; this works with a 256-character
@@ -3109,7 +3111,7 @@ vt100+4bsd|dec vt100 from 4.0BSD,
 	rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, 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%;,
+	    %;m%?%p9%t\016%e\017%;$<2>,
 	sgr0=\E[m\017$<2>, smacs=^N, smso=\E[1;7m$<2>,
 	smul=\E[4m$<2>, tbc=\E[3g,
 vt100nam|vt100-nam|vt100 no automargins,
@@ -4179,7 +4181,7 @@ xterm-new|modern xterm terminal emulator,
 	npc,
 	indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
 	rin=\E[%p1%dT, use=ansi+enq, use=xterm+pcfkeys,
-	use=xterm+tmux, use=xterm-basic,
+	use=xterm+tmux, use=ecma+strikeout, use=xterm-basic,
 
 # This fragment is for people who cannot agree on what the backspace key
 # should send.
@@ -4848,8 +4850,8 @@ xtermc|xterm terminal emulator (color),
 xterm-pcolor|xterm with color used for highlights and status line,
 	wsl#40,
 	bold=\E[1;43m, rev=\E[7;34m,
-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1
-	    %t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m,
+	sgr=%?%p9%t\016%e\017%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1
+	    %t;7;31%;%?%p3%t;7;34%;m,
 	smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6,
 
 # This describes the capabilities of color_xterm, an xterm variant from
@@ -6507,8 +6509,8 @@ screen3|older VT 100/ANSI X3.64 virtual terminal,
 # xterm cursor bits.
 tmux|tmux terminal multiplexer,
 	ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m,
-	use=xterm+edit, use=xterm+pcfkeys, use=xterm+sl,
-	use=xterm+tmux, use=screen,
+	use=ecma+strikeout, use=xterm+edit, use=xterm+pcfkeys,
+	use=xterm+sl, use=xterm+tmux, use=screen,
 
 tmux-256color|tmux with 256 colors,
 	use=xterm+256setaf, use=tmux,
@@ -22418,7 +22420,7 @@ env230|envision230|envision 230 graphics terminal,
 	enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@,
 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;
 	    1%;m$<2>,
-	sgr0=\E[0m$<2>, smacs@, use=vt100+4bsd,
+	sgr0=\E[0m$<2>, smacs@, smso=\E[7m, use=vt100+4bsd,
 # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic
 # coupler attached, the whole rig fitting in a suitcase and more or less
 # portable.  Hot stuff for c.1977 :-) -- esr
@@ -23386,6 +23388,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #
 # gsbom/grbom are used to enable/disable real bold (not intensity bright) mode.
 #    This was implemented for the Hurd.
+# rmxx/smxx describes the ECMA-48 strikeout/crossed-out attributes, as an
+#    experimental feature of tmux.
 # E3 clears the terminal's scrollback buffer.  This was implemented in the
 #    Linux 3.0 kernel as a security feature.  It matches a feature which was
 #    added in xterm patch #107.
@@ -25102,4 +25106,13 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ modify vt100 rs2 string to reset vt52 mode and scrolling regions
 #	  (report/analysis by Robert King) -TD
 #
+# 2017-04-01
+#	+ minor fixes for vt100+4bsd, e.g., delay in sgr for consistency -TD
+#	+ add smso for env230, to match sgr -TD
+#	+ remove p7/protect from sgr in fbterm -TD
+#	+ drop setf/setb from fbterm; setaf/setab are enough -TD
+#	+ make xterm-pcolor sgr consistent with other capabilities -TD
+#	+ add rmxx/smxx ECMA-48 strikeout extension to tmux and xterm-basic
+#	  (discussion with Nicholas Marriott)
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index c67e5993..e969d69b 100644
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -42,34 +42,38 @@
 
 #include 
 
-MODULE_ID("$Id: lib_chgat.c,v 1.11 2016/05/28 23:11:26 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.12 2017/03/16 23:45:20 tom Exp $")
 
 NCURSES_EXPORT(int)
 wchgat(WINDOW *win,
        int n,
        attr_t attr,
-       NCURSES_PAIRS_T color,
+       NCURSES_PAIRS_T pair_arg,
        const void *opts GCC_UNUSED)
 {
+    int code = ERR;
+    int color_pair = pair_arg;
+
     T((T_CALLED("wchgat(%p,%d,%s,%d)"),
        (void *) win,
        n,
        _traceattr(attr),
-       (int) color));
+       color_pair));
 
+    set_extended_pair(opts, color_pair);
     if (win) {
 	struct ldat *line = &(win->_line[win->_cury]);
 	int i;
 
-	toggle_attr_on(attr, ColorPair(color));
+	toggle_attr_on(attr, ColorPair(color_pair));
 
 	for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++) {
 	    SetAttr(line->text[i], attr);
-	    SetPair(line->text[i], color);
+	    SetPair(line->text[i], color_pair);
 	    CHANGED_CELL(line, i);
 	}
 
-	returnCode(OK);
-    } else
-	returnCode(ERR);
+	code = OK;
+    }
+    returnCode(code);
 }
diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c
index ed0c6427..72a2a485 100644
--- a/ncurses/base/lib_color.c
+++ b/ncurses/base/lib_color.c
@@ -48,7 +48,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_color.c,v 1.115 2017/03/09 00:35:14 tom Exp $")
+MODULE_ID("$Id: lib_color.c,v 1.116 2017/03/25 21:10:54 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define CanChange      InfoOf(SP_PARM).canchange
@@ -342,8 +342,7 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0)
 	     * allow for default-color as a component of a color-pair.
 	     */
 	    SP_PARM->_pair_limit += (1 + (2 * maxcolors));
-	    if ((NCURSES_PAIRS_T) SP_PARM->_pair_limit < 0)
-		SP_PARM->_pair_limit = MAX_XCURSES_PAIR;
+	    SP_PARM->_pair_limit = limit_PAIRS(SP_PARM->_pair_limit);
 #endif
 	    SP_PARM->_pair_count = maxpairs;
 	    SP_PARM->_color_count = maxcolors;
@@ -387,7 +386,7 @@ start_color(void)
 
 /* This function was originally written by Daniel Weaver  */
 static void
-rgb2hls(int r, int g, int b, NCURSES_COLOR_T *h, NCURSES_COLOR_T *l, NCURSES_COLOR_T *s)
+rgb2hls(int r, int g, int b, int *h, int *l, int *s)
 /* convert RGB to HLS system */
 {
     int min, max, t;
@@ -398,7 +397,7 @@ rgb2hls(int r, int g, int b, NCURSES_COLOR_T *h, NCURSES_COLOR_T *l, NCURSES_COL
 	max = b;
 
     /* calculate lightness */
-    *l = (NCURSES_COLOR_T) ((min + max) / 20);
+    *l = ((min + max) / 20);
 
     if (min == max) {		/* black, white and all shades of gray */
 	*h = 0;
@@ -408,19 +407,19 @@ rgb2hls(int r, int g, int b, NCURSES_COLOR_T *h, NCURSES_COLOR_T *l, NCURSES_COL
 
     /* calculate saturation */
     if (*l < 50)
-	*s = (NCURSES_COLOR_T) (((max - min) * 100) / (max + min));
+	*s = (((max - min) * 100) / (max + min));
     else
-	*s = (NCURSES_COLOR_T) (((max - min) * 100) / (2000 - max - min));
+	*s = (((max - min) * 100) / (2000 - max - min));
 
     /* calculate hue */
     if (r == max)
-	t = (NCURSES_COLOR_T) (120 + ((g - b) * 60) / (max - min));
+	t = (120 + ((g - b) * 60) / (max - min));
     else if (g == max)
-	t = (NCURSES_COLOR_T) (240 + ((b - r) * 60) / (max - min));
+	t = (240 + ((b - r) * 60) / (max - min));
     else
-	t = (NCURSES_COLOR_T) (360 + ((r - g) * 60) / (max - min));
+	t = (360 + ((r - g) * 60) / (max - min));
 
-    *h = (NCURSES_COLOR_T) (t % 360);
+    *h = (t % 360);
 }
 
 /*
@@ -453,33 +452,26 @@ _nc_change_pair(SCREEN *sp, int pair)
  * values.
  */
 NCURSES_EXPORT(int)
-NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx
-			    NCURSES_PAIRS_T pair,
-			    NCURSES_COLOR_T f,
-			    NCURSES_COLOR_T b)
+_nc_init_pair(SCREEN *sp, int pair, int f, int b)
 {
     static colorpair_t null_pair;
     colorpair_t result = null_pair;
     colorpair_t previous;
     int maxcolors;
 
-    T((T_CALLED("init_pair(%p,%d,%d,%d)"),
-       (void *) SP_PARM,
-       (int) pair,
-       (int) f,
-       (int) b));
+    T((T_CALLED("init_pair(%p,%d,%d,%d)"), (void *) sp, pair, f, b));
 
-    if (!ValidPair(SP_PARM, pair))
+    if (!ValidPair(sp, pair))
 	returnCode(ERR);
 
     maxcolors = MaxColors;
 
-    previous = SP_PARM->_color_pairs[pair];
+    previous = sp->_color_pairs[pair];
 #if NCURSES_EXT_FUNCS
-    if (SP_PARM->_default_color || SP_PARM->_assumed_color) {
+    if (sp->_default_color || sp->_assumed_color) {
 	bool isDefault = FALSE;
 	bool wasDefault = FALSE;
-	int default_pairs = SP_PARM->_default_pairs;
+	int default_pairs = sp->_default_pairs;
 
 	/*
 	 * Map caller's color number, e.g., -1, 0, 1, .., 7, etc., into
@@ -526,10 +518,10 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx
 	 * that does not will decrement the count - and possibly interfere
 	 * with sequentially adding new pairs.
 	 */
-	if (pair > (SP_PARM->_pair_count + default_pairs)) {
+	if (pair > (sp->_pair_count + default_pairs)) {
 	    returnCode(ERR);
 	}
-	SP_PARM->_default_pairs = default_pairs;
+	sp->_default_pairs = default_pairs;
     } else
 #endif
     {
@@ -549,18 +541,18 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx
     if (FORE_OF(previous) != 0
 	&& BACK_OF(previous) != 0
 	&& !isSamePair(previous, result)) {
-	_nc_change_pair(SP_PARM, pair);
+	_nc_change_pair(sp, pair);
     }
 
-    _nc_reset_color_pair(SP_PARM, pair, &result);
-    SP_PARM->_color_pairs[pair] = result;
-    _nc_set_color_pair(SP_PARM, pair, cpINIT);
+    _nc_reset_color_pair(sp, pair, &result);
+    sp->_color_pairs[pair] = result;
+    _nc_set_color_pair(sp, pair, cpINIT);
 
-    if (GET_SCREEN_PAIR(SP_PARM) == pair)
-	SET_SCREEN_PAIR(SP_PARM, (int) (~0));	/* force attribute update */
+    if (GET_SCREEN_PAIR(sp) == pair)
+	SET_SCREEN_PAIR(sp, (int) (~0));	/* force attribute update */
 
 #ifdef USE_TERM_DRIVER
-    CallDriver_3(SP_PARM, td_initpair, pair, f, b);
+    CallDriver_3(sp, td_initpair, pair, f, b);
 #else
     if (initialize_pair && InPalette(f) && InPalette(b)) {
 	const color_t *tp = DefaultPalette;
@@ -586,6 +578,15 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx
     returnCode(OK);
 }
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx
+			    NCURSES_PAIRS_T pair,
+			    NCURSES_COLOR_T f,
+			    NCURSES_COLOR_T b)
+{
+    return _nc_init_pair(SP_PARM, pair, f, b);
+}
+
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 init_pair(NCURSES_COLOR_T pair, NCURSES_COLOR_T f, NCURSES_COLOR_T b)
@@ -597,59 +598,65 @@ init_pair(NCURSES_COLOR_T pair, NCURSES_COLOR_T f, NCURSES_COLOR_T b)
 #define okRGB(n) ((n) >= 0 && (n) <= 1000)
 
 NCURSES_EXPORT(int)
-NCURSES_SP_NAME(init_color) (NCURSES_SP_DCLx
-			     NCURSES_COLOR_T color,
-			     NCURSES_COLOR_T r,
-			     NCURSES_COLOR_T g,
-			     NCURSES_COLOR_T b)
+_nc_init_color(SCREEN *sp, int color, int r, int g, int b)
 {
     int result = ERR;
     int maxcolors;
 
     T((T_CALLED("init_color(%p,%d,%d,%d,%d)"),
-       (void *) SP_PARM,
+       (void *) sp,
        color,
        r, g, b));
 
-    if (SP_PARM == 0)
+    if (sp == 0)
 	returnCode(result);
 
     maxcolors = MaxColors;
 
     if (InitColor
-	&& SP_PARM->_coloron
+	&& sp->_coloron
 	&& (color >= 0 && OkColorHi(color))
 	&& (okRGB(r) && okRGB(g) && okRGB(b))) {
 
-	SP_PARM->_color_table[color].init = 1;
-	SP_PARM->_color_table[color].r = r;
-	SP_PARM->_color_table[color].g = g;
-	SP_PARM->_color_table[color].b = b;
+	sp->_color_table[color].init = 1;
+	sp->_color_table[color].r = r;
+	sp->_color_table[color].g = g;
+	sp->_color_table[color].b = b;
 
 	if (UseHlsPalette) {
 	    rgb2hls(r, g, b,
-		    &SP_PARM->_color_table[color].red,
-		    &SP_PARM->_color_table[color].green,
-		    &SP_PARM->_color_table[color].blue);
+		    &sp->_color_table[color].red,
+		    &sp->_color_table[color].green,
+		    &sp->_color_table[color].blue);
 	} else {
-	    SP_PARM->_color_table[color].red = r;
-	    SP_PARM->_color_table[color].green = g;
-	    SP_PARM->_color_table[color].blue = b;
+	    sp->_color_table[color].red = r;
+	    sp->_color_table[color].green = g;
+	    sp->_color_table[color].blue = b;
 	}
 
 #ifdef USE_TERM_DRIVER
-	CallDriver_4(SP_PARM, td_initcolor, color, r, g, b);
+	CallDriver_4(sp, td_initcolor, color, r, g, b);
 #else
 	NCURSES_PUTP2("initialize_color",
 		      TPARM_4(initialize_color, color, r, g, b));
 #endif
-	SP_PARM->_color_defs = max(color + 1, SP_PARM->_color_defs);
+	sp->_color_defs = max(color + 1, sp->_color_defs);
 
 	result = OK;
     }
     returnCode(result);
 }
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(init_color) (NCURSES_SP_DCLx
+			     NCURSES_COLOR_T color,
+			     NCURSES_COLOR_T r,
+			     NCURSES_COLOR_T g,
+			     NCURSES_COLOR_T b)
+{
+    return _nc_init_color(SP_PARM, color, r, g, b);
+}
+
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 init_color(NCURSES_COLOR_T color,
@@ -713,34 +720,30 @@ has_colors(void)
 }
 #endif
 
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx
-				NCURSES_COLOR_T color,
-				NCURSES_COLOR_T *r,
-				NCURSES_COLOR_T *g,
-				NCURSES_COLOR_T *b)
+static int
+_nc_color_content(SCREEN *sp, int color, int *r, int *g, int *b)
 {
     int result = ERR;
     int maxcolors;
 
     T((T_CALLED("color_content(%p,%d,%p,%p,%p)"),
-       (void *) SP_PARM,
+       (void *) sp,
        color,
        (void *) r,
        (void *) g,
        (void *) b));
 
-    if (SP_PARM == 0)
+    if (sp == 0)
 	returnCode(result);
 
     maxcolors = MaxColors;
 
-    if (color < 0 || !OkColorHi(color) || !SP_PARM->_coloron) {
+    if (color < 0 || !OkColorHi(color) || !sp->_coloron) {
 	result = ERR;
     } else {
-	NCURSES_COLOR_T c_r = SP_PARM->_color_table[color].red;
-	NCURSES_COLOR_T c_g = SP_PARM->_color_table[color].green;
-	NCURSES_COLOR_T c_b = SP_PARM->_color_table[color].blue;
+	int c_r = sp->_color_table[color].red;
+	int c_g = sp->_color_table[color].green;
+	int c_b = sp->_color_table[color].blue;
 
 	if (r)
 	    *r = c_r;
@@ -756,6 +759,23 @@ NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx
     returnCode(result);
 }
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx
+				NCURSES_COLOR_T color,
+				NCURSES_COLOR_T *r,
+				NCURSES_COLOR_T *g,
+				NCURSES_COLOR_T *b)
+{
+    int my_r, my_g, my_b;
+    int rc = _nc_color_content(SP_PARM, color, &my_r, &my_g, &my_b);
+    if (rc == OK) {
+	*r = limit_COLOR(my_r);
+	*g = limit_COLOR(my_g);
+	*b = limit_COLOR(my_b);
+    }
+    return rc;
+}
+
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 color_content(NCURSES_COLOR_T color,
@@ -768,24 +788,21 @@ color_content(NCURSES_COLOR_T color,
 #endif
 
 NCURSES_EXPORT(int)
-NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx
-			       NCURSES_PAIRS_T pair,
-			       NCURSES_COLOR_T *f,
-			       NCURSES_COLOR_T *b)
+_nc_pair_content(SCREEN *sp, int pair, int *f, int *b)
 {
     int result;
 
     T((T_CALLED("pair_content(%p,%d,%p,%p)"),
-       (void *) SP_PARM,
+       (void *) sp,
        (int) pair,
        (void *) f,
        (void *) b));
 
-    if (!ValidPair(SP_PARM, pair)) {
+    if (!ValidPair(sp, pair)) {
 	result = ERR;
     } else {
-	NCURSES_COLOR_T fg = (NCURSES_COLOR_T) FORE_OF(SP_PARM->_color_pairs[pair]);
-	NCURSES_COLOR_T bg = (NCURSES_COLOR_T) BACK_OF(SP_PARM->_color_pairs[pair]);
+	int fg = FORE_OF(sp->_color_pairs[pair]);
+	int bg = BACK_OF(sp->_color_pairs[pair]);
 
 #if NCURSES_EXT_FUNCS
 	if (isDefaultColor(fg))
@@ -800,7 +817,7 @@ NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx
 	    *b = bg;
 
 	TR(TRACE_ATTRS, ("...pair_content(%p,%d,%d,%d)",
-			 (void *) SP_PARM,
+			 (void *) sp,
 			 (int) pair,
 			 (int) fg, (int) bg));
 	result = OK;
@@ -808,6 +825,21 @@ NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx
     returnCode(result);
 }
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx
+			       NCURSES_PAIRS_T pair,
+			       NCURSES_COLOR_T *f,
+			       NCURSES_COLOR_T *b)
+{
+    int my_f, my_b;
+    int rc = _nc_pair_content(SP_PARM, pair, &my_f, &my_b);
+    if (rc == OK) {
+	*f = limit_COLOR(my_f);
+	*b = limit_COLOR(my_b);
+    }
+    return rc;
+}
+
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 pair_content(NCURSES_COLOR_T pair, NCURSES_COLOR_T *f, NCURSES_COLOR_T *b)
@@ -826,10 +858,10 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 #ifdef USE_TERM_DRIVER
     CallDriver_4(SP_PARM, td_docolor, old_pair, pair, reverse, outc);
 #else
-    NCURSES_COLOR_T fg = COLOR_DEFAULT;
-    NCURSES_COLOR_T bg = COLOR_DEFAULT;
-    NCURSES_COLOR_T old_fg = -1;
-    NCURSES_COLOR_T old_bg = -1;
+    int fg = COLOR_DEFAULT;
+    int bg = COLOR_DEFAULT;
+    int old_fg = -1;
+    int old_bg = -1;
 
     if (!ValidPair(SP_PARM, pair)) {
 	return;
@@ -841,14 +873,14 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 				    1, outc);
 	    return;
 	} else if (SP_PARM != 0) {
-	    if (pair_content((NCURSES_COLOR_T) pair, &fg, &bg) == ERR)
+	    if (_nc_pair_content(SP_PARM, pair, &fg, &bg) == ERR)
 		return;
 	}
     }
 
     if (old_pair >= 0
 	&& SP_PARM != 0
-	&& pair_content((NCURSES_COLOR_T) old_pair, &old_fg, &old_bg) != ERR) {
+	&& _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) {
 	if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
 	    || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
 #if NCURSES_EXT_FUNCS
@@ -877,13 +909,13 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx
 
 #if NCURSES_EXT_FUNCS
     if (isDefaultColor(fg))
-	fg = (NCURSES_COLOR_T) default_fg(NCURSES_SP_ARG);
+	fg = default_fg(NCURSES_SP_ARG);
     if (isDefaultColor(bg))
-	bg = (NCURSES_COLOR_T) default_bg(NCURSES_SP_ARG);
+	bg = default_bg(NCURSES_SP_ARG);
 #endif
 
     if (reverse) {
-	NCURSES_COLOR_T xx = fg;
+	int xx = fg;
 	fg = bg;
 	bg = xx;
     }
@@ -912,3 +944,65 @@ _nc_do_color(int old_pair, int pair, int reverse, NCURSES_OUTC outc)
 				   _nc_outc_wrapper);
 }
 #endif
+
+#if USE_EXTENDED_COLORS
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(init_extended_pair) (NCURSES_SP_DCLx int pair, int f, int b)
+{
+    return _nc_init_pair(SP_PARM, pair, f, b);
+}
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(init_extended_color) (NCURSES_SP_DCLx
+				      int color,
+				      int r, int g, int b)
+{
+    return _nc_init_color(SP_PARM, color, r, g, b);
+}
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(extended_color_content) (NCURSES_SP_DCLx
+					 int color,
+					 int *r, int *g, int *b)
+{
+    return _nc_color_content(SP_PARM, color, r, g, b);
+}
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(extended_pair_content) (NCURSES_SP_DCLx
+					int pair,
+					int *f, int *b)
+{
+    return _nc_pair_content(SP_PARM, pair, f, b);
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+init_extended_pair(int pair, int f, int b)
+{
+    return NCURSES_SP_NAME(init_extended_pair) (CURRENT_SCREEN, pair, f, b);
+}
+
+NCURSES_EXPORT(int)
+init_extended_color(int color, int r, int g, int b)
+{
+    return NCURSES_SP_NAME(init_extended_color) (CURRENT_SCREEN,
+						 color,
+						 r, g, b);
+}
+
+NCURSES_EXPORT(int)
+extended_color_content(int color, int *r, int *g, int *b)
+{
+    return NCURSES_SP_NAME(extended_color_content) (CURRENT_SCREEN,
+						    color,
+						    r, g, b);
+}
+
+NCURSES_EXPORT(int)
+extended_pair_content(int pair, int *f, int *b)
+{
+    return NCURSES_SP_NAME(extended_pair_content) (CURRENT_SCREEN, pair, f, b);
+}
+#endif
+#endif
diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c
index e9354860..f3aef7e3 100644
--- a/ncurses/base/lib_colorset.c
+++ b/ncurses/base/lib_colorset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2004,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -41,22 +41,23 @@
 #include 
 #include 
 
-MODULE_ID("$Id: lib_colorset.c,v 1.14 2014/02/01 22:10:42 tom Exp $")
+MODULE_ID("$Id: lib_colorset.c,v 1.15 2017/03/16 23:45:30 tom Exp $")
 
 NCURSES_EXPORT(int)
-wcolor_set(WINDOW *win, NCURSES_PAIRS_T color_pair_number, void *opts)
+wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts)
 {
     int code = ERR;
+    int color_pair = pair_arg;
 
-    T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, (int) color_pair_number));
+    T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair));
+    set_extended_pair(opts, color_pair);
     if (win
-	&& !opts
 	&& (SP != 0)
-	&& (color_pair_number >= 0)
-	&& (color_pair_number < SP->_pair_limit)) {
+	&& (color_pair >= 0)
+	&& (color_pair < SP->_pair_limit)) {
 	TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win)));
-	SET_WINDOW_PAIR(win, color_pair_number);
-	if_EXT_COLORS(win->_color = color_pair_number);
+	SET_WINDOW_PAIR(win, color_pair);
+	if_EXT_COLORS(win->_color = color_pair);
 	code = OK;
     }
     returnCode(code);
diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index 8ed7aa7d..c1851b04 100644
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -45,7 +45,7 @@
 #include 		/* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.41 2016/05/28 23:11:26 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.42 2017/03/28 21:14:01 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
@@ -65,8 +65,10 @@ initscr(void)
 	_nc_globals.init_screen = TRUE;
 
 	if ((name = getenv("TERM")) == 0
-	    || *name == '\0')
-	    name = "unknown";
+	    || *name == '\0') {
+	    static char unknown_name[] = "unknown";
+	    name = unknown_name;
+	}
 #ifdef __CYGWIN__
 	/*
 	 * 2002/9/21
diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 6b135252..deed47fa 100644
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -48,7 +48,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_newterm.c,v 1.94 2017/02/11 17:28:07 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.95 2017/04/01 12:53:35 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
@@ -76,6 +76,7 @@ _nc_initscr(NCURSES_SP_DCL0)
 
     /* for extended XPG4 conformance requires cbreak() at this point */
     /* (SVr4 curses does this anyway) */
+    T((T_CALLED("_nc_initscr(%p) ->term %p"), (void *) SP_PARM, term));
     if (NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG) == OK) {
 	TTY buf;
 
@@ -93,7 +94,7 @@ _nc_initscr(NCURSES_SP_DCL0)
 	if (result == OK)
 	    term->Nttyb = buf;
     }
-    return result;
+    returnCode(result);
 }
 
 /*
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 864968c1..8d475b96 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_set_term.c,v 1.156 2017/03/01 00:10:41 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.158 2017/04/01 13:51:59 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -286,6 +286,9 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 				     int filtered,
 				     int slk_format)
 {
+#ifndef USE_TERM_DRIVER
+    static const TTY null_TTY;	/* all zeros iff uninitialized */
+#endif
     char *env;
     int bottom_stolen = 0;
     SCREEN *sp;
@@ -304,6 +307,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 
     if (!sp) {
 	sp = _nc_alloc_screen_sp();
+	T(("_nc_alloc_screen_sp %p", sp));
 	*spp = sp;
     }
     if (!sp
@@ -628,8 +632,18 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     NewScreen(sp)->_clear = TRUE;
     CurScreen(sp)->_clear = FALSE;
 
-    NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
+    /*
+     * Get the current tty-modes. setupterm() may already have done this,
+     * unless we use the term-driver.
+     */
+#ifndef USE_TERM_DRIVER
+    if (cur_term != 0 &&
+	!memcmp(&cur_term->Ottyb, &null_TTY, sizeof(TTY)))
+#endif
+    {
+	NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);
+	NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
+    }
 
     if (safe_ripoff_sp && safe_ripoff_sp != safe_ripoff_stack) {
 	ripoff_t *rop;
diff --git a/ncurses/base/lib_slkatr_set.c b/ncurses/base/lib_slkatr_set.c
index a3132e9c..fa701f0b 100644
--- a/ncurses/base/lib_slkatr_set.c
+++ b/ncurses/base/lib_slkatr_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2004,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -38,30 +38,31 @@
  */
 #include 
 
-MODULE_ID("$Id: lib_slkatr_set.c,v 1.15 2014/02/01 22:10:42 tom Exp $")
+MODULE_ID("$Id: lib_slkatr_set.c,v 1.16 2017/03/16 23:45:36 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
 			       const attr_t attr,
-			       NCURSES_PAIRS_T color_pair_number,
+			       NCURSES_PAIRS_T pair_arg,
 			       void *opts)
 {
     int code = ERR;
+    int color_pair = pair_arg;
 
     T((T_CALLED("slk_attr_set(%p,%s,%d)"),
        (void *) SP_PARM,
        _traceattr(attr),
-       (int) color_pair_number));
+       color_pair));
 
+    set_extended_pair(opts, color_pair);
     if (SP_PARM != 0
 	&& SP_PARM->_slk != 0
-	&& !opts
-	&& color_pair_number >= 0
-	&& color_pair_number < SP_PARM->_pair_limit) {
+	&& color_pair >= 0
+	&& color_pair < SP_PARM->_pair_limit) {
 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
 	SetAttr(SP_PARM->_slk->attr, attr);
-	if (color_pair_number > 0) {
-	    SetPair(SP_PARM->_slk->attr, color_pair_number);
+	if (color_pair > 0) {
+	    SetPair(SP_PARM->_slk->attr, color_pair);
 	}
 	TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
 	code = OK;
@@ -71,9 +72,9 @@ NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-slk_attr_set(const attr_t attr, NCURSES_COLOR_T color_pair_number, void *opts)
+slk_attr_set(const attr_t attr, NCURSES_COLOR_T pair_arg, void *opts)
 {
     return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr,
-					  color_pair_number, opts);
+					  pair_arg, opts);
 }
 #endif
diff --git a/ncurses/base/lib_slkcolor.c b/ncurses/base/lib_slkcolor.c
index 2cf9e5d7..42027929 100644
--- a/ncurses/base/lib_slkcolor.c
+++ b/ncurses/base/lib_slkcolor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -38,31 +38,53 @@
  */
 #include 
 
-MODULE_ID("$Id: lib_slkcolor.c,v 1.17 2014/02/01 22:10:42 tom Exp $")
+MODULE_ID("$Id: lib_slkcolor.c,v 1.18 2017/03/17 09:26:46 tom Exp $")
 
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx NCURSES_PAIRS_T color_pair_number)
+static int
+_nc_slk_color(SCREEN *sp, int pair_arg)
 {
     int code = ERR;
 
-    T((T_CALLED("slk_color(%p,%d)"), (void *) SP_PARM, (int) color_pair_number));
+    T((T_CALLED("slk_color(%p,%d)"), (void *) sp, pair_arg));
 
-    if (SP_PARM != 0
-	&& SP_PARM->_slk != 0
-	&& color_pair_number >= 0
-	&& color_pair_number < SP_PARM->_pair_limit) {
-	TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
-	SetPair(SP_PARM->_slk->attr, color_pair_number);
-	TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
+    if (sp != 0
+	&& sp->_slk != 0
+	&& pair_arg >= 0
+	&& pair_arg < sp->_pair_limit) {
+	TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(sp->_slk->attr))));
+	SetPair(sp->_slk->attr, pair_arg);
+	TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(sp->_slk->attr))));
 	code = OK;
     }
     returnCode(code);
 }
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx NCURSES_PAIRS_T pair_arg)
+{
+    return _nc_slk_color(SP_PARM, pair_arg);
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+slk_color(NCURSES_PAIRS_T pair_arg)
+{
+    return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, pair_arg);
+}
+#endif
+
+#if USE_EXTENDED_COLORS
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(extended_slk_color) (NCURSES_SP_DCLx int pair_arg)
+{
+    return _nc_slk_color(SP_PARM, pair_arg);
+}
+
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-slk_color(NCURSES_PAIRS_T color_pair_number)
+extended_slk_color(int pair_arg)
 {
-    return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number);
+    return NCURSES_SP_NAME(extended_slk_color) (CURRENT_SCREEN, pair_arg);
 }
 #endif
+#endif
diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c
index 271d494d..851e8f0a 100644
--- a/ncurses/base/new_pair.c
+++ b/ncurses/base/new_pair.c
@@ -60,7 +60,7 @@
 
 #endif
 
-MODULE_ID("$Id: new_pair.c,v 1.8 2017/03/10 09:22:50 tom Exp $")
+MODULE_ID("$Id: new_pair.c,v 1.10 2017/03/28 09:14:15 tom Exp $")
 
 #if USE_NEW_PAIR
 
@@ -144,7 +144,8 @@ _nc_find_color_pair(SCREEN *sp, int fg, int bg)
 
     find.fg = fg;
     find.bg = bg;
-    if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
+    if (sp != 0 &&
+	(pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
 	colorpair_t *temp = *(colorpair_t **) pp;
 	result = (int) (temp - sp->_color_pairs);
     } else {
@@ -221,7 +222,9 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg)
     int pair;
 
     T((T_CALLED("alloc_pair(%d,%d)"), fg, bg));
-    if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) {
+    if (SP_PARM == 0) {
+	pair = -1;
+    } else if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) {
 	/*
 	 * Check if all of the slots have been used.  If not, find one and
 	 * use that.
@@ -261,11 +264,8 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg)
 	    T(("reusing %d", pair));
 	}
 
-	if (pair > 0 && pair <= MAX_XCURSES_PAIR) {
-	    IGNORE_RC(init_pair((short)pair, (short)fg, (short)bg));
-	} else {
+	if (_nc_init_pair(SP_PARM, pair, fg, bg) == ERR)
 	    pair = ERR;
-	}
     }
     returnCode(pair);
 }
@@ -336,5 +336,5 @@ void _nc_new_pair(void);
 void
 _nc_new_pair(void)
 {
-};
+}
 #endif /* USE_NEW_PAIR */
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 851d7bb2..d01109c5 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.564 2017/03/25 23:26:05 tom Exp $
+ * $Id: curses.priv.h,v 1.567 2017/04/01 17:10:55 tom Exp $
  *
  *	curses.priv.h
  *
@@ -326,8 +326,8 @@ typedef TRIES {
 
 typedef struct
 {
-    NCURSES_COLOR_T red, green, blue;	/* what color_content() returns */
-    NCURSES_COLOR_T r, g, b;		/* params to init_color() */
+    int red, green, blue;	/* what color_content() returns */
+    int r, g, b;		/* params to init_color() */
     int init;			/* true if we called init_color() */
 }
 color_t;
@@ -416,9 +416,6 @@ color_t;
 #define unColor(n)		unColor2(AttrOf(n))
 #define unColor2(a)		((a) & ALL_BUT_COLOR)
 
-#define XCURSES_PAIR_T		short
-#define MAX_XCURSES_PAIR	(int) ((1U << 15) - 1)
-
 /*
  * Extended-colors stores the color pair in a separate struct-member than the
  * attributes.  But for compatibility, we handle most cases where a program
@@ -640,6 +637,11 @@ extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *);
  */
 #include 
 
+/*
+ * As an extension, support color values and color pairs past 2^16.
+ */
+#define USE_EXTENDED_COLORS	USE_NEW_PAIR
+
 #define isDefaultColor(c)	((c) < 0)
 #define COLOR_DEFAULT		-1
 
@@ -1932,6 +1934,9 @@ extern NCURSES_EXPORT(int) _nc_wchstrlen(const cchar_t *);
 #endif
 
 /* lib_color.c */
+extern NCURSES_EXPORT(int) _nc_init_color(SCREEN *, int, int, int, int);
+extern NCURSES_EXPORT(int) _nc_init_pair(SCREEN *, int, int, int);
+extern NCURSES_EXPORT(int) _nc_pair_content(SCREEN *, int, int *, int *);
 extern NCURSES_EXPORT(bool) _nc_reset_colors(void);
 extern NCURSES_EXPORT(void) _nc_change_pair(SCREEN *, int);
 
@@ -2084,6 +2089,7 @@ extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void);
 extern NCURSES_EXPORT(void) _nc_db_iterator_leaks(void);
 extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);
 extern NCURSES_EXPORT(void) _nc_names_leaks(void);
+extern NCURSES_EXPORT(void) _nc_tgetent_leak(TERMINAL *);
 extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
 #endif
 
@@ -2169,7 +2175,7 @@ extern NCURSES_EXPORT_VAR(int *) _nc_oldnums;
 
 #define USE_SETBUF_0 0
 
-#define NC_OUTPUT(sp) ((sp != 0) ? sp->_ofp : stdout)
+#define NC_OUTPUT(sp) ((sp != 0 && sp->_ofp != 0) ? sp->_ofp : stdout)
 
 /*
  * On systems with a broken linker, define 'SP' as a function to force the
@@ -2450,7 +2456,6 @@ extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(_nc_makenew) (SCREEN*, int, int,
 extern NCURSES_EXPORT(bool)     NCURSES_SP_NAME(_nc_reset_colors)(SCREEN*);
 extern NCURSES_EXPORT(char *)   NCURSES_SP_NAME(_nc_printf_string)(SCREEN*, const char *, va_list);
 extern NCURSES_EXPORT(chtype)   NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_curs_set)(SCREEN*,int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_get_tty_mode)(SCREEN*,TTY*);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_msec_cost)(SCREEN*, const char *, int);
@@ -2459,19 +2464,11 @@ extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_outch)(SCREEN*, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_putchar)(SCREEN*, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_putp)(SCREEN*, const char *, const char*);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const char *, const char *);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resetty)(SCREEN*);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_ripoffline)(SCREEN*, int, int (*)(WINDOW *,int));
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_savetty)(SCREEN*);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int);
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vid_attr)(SCREEN *, attr_t, NCURSES_COLOR_T, void *);
-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int));
 extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC);
 extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t);
 extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_flush)(SCREEN*);
diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index e6d98628..41f1e6db 100644
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -34,7 +34,6 @@
 /* ./tty/hardscroll.c */
 
 #include 
-
 #undef _nc_oldnums
 int	*_nc_oldnums;
 
@@ -182,7 +181,7 @@ int	wchgat(
 		WINDOW	*win, 
 		int	n, 
 		attr_t	attr, 
-		short	color, 
+		short	pair_arg, 
 		const void *opts)
 		{ return(*(int *)0); }
 
@@ -246,6 +245,14 @@ void	_nc_change_pair(
 		int	pair)
 		{ /* void */ }
 
+#undef _nc_init_pair
+int	_nc_init_pair(
+		SCREEN	*sp, 
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_pair_sp
 int	init_pair_sp(
 		SCREEN	*sp, 
@@ -261,6 +268,15 @@ int	init_pair(
 		short	b)
 		{ return(*(int *)0); }
 
+#undef _nc_init_color
+int	_nc_init_color(
+		SCREEN	*sp, 
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_color_sp
 int	init_color_sp(
 		SCREEN	*sp, 
@@ -313,6 +329,14 @@ int	color_content(
 		short	*b)
 		{ return(*(int *)0); }
 
+#undef _nc_pair_content
+int	_nc_pair_content(
+		SCREEN	*sp, 
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
 #undef pair_content_sp
 int	pair_content_sp(
 		SCREEN	*sp, 
@@ -350,7 +374,7 @@ void	_nc_do_color(
 #undef wcolor_set
 int	wcolor_set(
 		WINDOW	*win, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2076,14 +2100,14 @@ int	slk_restore(void)
 int	slk_attr_set_sp(
 		SCREEN	*sp, 
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
 #undef slk_attr_set
 int	slk_attr_set(
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2153,12 +2177,12 @@ int	slk_clear(void)
 #undef slk_color_sp
 int	slk_color_sp(
 		SCREEN	*sp, 
-		short	color_pair_number)
+		short	pair_arg)
 		{ return(*(int *)0); }
 
 #undef slk_color
 int	slk_color(
-		short	color_pair_number)
+		short	pair_arg)
 		{ return(*(int *)0); }
 
 /* ./base/lib_slkinit.c */
@@ -2647,42 +2671,9 @@ int	mcprint(
 
 /* ./base/new_pair.c */
 
-#undef alloc_pair_sp
-int	alloc_pair_sp(
-		SCREEN	*sp, 
-		int	fg, 
-		int	bg)
-		{ return(*(int *)0); }
-
-#undef find_pair_sp
-int	find_pair_sp(
-		SCREEN	*sp, 
-		int	fg, 
-		int	bg)
-		{ return(*(int *)0); }
-
-#undef free_pair_sp
-int	free_pair_sp(
-		SCREEN	*sp, 
-		int	pair)
-		{ return(*(int *)0); }
-
-#undef alloc_pair
-int	alloc_pair(
-		int	f, 
-		int	b)
-		{ return(*(int *)0); }
-
-#undef find_pair
-int	find_pair(
-		int	f, 
-		int	b)
-		{ return(*(int *)0); }
-
-#undef free_pair
-int	free_pair(
-		int	pair)
-		{ return(*(int *)0); }
+#undef _nc_new_pair
+void	_nc_new_pair(void)
+		{ /* void */ }
 
 /* ./base/resizeterm.c */
 
diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index 4a60f72f..b88c9426 100644
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -34,7 +34,6 @@
 /* ./tty/hardscroll.c */
 
 #include 
-
 #undef _nc_oldnums
 int	*_nc_oldnums;
 
@@ -182,7 +181,7 @@ int	wchgat(
 		WINDOW	*win, 
 		int	n, 
 		attr_t	attr, 
-		short	color, 
+		short	pair_arg, 
 		const void *opts)
 		{ return(*(int *)0); }
 
@@ -249,6 +248,14 @@ void	_nc_change_pair(
 		int	pair)
 		{ /* void */ }
 
+#undef _nc_init_pair
+int	_nc_init_pair(
+		SCREEN	*sp, 
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_pair_sp
 int	init_pair_sp(
 		SCREEN	*sp, 
@@ -264,6 +271,15 @@ int	init_pair(
 		short	b)
 		{ return(*(int *)0); }
 
+#undef _nc_init_color
+int	_nc_init_color(
+		SCREEN	*sp, 
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_color_sp
 int	init_color_sp(
 		SCREEN	*sp, 
@@ -316,6 +332,14 @@ int	color_content(
 		short	*b)
 		{ return(*(int *)0); }
 
+#undef _nc_pair_content
+int	_nc_pair_content(
+		SCREEN	*sp, 
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
 #undef pair_content_sp
 int	pair_content_sp(
 		SCREEN	*sp, 
@@ -353,7 +377,7 @@ void	_nc_do_color(
 #undef wcolor_set
 int	wcolor_set(
 		WINDOW	*win, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2085,14 +2109,14 @@ int	slk_restore(void)
 int	slk_attr_set_sp(
 		SCREEN	*sp, 
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
 #undef slk_attr_set
 int	slk_attr_set(
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2162,12 +2186,12 @@ int	slk_clear(void)
 #undef slk_color_sp
 int	slk_color_sp(
 		SCREEN	*sp, 
-		short	color_pair_number)
+		short	pair_arg)
 		{ return(*(int *)0); }
 
 #undef slk_color
 int	slk_color(
-		short	color_pair_number)
+		short	pair_arg)
 		{ return(*(int *)0); }
 
 /* ./base/lib_slkinit.c */
@@ -2656,42 +2680,9 @@ int	mcprint(
 
 /* ./base/new_pair.c */
 
-#undef alloc_pair_sp
-int	alloc_pair_sp(
-		SCREEN	*sp, 
-		int	fg, 
-		int	bg)
-		{ return(*(int *)0); }
-
-#undef find_pair_sp
-int	find_pair_sp(
-		SCREEN	*sp, 
-		int	fg, 
-		int	bg)
-		{ return(*(int *)0); }
-
-#undef free_pair_sp
-int	free_pair_sp(
-		SCREEN	*sp, 
-		int	pair)
-		{ return(*(int *)0); }
-
-#undef alloc_pair
-int	alloc_pair(
-		int	f, 
-		int	b)
-		{ return(*(int *)0); }
-
-#undef find_pair
-int	find_pair(
-		int	f, 
-		int	b)
-		{ return(*(int *)0); }
-
-#undef free_pair
-int	free_pair(
-		int	pair)
-		{ return(*(int *)0); }
+#undef _nc_new_pair
+void	_nc_new_pair(void)
+		{ /* void */ }
 
 /* ./base/resizeterm.c */
 
diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 80d191ae..7fde5801 100644
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -34,7 +34,6 @@
 /* ./tty/hardscroll.c */
 
 #include 
-
 #undef _nc_oldnums
 int	*_nc_oldnums;
 
@@ -219,7 +218,7 @@ int	wchgat(
 		WINDOW	*win, 
 		int	n, 
 		attr_t	attr, 
-		short	color, 
+		short	pair_arg, 
 		const void *opts)
 		{ return(*(int *)0); }
 
@@ -286,6 +285,14 @@ void	_nc_change_pair(
 		int	pair)
 		{ /* void */ }
 
+#undef _nc_init_pair
+int	_nc_init_pair(
+		SCREEN	*sp, 
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_pair_sp
 int	init_pair_sp(
 		SCREEN	*sp, 
@@ -301,6 +308,15 @@ int	init_pair(
 		short	b)
 		{ return(*(int *)0); }
 
+#undef _nc_init_color
+int	_nc_init_color(
+		SCREEN	*sp, 
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_color_sp
 int	init_color_sp(
 		SCREEN	*sp, 
@@ -353,6 +369,14 @@ int	color_content(
 		short	*b)
 		{ return(*(int *)0); }
 
+#undef _nc_pair_content
+int	_nc_pair_content(
+		SCREEN	*sp, 
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
 #undef pair_content_sp
 int	pair_content_sp(
 		SCREEN	*sp, 
@@ -385,12 +409,76 @@ void	_nc_do_color(
 		NCURSES_OUTC outc)
 		{ /* void */ }
 
+#undef init_extended_pair_sp
+int	init_extended_pair_sp(
+		SCREEN	*sp, 
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef init_extended_color_sp
+int	init_extended_color_sp(
+		SCREEN	*sp, 
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef extended_color_content_sp
+int	extended_color_content_sp(
+		SCREEN	*sp, 
+		int	color, 
+		int	*r, 
+		int	*g, 
+		int	*b)
+		{ return(*(int *)0); }
+
+#undef extended_pair_content_sp
+int	extended_pair_content_sp(
+		SCREEN	*sp, 
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
+#undef init_extended_pair
+int	init_extended_pair(
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef init_extended_color
+int	init_extended_color(
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef extended_color_content
+int	extended_color_content(
+		int	color, 
+		int	*r, 
+		int	*g, 
+		int	*b)
+		{ return(*(int *)0); }
+
+#undef extended_pair_content
+int	extended_pair_content(
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
 /* ./base/lib_colorset.c */
 
 #undef wcolor_set
 int	wcolor_set(
 		WINDOW	*win, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2593,14 +2681,14 @@ int	slk_restore(void)
 int	slk_attr_set_sp(
 		SCREEN	*sp, 
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
 #undef slk_attr_set
 int	slk_attr_set(
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2670,12 +2758,23 @@ int	slk_clear(void)
 #undef slk_color_sp
 int	slk_color_sp(
 		SCREEN	*sp, 
-		short	color_pair_number)
+		short	pair_arg)
 		{ return(*(int *)0); }
 
 #undef slk_color
 int	slk_color(
-		short	color_pair_number)
+		short	pair_arg)
+		{ return(*(int *)0); }
+
+#undef extended_slk_color_sp
+int	extended_slk_color_sp(
+		SCREEN	*sp, 
+		int	pair_arg)
+		{ return(*(int *)0); }
+
+#undef extended_slk_color
+int	extended_slk_color(
+		int	pair_arg)
 		{ return(*(int *)0); }
 
 /* ./base/lib_slkinit.c */
@@ -3116,7 +3215,7 @@ int	setcchar(
 		cchar_t	*wcval, 
 		const wchar_t *wch, 
 		const attr_t attrs, 
-		short	color_pair, 
+		short	pair_arg, 
 		const void *opts)
 		{ return(*(int *)0); }
 
@@ -3125,7 +3224,7 @@ int	getcchar(
 		const cchar_t *wcval, 
 		wchar_t	*wch, 
 		attr_t	*attrs, 
-		short	*color_pair, 
+		short	*pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -3270,7 +3369,7 @@ int	unget_wch(
 int	vid_puts_sp(
 		SCREEN	*sp, 
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts, 
 		NCURSES_OUTC_sp outc)
 		{ return(*(int *)0); }
@@ -3278,7 +3377,7 @@ int	vid_puts_sp(
 #undef vid_puts
 int	vid_puts(
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts, 
 		NCURSES_OUTC outc)
 		{ return(*(int *)0); }
@@ -3287,14 +3386,14 @@ int	vid_puts(
 int	vid_attr_sp(
 		SCREEN	*sp, 
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
 #undef vid_attr
 int	vid_attr(
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index c9ce866f..05732286 100644
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -34,7 +34,6 @@
 /* ./tty/hardscroll.c */
 
 #include 
-
 #undef _nc_oldnums
 int	*_nc_oldnums;
 
@@ -219,7 +218,7 @@ int	wchgat(
 		WINDOW	*win, 
 		int	n, 
 		attr_t	attr, 
-		short	color, 
+		short	pair_arg, 
 		const void *opts)
 		{ return(*(int *)0); }
 
@@ -283,6 +282,14 @@ void	_nc_change_pair(
 		int	pair)
 		{ /* void */ }
 
+#undef _nc_init_pair
+int	_nc_init_pair(
+		SCREEN	*sp, 
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_pair_sp
 int	init_pair_sp(
 		SCREEN	*sp, 
@@ -298,6 +305,15 @@ int	init_pair(
 		short	b)
 		{ return(*(int *)0); }
 
+#undef _nc_init_color
+int	_nc_init_color(
+		SCREEN	*sp, 
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
 #undef init_color_sp
 int	init_color_sp(
 		SCREEN	*sp, 
@@ -350,6 +366,14 @@ int	color_content(
 		short	*b)
 		{ return(*(int *)0); }
 
+#undef _nc_pair_content
+int	_nc_pair_content(
+		SCREEN	*sp, 
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
 #undef pair_content_sp
 int	pair_content_sp(
 		SCREEN	*sp, 
@@ -382,12 +406,76 @@ void	_nc_do_color(
 		NCURSES_OUTC outc)
 		{ /* void */ }
 
+#undef init_extended_pair_sp
+int	init_extended_pair_sp(
+		SCREEN	*sp, 
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef init_extended_color_sp
+int	init_extended_color_sp(
+		SCREEN	*sp, 
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef extended_color_content_sp
+int	extended_color_content_sp(
+		SCREEN	*sp, 
+		int	color, 
+		int	*r, 
+		int	*g, 
+		int	*b)
+		{ return(*(int *)0); }
+
+#undef extended_pair_content_sp
+int	extended_pair_content_sp(
+		SCREEN	*sp, 
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
+#undef init_extended_pair
+int	init_extended_pair(
+		int	pair, 
+		int	f, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef init_extended_color
+int	init_extended_color(
+		int	color, 
+		int	r, 
+		int	g, 
+		int	b)
+		{ return(*(int *)0); }
+
+#undef extended_color_content
+int	extended_color_content(
+		int	color, 
+		int	*r, 
+		int	*g, 
+		int	*b)
+		{ return(*(int *)0); }
+
+#undef extended_pair_content
+int	extended_pair_content(
+		int	pair, 
+		int	*f, 
+		int	*b)
+		{ return(*(int *)0); }
+
 /* ./base/lib_colorset.c */
 
 #undef wcolor_set
 int	wcolor_set(
 		WINDOW	*win, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2584,14 +2672,14 @@ int	slk_restore(void)
 int	slk_attr_set_sp(
 		SCREEN	*sp, 
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
 #undef slk_attr_set
 int	slk_attr_set(
 		const attr_t attr, 
-		short	color_pair_number, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -2661,12 +2749,23 @@ int	slk_clear(void)
 #undef slk_color_sp
 int	slk_color_sp(
 		SCREEN	*sp, 
-		short	color_pair_number)
+		short	pair_arg)
 		{ return(*(int *)0); }
 
 #undef slk_color
 int	slk_color(
-		short	color_pair_number)
+		short	pair_arg)
+		{ return(*(int *)0); }
+
+#undef extended_slk_color_sp
+int	extended_slk_color_sp(
+		SCREEN	*sp, 
+		int	pair_arg)
+		{ return(*(int *)0); }
+
+#undef extended_slk_color
+int	extended_slk_color(
+		int	pair_arg)
 		{ return(*(int *)0); }
 
 /* ./base/lib_slkinit.c */
@@ -3107,7 +3206,7 @@ int	setcchar(
 		cchar_t	*wcval, 
 		const wchar_t *wch, 
 		const attr_t attrs, 
-		short	color_pair, 
+		short	pair_arg, 
 		const void *opts)
 		{ return(*(int *)0); }
 
@@ -3116,7 +3215,7 @@ int	getcchar(
 		const cchar_t *wcval, 
 		wchar_t	*wch, 
 		attr_t	*attrs, 
-		short	*color_pair, 
+		short	*pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
@@ -3261,7 +3360,7 @@ int	unget_wch(
 int	vid_puts_sp(
 		SCREEN	*sp, 
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts, 
 		NCURSES_OUTC_sp outc)
 		{ return(*(int *)0); }
@@ -3269,7 +3368,7 @@ int	vid_puts_sp(
 #undef vid_puts
 int	vid_puts(
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts, 
 		NCURSES_OUTC outc)
 		{ return(*(int *)0); }
@@ -3278,14 +3377,14 @@ int	vid_puts(
 int	vid_attr_sp(
 		SCREEN	*sp, 
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
 #undef vid_attr
 int	vid_attr(
 		attr_t	newmode, 
-		short	pair, 
+		short	pair_arg, 
 		void	*opts)
 		{ return(*(int *)0); }
 
diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index 8c344dab..f5153d5b 100644
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -33,7 +33,7 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
- * $Id: new_pair.h,v 1.2 2017/03/10 09:20:43 tom Exp $
+ * $Id: new_pair.h,v 1.4 2017/03/31 11:32:07 tom Exp $
  */
 
 #ifndef NEW_PAIR_H
@@ -42,6 +42,35 @@
 
 #define USE_NEW_PAIR NCURSES_EXT_COLORS
 
+#define MAX_OF_TYPE(t)   (int)(((unsigned t)(~0))>>1)
+#define LIMIT_TYPED(n,t) (t)(((t)(n) < 0) ? MAX_OF_TYPE(t) : (n))
+
+#define limit_COLOR(n) LIMIT_TYPED(n,NCURSES_COLOR_T)
+#define limit_PAIRS(n) LIMIT_TYPED(n,NCURSES_PAIRS_T)
+
+#define MAX_XCURSES_PAIR MAX_OF_TYPE(NCURSES_PAIRS_T)
+
+#if USE_NEW_PAIR
+#define OPTIONAL_PAIR	GCC_UNUSED
+#define USE_NEW_PAIR NCURSES_EXT_COLORS
+#define get_extended_pair(opts, color_pair) \
+	if ((opts) != NULL) { \
+	    *(int*)(opts) = color_pair; \
+	}
+#define set_extended_pair(opts, color_pair) \
+	if ((opts) != NULL) { \
+	    color_pair = *(const int*)(opts); \
+	}
+#else
+#define OPTIONAL_PAIR	/* nothing */
+#define USE_NEW_PAIR NCURSES_EXT_COLORS
+#define get_extended_pair(opts, color_pair) /* nothing */
+#define set_extended_pair(opts, color_pair) \
+	if ((opts) != NULL) { \
+	    color_pair = -1; \
+	}
+#endif
+
 #ifdef NEW_PAIR_INTERNAL
 
 typedef enum {
@@ -56,7 +85,7 @@ typedef struct _color_pairs
     int fg;
     int bg;
 #if USE_NEW_PAIR
-    int mode;			/* FIXME - needed? */
+    int mode;			/* tells if the entry is allocated or free */
     int prev;			/* index of previous item */
     int next;			/* index of next item */
 #endif
diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 3430477d..d91e8aa9 100644
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -83,7 +83,7 @@
 #undef USE_OLD_TTY
 #endif /* USE_OLD_TTY */
 
-MODULE_ID("$Id: lib_baudrate.c,v 1.42 2016/10/03 00:29:21 tom Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.43 2017/03/31 17:19:30 tom Exp $")
 
 /*
  *	int
@@ -263,7 +263,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
      */
 #ifdef TRACE
     if (IsValidTIScreen(SP_PARM)
-	&& !NC_ISATTY(fileno(SP_PARM ? SP_PARM->_ofp : stdout))
+	&& !NC_ISATTY(fileno((SP_PARM && SP_PARM->_ofp) ? SP_PARM->_ofp : stdout))
 	&& getenv("BAUDRATE") != 0) {
 	int ret;
 	if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index 516d7e4e..c583aa7e 100644
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,7 +39,7 @@
 #include 
 #include 		/* ospeed */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.34 2016/05/28 23:22:52 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.36 2017/04/01 17:19:03 tom Exp $")
 
 #undef CUR
 #define CUR termp->type.
@@ -104,6 +104,11 @@ NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
 	if (termp->type.Strings) {
 	    PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
 	}
+#endif
+#if !USE_REENTRANT
+#define MY_SIZE (size_t) (NAMESIZE - 1)
+	_nc_STRNCPY(ttytype, termp->type.term_names, MY_SIZE);
+	ttytype[MY_SIZE] = '\0';
 #endif
     }
     _nc_unlock_global(curses);
@@ -154,6 +159,10 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
 	    TCB->drv->td_release(TCB);
 #endif
 	free(termp);
+#if NO_LEAKS
+	/* discard memory used in tgetent's cache for this terminal */
+	_nc_tgetent_leak(termp);
+#endif
 
 	rc = OK;
     }
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index 41fc674d..f1666dff 100644
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -42,7 +42,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_data.c,v 1.70 2017/01/14 17:52:32 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.71 2017/03/31 17:06:34 tom Exp $")
 
 /*
  * OS/2's native linker complains if we don't initialize public data when
@@ -94,7 +94,9 @@ _nc_screen(void)
 NCURSES_EXPORT(int)
 _nc_alloc_screen(void)
 {
-    return ((my_screen = _nc_alloc_screen_sp()) != 0);
+    my_screen = _nc_alloc_screen_sp();
+    T(("_nc_alloc_screen_sp %p", my_screen));
+    return (my_screen != 0);
 }
 
 NCURSES_EXPORT(void)
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 8446c803..c32887d4 100644
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -48,7 +48,7 @@
 #include 
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.170 2017/01/07 16:50:16 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.173 2017/04/01 13:48:38 tom Exp $")
 
 /****************************************************************************
  *
@@ -761,10 +761,11 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
 	 * If an application calls setupterm() rather than initscr() or
 	 * newterm(), we will not have the def_prog_mode() call in
 	 * _nc_setupscreen().  Do it now anyway, so we can initialize the
-	 * baudrate.
+	 * baudrate.  Also get the shell-mode so that erasechar() works.
 	 */
 	if (NC_ISATTY(Filedes)) {
-	    def_prog_mode();
+	    NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);
+	    NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
 	    baudrate();
 	}
 	code = OK;
@@ -811,9 +812,9 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
 #if NCURSES_SP_FUNCS
 /*
  * In case of handling multiple screens, we need to have a screen before
- * initialization in setupscreen takes place.  This is to extend the substitute
- * for some of the stuff in _nc_prescreen, especially for slk and ripoff
- * handling which should be done per screen.
+ * initialization in _nc_setupscreen takes place.  This is to extend the
+ * substitute for some of the stuff in _nc_prescreen, especially for slk and
+ * ripoff handling which should be done per screen.
  */
 NCURSES_EXPORT(SCREEN *)
 new_prescr(void)
@@ -824,6 +825,7 @@ new_prescr(void)
     T((T_CALLED("new_prescr()")));
 
     sp = _nc_alloc_screen_sp();
+    T(("_nc_alloc_screen_sp %p", sp));
     if (sp != 0) {
 	sp->rsp = sp->rippedoff;
 	sp->_filtered = _nc_prescreen.filter_mode;
diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index 6793ee50..817f28f7 100644
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -48,7 +48,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_termcap.c,v 1.81 2016/05/28 23:22:52 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.82 2017/04/01 17:24:07 tom Exp $")
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
@@ -391,13 +391,34 @@ tgetstr(NCURSES_CONST char *id, char **area)
 #endif
 
 #if NO_LEAKS
+#undef CacheInx
+#define CacheInx num
+NCURSES_EXPORT(void)
+_nc_tgetent_leak(TERMINAL * termp)
+{
+    if (termp != 0) {
+	int num;
+	for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
+	    if (LAST_TRM == termp) {
+		FreeIfNeeded(FIX_SGR0);
+		if (LAST_TRM != 0) {
+		    LAST_TRM = 0;
+		}
+		break;
+	    }
+	}
+    }
+}
+
 NCURSES_EXPORT(void)
 _nc_tgetent_leaks(void)
 {
+    int num;
     for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
-	FreeIfNeeded(FIX_SGR0);
-	if (LAST_TRM != 0)
+	if (LAST_TRM != 0) {
 	    del_curterm(LAST_TRM);
+	    _nc_tgetent_leak(LAST_TRM);
+	}
     }
 }
 #endif
diff --git a/ncurses/tinfo/lib_ttyflags.c b/ncurses/tinfo/lib_ttyflags.c
index 3faa3ad8..f4450d74 100644
--- a/ncurses/tinfo/lib_ttyflags.c
+++ b/ncurses/tinfo/lib_ttyflags.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -41,7 +41,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_ttyflags.c,v 1.31 2016/12/24 21:41:24 tom Exp $")
+MODULE_ID("$Id: lib_ttyflags.c,v 1.32 2017/04/01 11:48:03 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
@@ -141,7 +141,7 @@ NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0)
     int rc = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 
-    T((T_CALLED("def_shell_mode(%p)"), (void *) SP_PARM));
+    T((T_CALLED("def_shell_mode(%p) ->term %p"), (void *) SP_PARM, termp));
 
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
@@ -179,7 +179,7 @@ NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0)
     int rc = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 
-    T((T_CALLED("def_prog_mode(%p)"), (void *) SP_PARM));
+    T((T_CALLED("def_prog_mode(%p) ->term %p"), (void *) SP_PARM, termp));
 
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
@@ -215,7 +215,7 @@ NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0)
     int rc = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 
-    T((T_CALLED("reset_prog_mode(%p)"), (void *) SP_PARM));
+    T((T_CALLED("reset_prog_mode(%p) ->term %p"), (void *) SP_PARM, termp));
 
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
@@ -247,7 +247,7 @@ NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0)
     int rc = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 
-    T((T_CALLED("reset_shell_mode(%p)"), (void *) SP_PARM));
+    T((T_CALLED("reset_shell_mode(%p) ->term %p"), (void *) SP_PARM, termp));
 
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index 18c7e2fd..477cbbc2 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -51,7 +51,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.45 2017/02/28 22:10:05 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.47 2017/03/28 09:15:24 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -153,7 +153,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
     SCREEN *sp;
 
     START_TRACE();
-    T((T_CALLED("tinfo::drv_CanHandle(%p)"), TCB));
+    T((T_CALLED("tinfo::drv_CanHandle(%p)"), (void *) TCB));
 
     assert(TCB != 0 && tname != 0);
     termp = (TERMINAL *) TCB;
@@ -788,9 +788,9 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
 	     NCURSES_SP_OUTC outc)
 {
     SCREEN *sp = TCB->csp;
-    NCURSES_COLOR_T fg = COLOR_DEFAULT;
-    NCURSES_COLOR_T bg = COLOR_DEFAULT;
-    NCURSES_COLOR_T old_fg, old_bg;
+    int fg = COLOR_DEFAULT;
+    int bg = COLOR_DEFAULT;
+    int old_fg, old_bg;
 
     AssertTCB();
     if (sp == 0)
@@ -805,19 +805,13 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
 				    TPARM_1(set_color_pair, pair), 1, outc);
 	    return;
 	} else if (sp != 0) {
-	    NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx
-					   (short) pair,
-					   &fg,
-					   &bg);
+	    _nc_pair_content(SP_PARM, pair, &fg, &bg);
 	}
     }
 
     if (old_pair >= 0
 	&& sp != 0
-	&& NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx
-					  (short) old_pair,
-					  &old_fg,
-					  &old_bg) !=ERR) {
+	&& _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) {
 	if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
 	    || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
 #if NCURSES_EXT_FUNCS
@@ -846,13 +840,13 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
 
 #if NCURSES_EXT_FUNCS
     if (isDefaultColor(fg))
-	fg = (NCURSES_COLOR_T) default_fg(sp);
+	fg = default_fg(sp);
     if (isDefaultColor(bg))
-	bg = (NCURSES_COLOR_T) default_bg(sp);
+	bg = default_bg(sp);
 #endif
 
     if (reverse) {
-	NCURSES_COLOR_T xx = fg;
+	int xx = fg;
 	fg = bg;
 	bg = xx;
     }
diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 4e43e2b0..46a4786d 100644
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -84,7 +84,7 @@
 
 #include 
 
-MODULE_ID("$Id: tty_update.c,v 1.287 2017/02/28 22:13:45 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.288 2017/03/16 08:24:12 tom Exp $")
 
 /*
  * This define controls the line-breakout optimization.  Every once in a
@@ -2180,11 +2180,11 @@ NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_DCL0)
 	SP_PARM->_color_defs = -(SP_PARM->_color_defs);
 	for (n = 0; n < SP_PARM->_color_defs; ++n) {
 	    if (SP_PARM->_color_table[n].init) {
-		NCURSES_SP_NAME(init_color) (NCURSES_SP_ARGx
-					     (short) n,
-					     SP_PARM->_color_table[n].r,
-					     SP_PARM->_color_table[n].g,
-					     SP_PARM->_color_table[n].b);
+		_nc_init_color(SP_PARM,
+			       n,
+			       SP_PARM->_color_table[n].r,
+			       SP_PARM->_color_table[n].g,
+			       SP_PARM->_color_table[n].b);
 	    }
 	}
     }
diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index da28cfc0..b465c360 100644
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -35,7 +35,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_cchar.c,v 1.29 2017/03/04 19:56:00 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.31 2017/03/31 11:14:26 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -47,18 +47,19 @@ NCURSES_EXPORT(int)
 setcchar(cchar_t *wcval,
 	 const wchar_t *wch,
 	 const attr_t attrs,
-	 NCURSES_PAIRS_T color_pair,
+	 NCURSES_PAIRS_T pair_arg,
 	 const void *opts)
 {
-    unsigned len;
     int code = OK;
+    int color_pair = pair_arg;
+    unsigned len;
 
     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
 		      (void *) wcval, _nc_viswbuf(wch),
-		      (unsigned long) attrs, (int) color_pair, opts));
+		      (unsigned long) attrs, color_pair, opts));
 
-    if (opts != NULL
-	|| wch == NULL
+    set_extended_pair(opts, color_pair);
+    if (wch == NULL
 	|| ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)
 	|| color_pair < 0) {
 	code = ERR;
@@ -98,16 +99,17 @@ NCURSES_EXPORT(int)
 getcchar(const cchar_t *wcval,
 	 wchar_t *wch,
 	 attr_t *attrs,
-	 NCURSES_PAIRS_T *color_pair,
+	 NCURSES_PAIRS_T *pair_arg,
 	 void *opts)
 {
     int code = ERR;
+    int color_pair;
 
     TR(TRACE_CCALLS, (T_CALLED("getcchar(%p,%p,%p,%p,%p)"),
 		      (const void *) wcval,
 		      (void *) wch,
 		      (void *) attrs,
-		      (void *) color_pair,
+		      (void *) pair_arg,
 		      opts));
 
     if (opts == NULL && wcval != NULL) {
@@ -124,14 +126,16 @@ getcchar(const cchar_t *wcval,
 	     * If the value is not a null, return the length plus 1 for null.
 	     */
 	    code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX;
-	} else if (attrs == 0 || color_pair == 0) {
+	} else if (attrs == 0 || pair_arg == 0) {
 	    code = ERR;
 	} else if (len >= 0) {
 	    *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
-	    *color_pair = (NCURSES_PAIRS_T) GetPair(*wcval);
+	    color_pair = GetPair(*wcval);
+	    get_extended_pair(opts, color_pair);
+	    *pair_arg = limit_PAIRS(color_pair);
 	    wmemcpy(wch, wcval->chars, (size_t) len);
 	    wch[len] = L'\0';
-	    if (*color_pair >= 0)
+	    if (*pair_arg >= 0)
 		code = OK;
 	}
     }
diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index 80c1ea4e..8487edf0 100644
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2013,2014 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2014,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -36,7 +36,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.23 2014/06/07 22:13:46 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.24 2017/03/17 00:17:32 tom Exp $")
 
 #define doPut(mode) \
 	TPUTS_TRACE(#mode); \
@@ -51,12 +51,12 @@ MODULE_ID("$Id: lib_vid_attr.c,v 1.23 2014/06/07 22:13:46 tom Exp $")
 	/* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why, old_attr, old_pair) \
 	if (can_color && (why)) { \
-		TR(TRACE_ATTRS, ("old pair = %d -- new pair = %d", old_pair, pair)); \
-		if ((pair != old_pair) \
-		 || (fix_pair0 && (pair == 0)) \
+		TR(TRACE_ATTRS, ("old pair = %d -- new pair = %d", old_pair, color_pair)); \
+		if ((color_pair != old_pair) \
+		 || (fix_pair0 && (color_pair == 0)) \
 		 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
 		    NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx \
-						   old_pair, pair, \
+						   old_pair, color_pair, \
 						   reverse, outc); \
 		} \
 	}
@@ -68,10 +68,11 @@ MODULE_ID("$Id: lib_vid_attr.c,v 1.23 2014/06/07 22:13:46 tom Exp $")
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 			   attr_t newmode,
-			   NCURSES_PAIRS_T pair,
-			   void *opts GCC_UNUSED,
+			   NCURSES_PAIRS_T pair_arg,
+			   void *opts OPTIONAL_PAIR,
 			   NCURSES_SP_OUTC outc)
 {
+    int color_pair = pair_arg;
 #if NCURSES_EXT_COLORS
     static attr_t previous_attr = A_NORMAL;
     static int previous_pair = 0;
@@ -86,7 +87,8 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #endif
 
     newmode &= A_ATTRIBUTES;
-    T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
+    set_extended_pair(opts, color_pair);
+    T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), color_pair));
 
     /* this allows us to go on whether or not newterm() has been called */
     if (SP_PARM) {
@@ -107,7 +109,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
      * If we have a terminal that cannot combine color with video
      * attributes, use the colors in preference.
      */
-    if ((pair != 0
+    if ((color_pair != 0
 	 || fix_pair0)
 	&& (no_color_video > 0)) {
 	/*
@@ -136,7 +138,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
     }
 
     if (newmode == previous_attr
-	&& pair == previous_pair)
+	&& color_pair == previous_pair)
 	returnCode(OK);
 
     if (reverse) {
@@ -146,7 +148,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
     turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
     turn_on = (newmode & ~(previous_attr & TPARM_ATTR)) & ALL_BUT_COLOR;
 
-    SetColorsIf(((pair == 0) && !fix_pair0), previous_attr, previous_pair);
+    SetColorsIf(((color_pair == 0) && !fix_pair0), previous_attr, previous_pair);
 
     if (newmode == A_NORMAL) {
 	if ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
@@ -173,7 +175,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 	    previous_pair = 0;
 	}
 
-	SetColorsIf((pair != 0) || fix_pair0, previous_attr, previous_pair);
+	SetColorsIf((color_pair != 0) || fix_pair0, previous_attr, previous_pair);
     } else if (set_attributes) {
 	if (turn_on || turn_off) {
 	    TPUTS_TRACE("set_attributes");
@@ -201,7 +203,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 	    }
 	}
 #endif
-	SetColorsIf((pair != 0) || fix_pair0, previous_attr, previous_pair);
+	SetColorsIf((color_pair != 0) || fix_pair0, previous_attr, previous_pair);
     } else {
 
 	TR(TRACE_ATTRS, ("turning %s off", _traceattr(turn_off)));
@@ -226,7 +228,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 	    previous_attr &= ALL_BUT_COLOR;
 	    previous_pair = 0;
 	}
-	SetColorsIf((pair != 0) || fix_pair0, previous_attr, previous_pair);
+	SetColorsIf((color_pair != 0) || fix_pair0, previous_attr, previous_pair);
 
 	TR(TRACE_ATTRS, ("turning %s on", _traceattr(turn_on)));
 	/* *INDENT-OFF* */
@@ -259,16 +261,17 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 
     if (SP_PARM) {
 	SetAttr(SCREEN_ATTRS(SP_PARM), newmode);
-	SetPair(SCREEN_ATTRS(SP_PARM), pair);
+	SetPair(SCREEN_ATTRS(SP_PARM), color_pair);
     } else {
 	previous_attr = newmode;
-	previous_pair = pair;
+	previous_pair = color_pair;
     }
 
     returnCode(OK);
 #else
-    T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), (int) pair));
-    set_color(newmode, pair);
+    T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), color_pair));
+    (void) opts;
+    set_color(newmode, color_pair);
     returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx newmode, outc));
 #endif
 }
@@ -276,14 +279,14 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 vid_puts(attr_t newmode,
-	 NCURSES_PAIRS_T pair,
+	 NCURSES_PAIRS_T pair_arg,
 	 void *opts GCC_UNUSED,
 	 NCURSES_OUTC outc)
 {
     SetSafeOutcWrapper(outc);
     return NCURSES_SP_NAME(vid_puts) (CURRENT_SCREEN,
 				      newmode,
-				      pair,
+				      pair_arg,
 				      opts,
 				      _nc_outc_wrapper);
 }
@@ -293,22 +296,22 @@ vid_puts(attr_t newmode,
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx
 			   attr_t newmode,
-			   NCURSES_PAIRS_T pair,
+			   NCURSES_PAIRS_T pair_arg,
 			   void *opts)
 {
-    T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), (int) pair));
+    T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), (int) pair_arg));
     returnCode(NCURSES_SP_NAME(vid_puts) (NCURSES_SP_ARGx
 					  newmode,
-					  pair,
+					  pair_arg,
 					  opts,
 					  NCURSES_SP_NAME(_nc_putchar)));
 }
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
-vid_attr(attr_t newmode, NCURSES_PAIRS_T pair, void *opts)
+vid_attr(attr_t newmode, NCURSES_PAIRS_T pair_arg, void *opts)
 {
-    return NCURSES_SP_NAME(vid_attr) (CURRENT_SCREEN, newmode, pair, opts);
+    return NCURSES_SP_NAME(vid_attr) (CURRENT_SCREEN, newmode, pair_arg, opts);
 }
 #endif
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 894d091d..e4065743 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170325) unstable; urgency=low
+ncurses6 (6.0+20170401) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 18 Mar 2017 20:59:07 -0400
+ -- Thomas E. Dickey   Sun, 26 Mar 2017 09:39:03 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 894d091d..e4065743 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170325) unstable; urgency=low
+ncurses6 (6.0+20170401) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 18 Mar 2017 20:59:07 -0400
+ -- Thomas E. Dickey   Sun, 26 Mar 2017 09:39:03 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 7c33c3a1..c8f7a3ce 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170325) unstable; urgency=low
+ncurses6 (6.0+20170401) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 18 Mar 2017 20:59:07 -0400
+ -- Thomas E. Dickey   Sun, 26 Mar 2017 09:39:03 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index b1bb10d2..e67e1449 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.204 2017/03/19 00:59:07 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.205 2017/03/26 13:39:03 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "0"
 !define VERSION_YYYY  "2017"
-!define VERSION_MMDD  "0325"
+!define VERSION_MMDD  "0401"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 3e034601..0e802ba5 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.0
-Release: 20170325
+Release: 20170401
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.map b/package/ncurses.map
index ca44a09b..6965504e 100644
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.38 2017/03/09 09:48:41 tom Exp $
+# $Id: ncurses.map,v 1.39 2017/03/17 21:40:34 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -749,14 +749,28 @@ NCURSES_6.0.current {
 	global:
 		alloc_pair;
 		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
 		find_pair;
 		find_pair_sp;
 		free_pair;
 		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
 		unfocus_current_field;
 	local:
 		_*;
 		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
 } NCURSES_5.9.20150530;
 
 NCURSES_TIC_5.0.19991023 {
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 54c238b2..3c038cd7 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
-Release: 20170325
+Release: 20170401
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.sym b/package/ncurses.sym
index d7ac75e3..f805fa5d 100644
--- a/package/ncurses.sym
+++ b/package/ncurses.sym
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.27 2017/03/09 09:47:40 tom Exp $
+# $Id: ncurses.sym,v 1.28 2017/03/15 22:12:00 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -319,6 +319,10 @@ endwin_sp
 erase
 erasechar
 erasechar_sp
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
 field_arg
 field_back
 field_buffer
@@ -406,6 +410,10 @@ inchnstr
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
diff --git a/package/ncursest.map b/package/ncursest.map
index 771c07ae..0a9da88d 100644
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.34 2017/03/09 09:48:41 tom Exp $
+# $Id: ncursest.map,v 1.35 2017/03/17 21:40:34 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1120,12 +1120,26 @@ NCURSEST_6.0.current {
 	global:
 		alloc_pair;
 		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
 		find_pair;
 		find_pair_sp;
 		free_pair;
 		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
 		unfocus_current_field;
 	local:
 		_*;
 		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
 } NCURSEST_5.9.20150530;
diff --git a/package/ncursest.sym b/package/ncursest.sym
index 14ab6c2d..e3bb77a0 100644
--- a/package/ncursest.sym
+++ b/package/ncursest.sym
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.29 2017/03/09 09:47:40 tom Exp $
+# $Id: ncursest.sym,v 1.30 2017/03/15 22:12:00 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -314,6 +314,10 @@ endwin_sp
 erase
 erasechar
 erasechar_sp
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
 field_arg
 field_back
 field_buffer
@@ -401,6 +405,10 @@ inchnstr
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
diff --git a/package/ncursestw.map b/package/ncursestw.map
index c4a408ad..de92ca8f 100644
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.35 2017/03/09 09:48:41 tom Exp $
+# $Id: ncursestw.map,v 1.36 2017/03/17 21:40:34 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1239,12 +1239,26 @@ NCURSESTW_6.0.current {
 	global:
 		alloc_pair;
 		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
 		find_pair;
 		find_pair_sp;
 		free_pair;
 		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
 		unfocus_current_field;
 	local:
 		_*;
 		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
 } NCURSESTW_5.9.20150530;
diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index e056f947..70dde631 100644
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.27 2017/03/09 09:47:40 tom Exp $
+# $Id: ncursestw.sym,v 1.28 2017/03/15 22:12:00 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -332,6 +332,10 @@ erase
 erasechar
 erasechar_sp
 erasewchar
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
 field_arg
 field_back
 field_buffer
@@ -429,6 +433,10 @@ inchnstr
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
diff --git a/package/ncursesw.map b/package/ncursesw.map
index 78812499..01e0203b 100644
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.40 2017/03/09 09:48:41 tom Exp $
+# $Id: ncursesw.map,v 1.41 2017/03/17 21:40:34 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1264,12 +1264,26 @@ NCURSESW_6.0.current {
 	global:
 		alloc_pair;
 		alloc_pair_sp;
+		extended_color_content;
+		extended_color_content_sp;
+		extended_pair_content;
+		extended_pair_content_sp;
 		find_pair;
 		find_pair_sp;
 		free_pair;
 		free_pair_sp;
+		init_extended_color;
+		init_extended_color_sp;
+		init_extended_pair;
+		init_extended_pair_sp;
 		unfocus_current_field;
 	local:
 		_*;
 		_nc_Unset_Current_Field;
+		_nc_change_pair;
+		_nc_init_color;
+		_nc_init_pair;
+		_nc_pair_content;
+		_nc_reset_color_pair;
+		_nc_set_color_pair;
 } NCURSESW_5.9.20150530;
diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index addeaf82..b9c3458f 100644
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.28 2017/03/09 09:47:40 tom Exp $
+# $Id: ncursesw.sym,v 1.29 2017/03/15 22:12:00 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -334,6 +334,10 @@ erase
 erasechar
 erasechar_sp
 erasewchar
+extended_color_content
+extended_color_content_sp
+extended_pair_content
+extended_pair_content_sp
 field_arg
 field_back
 field_buffer
@@ -431,6 +435,10 @@ inchnstr
 inchstr
 init_color
 init_color_sp
+init_extended_color
+init_extended_color_sp
+init_extended_pair
+init_extended_pair_sp
 init_pair
 init_pair_sp
 initscr
diff --git a/test/README b/test/README
index 24dd4262..15f3925e 100644
--- a/test/README
+++ b/test/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.               --
+-- Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.               --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
 -- copy of this software and associated documentation files (the             --
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.57 2017/03/10 00:54:31 tom Exp $
+-- $Id: README,v 1.60 2017/04/01 19:40:31 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are used to test and demonstrate ncurses.
@@ -265,7 +265,7 @@ attroff				test: blue dots_curses echochar filter gdc ncurses tclock
 attron				test: blue bs dots_curses echochar filter gdc ncurses
 attrset				test: bs filter firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
 baudrate			test: ncurses
-baudrate_sp			lib: ncurses
+baudrate_sp			test: sp_tinfo
 beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_new_pair demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
 beep_sp				lib: ncurses
 bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
@@ -279,10 +279,10 @@ border				-
 border_set			-
 box				test: cardfile chgat clip_printw demo_forms demo_menus demo_new_pair demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 box_set				test: ncurses
-can_change_color		test: ncurses
-can_change_color_sp		-
-cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
-cbreak_sp			lib: ncurses
+can_change_color		test: extended_color ncurses
+can_change_color_sp		test: extended_color
+cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+cbreak_sp			test: sp_tinfo
 chgat				test: chgat
 clear				test: blue bs filter gdc ncurses testcurs xmas
 clearok				test: bs knight
@@ -290,23 +290,23 @@ clrtobot			test: demo_menus ncurses
 clrtoeol			test: blue bs demo_altkeys filter foldkeys form_driver_w hanoi hashtest movewindow ncurses view
 color_content			test: ncurses
 color_content_sp		-
-color_set			test: color_set ncurses
+color_set			test: color_set extended_color ncurses
 copywin				test: ncurses testcurs
-cur_term			test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrtest test_sgr test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tput tset
+cur_term			test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrtest sp_tinfo test_sgr test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tput tset
 curs_set			test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
-curs_set_sp			lib: ncurses
+curs_set_sp			test: sp_tinfo
 curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
 curses_version			test: ncurses progs: infocmp tabs tic toe tput tset
 def_prog_mode			test: bs ncurses
-def_prog_mode_sp		lib: ncurses
+def_prog_mode_sp		test: sp_tinfo
 def_shell_mode			-
-def_shell_mode_sp		lib: ncurses
+def_shell_mode_sp		test: sp_tinfo
 define_key			test: demo_altkeys demo_defkey foldkeys
-define_key_sp			-
-del_curterm			test: demo_terminfo test_sgr
+define_key_sp			test: sp_tinfo
+del_curterm			test: demo_terminfo sp_tinfo test_sgr
 del_curterm_sp			lib: ncurses
 delay_output			test: newdemo
-delay_output_sp			-
+delay_output_sp			test: sp_tinfo
 delch				-
 deleteln			test: insdelln
 delscreen			test: ditto dots_mvcur
@@ -319,12 +319,18 @@ echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
 echo_sp				lib: ncurses
 echo_wchar			test: ncurses
 echochar			test: echochar ncurses
-endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses dots_mvcur echochar filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses dots_mvcur echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
 endwin_sp			lib: ncurses
 erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
 erasechar			test: ncurses
-erasechar_sp			lib: ncurses
+erasechar_sp			test: sp_tinfo
 erasewchar			test: ncurses
+extended_color_content		test: extended_color
+extended_color_content_sp	test: extended_color
+extended_pair_content		test: extended_color
+extended_pair_content_sp	test: extended_color
+extended_slk_color		test: extended_color
+extended_slk_color_sp		test: extended_color
 filter				test: filter
 filter_sp			-
 find_pair			test: demo_new_pair
@@ -332,7 +338,7 @@ find_pair_sp			-
 flash				test: cardfile filter lrtest movewindow ncurses tclock testcurs
 flash_sp			-
 flushinp			test: ncurses newdemo testcurs
-flushinp_sp			lib: ncurses
+flushinp_sp			test: sp_tinfo
 free_pair			test: demo_new_pair
 free_pair_sp			-
 get_escdelay			-
@@ -345,9 +351,9 @@ getbegy				test: chgat clip_printw demo_menus demo_panels insdelln movewindow nc
 getbkgd				test: ncurses
 getbkgrnd			test: ncurses
 getcchar			test: ncurses view
-getch				test: background blue bs chgat color_set demo_altkeys demo_new_pair filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
-getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
-getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
+getch				test: background blue bs chgat color_set demo_altkeys demo_new_pair extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
+getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels extended_color filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
+getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field extended_color filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
 getmaxx				test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 getmaxy				test: chgat clip_printw demo_forms demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 getmouse			test: bs demo_menus knight movewindow ncurses testcurs
@@ -360,15 +366,15 @@ getstr				test: test_getstr
 getwin				test: ncurses
 getwin_sp			-
 halfdelay			test: view
-halfdelay_sp			-
-has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
+halfdelay_sp			test: sp_tinfo
+has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
 has_colors_sp			lib: ncurses
 has_ic				test: lrtest ncurses
-has_ic_sp			lib: ncurses
+has_ic_sp			test: sp_tinfo
 has_il				test: ncurses
-has_il_sp			lib: ncurses
+has_il_sp			test: sp_tinfo
 has_key				-
-has_key_sp			lib: ncurses
+has_key_sp			test: sp_tinfo
 has_mouse			-
 has_mouse_sp			-
 hline				test: gdc ncurses
@@ -383,7 +389,11 @@ inch				test: inchs
 inchnstr			test: inchs
 inchstr				test: inchs
 init_color			test: ncurses
-init_color_sp			lib: ncurses
+init_color_sp			-
+init_extended_color		test: extended_color
+init_extended_color_sp		test: extended_color
+init_extended_pair		test: extended_color
+init_extended_pair_sp		test: extended_color
 init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
 init_pair_sp			-
 initscr				test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels dots_curses echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
@@ -399,7 +409,7 @@ insnstr				test: inserts
 insstr				test: inserts
 instr				test: test_instr
 intrflush			test: demo_forms movewindow
-intrflush_sp			-
+intrflush_sp			test: sp_tinfo
 inwstr				test: test_inwstr
 is_cleared			test: test_opaque
 is_idcok			test: test_opaque
@@ -420,21 +430,21 @@ is_wintouched			lib: ncurses
 isendwin			-
 isendwin_sp			-
 key_defined			test: demo_defkey foldkeys
-key_defined_sp			lib: ncurses
+key_defined_sp			test: sp_tinfo
 key_name			test: key_names ncurses
 keybound			test: demo_altkeys demo_defkey
-keybound_sp			lib: ncurses
+keybound_sp			test: sp_tinfo
 keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw test_getstr testcurs view progs: tic
-keyname_sp			lib: ncurses
+keyname_sp			test: sp_tinfo
 keyok				test: demo_keyok foldkeys
-keyok_sp			lib: ncurses
+keyok_sp			test: sp_tinfo
 keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto edit_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
 killchar			test: ncurses
-killchar_sp			lib: ncurses
+killchar_sp			test: sp_tinfo
 killwchar			test: ncurses
 leaveok				test: hanoi test_opaque
 longname			test: ncurses testcurs progs: tput
-longname_sp			-
+longname_sp			test: sp_tinfo
 mcprint				-
 mcprint_sp			-
 meta				test: key_names keynames ncurses
@@ -528,31 +538,31 @@ mvwprintw			test: chgat clip_printw demo_menus demo_panels inch_wide inchs insde
 mvwscanw			test: testcurs
 mvwvline			test: ins_wide inserts movewindow test_add_wchstr test_addchstr test_addstr test_addwstr
 mvwvline_set			-
-napms				test: demo_panels ditto dots dots_curses dots_mvcur echochar firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset
-napms_sp			-
-new_prescr			lib: ncurses
+napms				test: demo_panels ditto dots dots_curses dots_mvcur echochar extended_color firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset
+napms_sp			test: sp_tinfo
+new_prescr			test: sp_tinfo
 newpad				test: edit_field ncurses testcurs
 newpad_sp			lib: ncurses
 newscr				lib: ncurses
-newterm				test: demo_altkeys demo_new_pair ditto dots_mvcur filter foldkeys gdc key_names keynames
+newterm				test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames
 newterm_sp			-
 newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
 newwin_sp			lib: ncurses
 nl				test: demo_forms ncurses rain testcurs
 nl_sp				lib: ncurses
 nocbreak			test: testcurs
-nocbreak_sp			lib: ncurses
-nodelay				test: demo_new_pair ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
-noecho				test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+nocbreak_sp			test: sp_tinfo
+nodelay				test: demo_new_pair ditto extended_color firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
+noecho				test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto extended_color firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
 noecho_sp			lib: ncurses
 nofilter			-
 nofilter_sp			-
 nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
 nonl_sp				lib: ncurses
 noqiflush			-
-noqiflush_sp			-
+noqiflush_sp			test: sp_tinfo
 noraw				test: demo_forms demo_menus ncurses testcurs
-noraw_sp			lib: ncurses
+noraw_sp			test: sp_tinfo
 notimeout			test: ncurses test_opaque
 numcodes			test: demo_termcap test_arrays progs: dump_entry
 numfnames			test: demo_terminfo test_arrays progs: dump_entry
@@ -566,22 +576,22 @@ pecho_wchar			-
 pechochar			-
 pnoutrefresh			test: edit_field ncurses
 prefresh			test: testcurs
-printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok filter foldkeys ncurses savescreen testcurs testscanw view
+printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok extended_color filter foldkeys ncurses savescreen testcurs testscanw view
 putp				test: filter test_sgr progs: tput
-putp_sp				-
+putp_sp				test: sp_tinfo
 putwin				test: ncurses
 qiflush				-
-qiflush_sp			-
+qiflush_sp			test: sp_tinfo
 raw				test: demo_forms ncurses redraw testcurs
-raw_sp				lib: ncurses
+raw_sp				test: sp_tinfo
 redrawwin			test: redraw view
 refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels dots_curses echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas
 reset_prog_mode			test: filter ncurses
-reset_prog_mode_sp		lib: ncurses
+reset_prog_mode_sp		test: sp_tinfo
 reset_shell_mode		test: bs filter savescreen
-reset_shell_mode_sp		lib: ncurses
+reset_shell_mode_sp		test: sp_tinfo
 resetty				-
-resetty_sp			-
+resetty_sp			test: sp_tinfo
 resize_term			test: view
 resize_term_sp			-
 resizeterm			-
@@ -591,7 +601,7 @@ restartterm_sp			-
 ripoffline			test: demo_menus ncurses
 ripoffline_sp			-
 savetty				-
-savetty_sp			-
+savetty_sp			test: sp_tinfo
 scanw				test: testcurs testscanw
 scr_dump			test: savescreen
 scr_init			test: savescreen
@@ -603,16 +613,16 @@ scr_set_sp			-
 scrl				test: view
 scroll				test: testcurs
 scrollok			test: clip_printw demo_altkeys demo_defkey demo_keyok demo_new_pair demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
-set_curterm			test: list_keys
-set_curterm_sp			-
+set_curterm			test: list_keys sp_tinfo
+set_curterm_sp			test: sp_tinfo
 set_escdelay			test: test_opaque
 set_escdelay_sp			lib: ncurses
 set_tabsize			test: test_opaque
-set_tabsize_sp			-
+set_tabsize_sp			test: sp_tinfo
 set_term			lib: ncurses
 setcchar			test: demo_new_pair demo_panels ins_wide ncurses test_add_wchstr test_addwstr view
 setscrreg			test: view
-setupterm			test: demo_terminfo dots list_keys test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
+setupterm			test: demo_terminfo dots list_keys sp_tinfo test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
 slk_attr			-
 slk_attr_off			-
 slk_attr_on			-
@@ -623,32 +633,32 @@ slk_attroff			lib: ncurses
 slk_attroff_sp			-
 slk_attron			lib: ncurses
 slk_attron_sp			-
-slk_attrset			test: ncurses
+slk_attrset			test: extended_color ncurses
 slk_attrset_sp			-
 slk_clear			test: ncurses
 slk_clear_sp			-
 slk_color			test: ncurses
 slk_color_sp			-
-slk_init			test: ncurses
+slk_init			test: extended_color ncurses
 slk_init_sp			-
 slk_label			test: ncurses
 slk_label_sp			-
-slk_noutrefresh			test: ncurses
+slk_noutrefresh			test: extended_color ncurses
 slk_noutrefresh_sp		-
 slk_refresh			test: ncurses
 slk_refresh_sp			lib: ncurses
 slk_restore			test: ncurses
 slk_restore_sp			lib: ncurses
-slk_set				test: ncurses
+slk_set				test: extended_color ncurses
 slk_set_sp			-
-slk_touch			test: ncurses
+slk_touch			test: extended_color ncurses
 slk_touch_sp			lib: ncurses
 slk_wset			test: ncurses
 standend			test: blue gdc ncurses
 standout			test: blue ncurses
-start_color			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
+start_color			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
 start_color_sp			-
-stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
+stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
 strcodes			test: demo_termcap test_arrays progs: dump_entry
 strfnames			test: demo_terminfo list_keys test_arrays progs: dump_entry
 strnames			test: demo_termcap demo_terminfo foldkeys list_keys test_arrays progs: dump_entry infocmp tic
@@ -660,35 +670,35 @@ term_attrs_sp			-
 termattrs			test: ncurses testcurs
 termattrs_sp			lib: ncurses
 termname			test: list_keys ncurses testcurs
-termname_sp			lib: ncurses
+termname_sp			test: sp_tinfo
 tgetent				test: demo_termcap dots_termcap railroad
-tgetent_sp			-
+tgetent_sp			test: sp_tinfo
 tgetflag			test: demo_termcap
-tgetflag_sp			-
+tgetflag_sp			test: sp_tinfo
 tgetnum				test: demo_termcap dots_termcap railroad
-tgetnum_sp			-
+tgetnum_sp			test: sp_tinfo
 tgetstr				test: demo_termcap dots_termcap railroad
-tgetstr_sp			-
+tgetstr_sp			test: sp_tinfo
 tgoto				test: dots_termcap railroad progs: tic
 tigetflag			test: demo_terminfo progs: tic tput
-tigetflag_sp			-
+tigetflag_sp			test: sp_tinfo
 tigetnum			test: demo_terminfo ncurses progs: tput
-tigetnum_sp			-
+tigetnum_sp			test: sp_tinfo
 tigetstr			test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys test_sgr testcurs progs: clear_cmd tput
-tigetstr_sp			-
+tigetstr_sp			test: sp_tinfo
 timeout				test: filter rain savescreen
 tiparm				-
 touchline			test: chgat clip_printw insdelln
 touchwin			test: chgat clip_printw demo_menus demo_new_pair edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
 tparm				test: dots dots_mvcur test_sgr progs: reset_cmd tabs tic tput
 tputs				test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs
-tputs_sp			lib: ncurses
+tputs_sp			test: sp_tinfo
 trace				test: demo_menus hashtest lrtest ncurses testcurs view worm
 ttytype				test: demo_terminfo test_sgr
 typeahead			test: testcurs
-typeahead_sp			lib: ncurses
+typeahead_sp			test: sp_tinfo
 unctrl				test: ncurses redraw test_add_wchstr test_addchstr testcurs
-unctrl_sp			lib: ncurses
+unctrl_sp			test: sp_tinfo
 unget_wch			-
 unget_wch_sp			-
 ungetch				test: bs knight
@@ -699,13 +709,13 @@ untouchwin			lib: form
 use_default_colors		test: background filter firework gdc hanoi knight ncurses rain tclock worm xmas
 use_default_colors_sp		-
 use_env				test: ncurses progs: tput
-use_env_sp			-
+use_env_sp			test: sp_tinfo
 use_extended_names		test: demo_termcap demo_terminfo list_keys progs: infocmp tic
 use_legacy_coding		-
 use_legacy_coding_sp		-
 use_screen			test: ditto
 use_tioctl			test: ncurses
-use_tioctl_sp			-
+use_tioctl_sp			test: sp_tinfo
 use_window			test: rain worm
 vid_attr			test: test_vid_puts
 vid_attr_sp			-
@@ -787,7 +797,7 @@ winsstr				test: inserts
 winstr				test: test_instr
 winwstr				test: test_inwstr
 wmouse_trafo			test: ncurses
-wmove				test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_new_pair demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
+wmove				test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_new_pair demo_panels extended_color firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
 wnoutrefresh			test: demo_menus ditto edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque
 wprintw				test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 wredrawln			test: redraw
diff --git a/test/configure b/test/configure
index f4a596be..77227288 100755
--- a/test/configure
+++ b/test/configure
@@ -15261,6 +15261,7 @@ getmaxx \
 getnstr \
 getparx \
 getwin \
+init_extended_color \
 mvvline \
 mvwvline \
 napms \
@@ -15277,6 +15278,7 @@ termattrs \
 tgetent \
 tigetnum \
 tigetstr \
+tputs_sp \
 typeahead \
 use_default_colors \
 use_env \
@@ -15296,10 +15298,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:15299: checking for ${cf_func}" >&5
+	echo "$as_me:15301: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:15302: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:15304: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15308,7 +15310,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15311 "configure"
+#line 15313 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -15341,16 +15343,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15347: \$? = $ac_status" >&5
+  echo "$as_me:15349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15353: \$? = $ac_status" >&5
+  echo "$as_me:15355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15366,7 +15368,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:15369: result: $cf_result" >&5
+	echo "$as_me:15371: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <&5
+	echo "$as_me:15386: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:15387: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:15389: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15393,7 +15395,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15396 "configure"
+#line 15398 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -15426,16 +15428,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15432: \$? = $ac_status" >&5
+  echo "$as_me:15434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15438: \$? = $ac_status" >&5
+  echo "$as_me:15440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15451,7 +15453,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:15454: result: $cf_result" >&5
+	echo "$as_me:15456: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
-#line 15478 "configure"
+#line 15480 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15495,21 +15497,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15501: \$? = $ac_status" >&5
+  echo "$as_me:15503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15507: \$? = $ac_status" >&5
+  echo "$as_me:15509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
 
-echo "${as_me:-configure}:15512: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:15514: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
 
 		cat >>confdefs.h <&5
+echo "$as_me:15534: 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 15539 "configure"
+#line 15541 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15551,16 +15553,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15557: \$? = $ac_status" >&5
+  echo "$as_me:15559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15563: \$? = $ac_status" >&5
+  echo "$as_me:15565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
@@ -15568,7 +15570,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15571 "configure"
+#line 15573 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15593,16 +15595,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15599: \$? = $ac_status" >&5
+  echo "$as_me:15601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15605: \$? = $ac_status" >&5
+  echo "$as_me:15607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
@@ -15616,7 +15618,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15619: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:15621: 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
@@ -15630,11 +15632,11 @@ then
 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
 	then
 		cf_define_xpg5=no
-		echo "$as_me:15633: checking if _XPG5 should be defined to enable wide-characters" >&5
+		echo "$as_me:15635: 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 15637 "configure"
+#line 15639 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15647,16 +15649,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15653: \$? = $ac_status" >&5
+  echo "$as_me:15655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15659: \$? = $ac_status" >&5
+  echo "$as_me:15661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15665,7 +15667,7 @@ cat conftest.$ac_ext >&5
 cf_save_cppflags="$CPPFLAGS"
 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
 			 cat >conftest.$ac_ext <<_ACEOF
-#line 15668 "configure"
+#line 15670 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15678,16 +15680,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15684: \$? = $ac_status" >&5
+  echo "$as_me:15686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15690: \$? = $ac_status" >&5
+  echo "$as_me:15692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_define_xpg5=yes
 else
@@ -15698,7 +15700,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:15701: result: $cf_define_xpg5" >&5
+		echo "$as_me:15703: result: $cf_define_xpg5" >&5
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
 		if test "$cf_define_xpg5" = yes
@@ -15707,14 +15709,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
 		fi
 	fi
 
-	echo "$as_me:15710: checking for wide-character functions" >&5
+	echo "$as_me:15712: 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 15717 "configure"
+#line 15719 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15731,16 +15733,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15737: \$? = $ac_status" >&5
+  echo "$as_me:15739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15743: \$? = $ac_status" >&5
+  echo "$as_me:15745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widechar_funcs=yes
 else
@@ -15751,7 +15753,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15754: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:15756: result: $cf_cv_widechar_funcs" >&5
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
 	if test "$cf_cv_widechar_funcs" != no ; then
 
@@ -15772,14 +15774,14 @@ EOF
 
 fi
 
-echo "$as_me:15775: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:15777: 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 15782 "configure"
+#line 15784 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -15797,16 +15799,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15803: \$? = $ac_status" >&5
+  echo "$as_me:15805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15809: \$? = $ac_status" >&5
+  echo "$as_me:15811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_use_pthreads=yes
 else
@@ -15817,20 +15819,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15820: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:15822: 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:15826: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:15828: 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 15833 "configure"
+#line 15835 "configure"
 #include "confdefs.h"
 
 #include 
@@ -15850,16 +15852,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15853: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15856: \$? = $ac_status" >&5
+  echo "$as_me:15858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15862: \$? = $ac_status" >&5
+  echo "$as_me:15864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sys_time_select=yes
 else
@@ -15871,7 +15873,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:15874: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:15876: 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
@@ -15880,7 +15882,7 @@ EOF
 
 # special check for test/ditto.c
 
-echo "$as_me:15883: checking for openpty in -lutil" >&5
+echo "$as_me:15885: 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
@@ -15888,7 +15890,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15891 "configure"
+#line 15893 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15907,16 +15909,16 @@ openpty ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15913: \$? = $ac_status" >&5
+  echo "$as_me:15915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15919: \$? = $ac_status" >&5
+  echo "$as_me:15921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -15927,7 +15929,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15930: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:15932: 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
@@ -15935,7 +15937,7 @@ else
   cf_cv_lib_util=no
 fi
 
-echo "$as_me:15938: checking for openpty header" >&5
+echo "$as_me:15940: 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
@@ -15962,7 +15964,7 @@ LIBS="$cf_add_libs"
 	for cf_header in pty.h libutil.h util.h
 	do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15965 "configure"
+#line 15967 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -15979,16 +15981,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15985: \$? = $ac_status" >&5
+  echo "$as_me:15987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15991: \$? = $ac_status" >&5
+  echo "$as_me:15993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cf_cv_func_openpty=$cf_header
@@ -16006,7 +16008,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:16009: result: $cf_cv_func_openpty" >&5
+echo "$as_me:16011: result: $cf_cv_func_openpty" >&5
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
@@ -16040,7 +16042,7 @@ TEST_LIBS="$cf_add_libs"
 	fi
 fi
 
-echo "$as_me:16043: checking for function curses_version" >&5
+echo "$as_me:16045: 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
@@ -16050,7 +16052,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16053 "configure"
+#line 16055 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -16063,15 +16065,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16069: \$? = $ac_status" >&5
+  echo "$as_me:16071: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16074: \$? = $ac_status" >&5
+  echo "$as_me:16076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -16086,14 +16088,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:16089: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:16091: 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:16096: checking for alternate character set array" >&5
+echo "$as_me:16098: 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
@@ -16103,7 +16105,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 16106 "configure"
+#line 16108 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -16119,16 +16121,16 @@ $name['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16125: \$? = $ac_status" >&5
+  echo "$as_me:16127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16131: \$? = $ac_status" >&5
+  echo "$as_me:16133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
@@ -16139,7 +16141,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16142: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:16144: result: $cf_cv_curses_acs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
@@ -16149,7 +16151,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
-echo "$as_me:16152: checking for wide alternate character set array" >&5
+echo "$as_me:16154: 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
@@ -16159,7 +16161,7 @@ else
 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
 	do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16162 "configure"
+#line 16164 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16175,16 +16177,16 @@ void *foo = &($name['k'])
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16181: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16187: \$? = $ac_status" >&5
+  echo "$as_me:16189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_map=$name
 	 break
@@ -16195,7 +16197,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 fi
-echo "$as_me:16198: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:16200: result: $cf_cv_curses_wacs_map" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
@@ -16203,7 +16205,7 @@ cat >>confdefs.h <&5
+echo "$as_me:16208: 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
@@ -16213,7 +16215,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16216 "configure"
+#line 16218 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16230,16 +16232,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16236: \$? = $ac_status" >&5
+  echo "$as_me:16238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16242: \$? = $ac_status" >&5
+  echo "$as_me:16244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -16249,7 +16251,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16252 "configure"
+#line 16254 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16265,16 +16267,16 @@ cchar_t *foo = WACS_PLUS
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16271: \$? = $ac_status" >&5
+  echo "$as_me:16273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16277: \$? = $ac_status" >&5
+  echo "$as_me:16279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
@@ -16285,7 +16287,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:16288: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:16290: result: $cf_cv_curses_wacs_symbols" >&5
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
@@ -16295,10 +16297,10 @@ EOF
 
 fi
 
-echo "$as_me:16298: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16300: 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 16301 "configure"
+#line 16303 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16316,16 +16318,16 @@ attr_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16322: \$? = $ac_status" >&5
+  echo "$as_me:16324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16328: \$? = $ac_status" >&5
+  echo "$as_me:16330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16334,7 +16336,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16337: result: $cf_result" >&5
+echo "$as_me:16339: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
@@ -16355,14 +16357,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:16358: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:16360: 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 16365 "configure"
+#line 16367 "configure"
 #include "confdefs.h"
 
 #include 
@@ -16380,23 +16382,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16386: \$? = $ac_status" >&5
+  echo "$as_me:16388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16392: \$? = $ac_status" >&5
+  echo "$as_me:16394: \$? = $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 16399 "configure"
+#line 16401 "configure"
 #include "confdefs.h"
 
 #include 
@@ -16415,16 +16417,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16421: \$? = $ac_status" >&5
+  echo "$as_me:16423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16427: \$? = $ac_status" >&5
+  echo "$as_me:16429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -16436,7 +16438,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:16439: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:16441: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -16459,14 +16461,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:16462: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:16464: 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 16469 "configure"
+#line 16471 "configure"
 #include "confdefs.h"
 
 #include 
@@ -16484,23 +16486,23 @@ wchar_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16490: \$? = $ac_status" >&5
+  echo "$as_me:16492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16496: \$? = $ac_status" >&5
+  echo "$as_me:16498: \$? = $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 16503 "configure"
+#line 16505 "configure"
 #include "confdefs.h"
 
 #include 
@@ -16519,16 +16521,16 @@ wchar_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16525: \$? = $ac_status" >&5
+  echo "$as_me:16527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16531: \$? = $ac_status" >&5
+  echo "$as_me:16533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else
@@ -16540,7 +16542,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:16543: result: $cf_cv_wchar_t" >&5
+echo "$as_me:16545: result: $cf_cv_wchar_t" >&5
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
@@ -16563,14 +16565,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:16566: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:16568: 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 16573 "configure"
+#line 16575 "configure"
 #include "confdefs.h"
 
 #include 
@@ -16588,23 +16590,23 @@ wint_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16591: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16594: \$? = $ac_status" >&5
+  echo "$as_me:16596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16600: \$? = $ac_status" >&5
+  echo "$as_me:16602: \$? = $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 16607 "configure"
+#line 16609 "configure"
 #include "confdefs.h"
 
 #include 
@@ -16623,16 +16625,16 @@ wint_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16629: \$? = $ac_status" >&5
+  echo "$as_me:16631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16635: \$? = $ac_status" >&5
+  echo "$as_me:16637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else
@@ -16644,7 +16646,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:16647: result: $cf_cv_wint_t" >&5
+echo "$as_me:16649: result: $cf_cv_wint_t" >&5
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
@@ -16668,10 +16670,10 @@ fi
 
 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
-echo "$as_me:16671: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16673: 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 16674 "configure"
+#line 16676 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16689,16 +16691,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16695: \$? = $ac_status" >&5
+  echo "$as_me:16697: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16701: \$? = $ac_status" >&5
+  echo "$as_me:16703: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16707,7 +16709,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16710: result: $cf_result" >&5
+echo "$as_me:16712: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
@@ -16729,10 +16731,10 @@ fi
 
 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
-echo "$as_me:16732: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16734: 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 16735 "configure"
+#line 16737 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16750,16 +16752,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16756: \$? = $ac_status" >&5
+  echo "$as_me:16758: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16762: \$? = $ac_status" >&5
+  echo "$as_me:16764: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16768,7 +16770,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16771: result: $cf_result" >&5
+echo "$as_me:16773: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
@@ -16790,10 +16792,10 @@ fi
 
 	if test "$NCURSES_OK_WINT_T" = 0 ; then
 
-echo "$as_me:16793: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16795: 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 16796 "configure"
+#line 16798 "configure"
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
@@ -16811,16 +16813,16 @@ wint_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16817: \$? = $ac_status" >&5
+  echo "$as_me:16819: \$? = $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:16822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16823: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16829,7 +16831,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16832: result: $cf_result" >&5
+echo "$as_me:16834: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
@@ -16850,11 +16852,11 @@ fi
 	fi
 fi
 
-echo "$as_me:16853: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16855: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16857 "configure"
+#line 16859 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -16882,16 +16884,16 @@ void *foo = &(ospeed)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16888: \$? = $ac_status" >&5
+  echo "$as_me:16890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16894: \$? = $ac_status" >&5
+  echo "$as_me:16896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16900,7 +16902,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16903: result: $cf_result" >&5
+echo "$as_me:16905: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
@@ -16912,14 +16914,14 @@ cf_result=`echo "have_curses_data_ospeed" | sed y%abcdefghijklmnopqrstuvwxyz./-%
 EOF
 
 else
-	echo "$as_me:16915: checking for data ospeed in library" >&5
+	echo "$as_me:16917: checking for data ospeed in library" >&5
 echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
 	# BSD linkers insist on making weak linkage, but resolve at runtime.
 	if test "$cross_compiling" = yes; then
 
 	# cross-compiling
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16922 "configure"
+#line 16924 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -16952,16 +16954,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16958: \$? = $ac_status" >&5
+  echo "$as_me:16960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16964: \$? = $ac_status" >&5
+  echo "$as_me:16966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16973,7 +16975,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16976 "configure"
+#line 16978 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -16999,15 +17001,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17004: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17005: \$? = $ac_status" >&5
+  echo "$as_me:17007: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17010: \$? = $ac_status" >&5
+  echo "$as_me:17012: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17018,7 +17020,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-	echo "$as_me:17021: result: $cf_result" >&5
+	echo "$as_me:17023: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result = yes ; then
 
@@ -17031,11 +17033,11 @@ EOF
 	fi
 fi
 
-echo "$as_me:17034: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:17036: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 17038 "configure"
+#line 17040 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17063,16 +17065,16 @@ void *foo = &(boolnames)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17069: \$? = $ac_status" >&5
+  echo "$as_me:17071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17075: \$? = $ac_status" >&5
+  echo "$as_me:17077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17081,7 +17083,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17084: result: $cf_result" >&5
+echo "$as_me:17086: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
@@ -17093,14 +17095,14 @@ cf_result=`echo "have_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz.
 EOF
 
 else
-	echo "$as_me:17096: checking for data boolnames in library" >&5
+	echo "$as_me:17098: checking for data boolnames in library" >&5
 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
 	# BSD linkers insist on making weak linkage, but resolve at runtime.
 	if test "$cross_compiling" = yes; then
 
 	# cross-compiling
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17103 "configure"
+#line 17105 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17133,16 +17135,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17139: \$? = $ac_status" >&5
+  echo "$as_me:17141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17145: \$? = $ac_status" >&5
+  echo "$as_me:17147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17154,7 +17156,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17157 "configure"
+#line 17159 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17180,15 +17182,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17186: \$? = $ac_status" >&5
+  echo "$as_me:17188: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17191: \$? = $ac_status" >&5
+  echo "$as_me:17193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17199,7 +17201,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-	echo "$as_me:17202: result: $cf_result" >&5
+	echo "$as_me:17204: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result = yes ; then
 
@@ -17212,11 +17214,11 @@ EOF
 	fi
 fi
 
-echo "$as_me:17215: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:17217: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 17219 "configure"
+#line 17221 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17244,16 +17246,16 @@ void *foo = &(boolfnames)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17250: \$? = $ac_status" >&5
+  echo "$as_me:17252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17256: \$? = $ac_status" >&5
+  echo "$as_me:17258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17262,7 +17264,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17265: result: $cf_result" >&5
+echo "$as_me:17267: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
@@ -17274,14 +17276,14 @@ cf_result=`echo "have_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz
 EOF
 
 else
-	echo "$as_me:17277: checking for data boolfnames in library" >&5
+	echo "$as_me:17279: checking for data boolfnames in library" >&5
 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
 	# BSD linkers insist on making weak linkage, but resolve at runtime.
 	if test "$cross_compiling" = yes; then
 
 	# cross-compiling
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17284 "configure"
+#line 17286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17314,16 +17316,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17320: \$? = $ac_status" >&5
+  echo "$as_me:17322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17326: \$? = $ac_status" >&5
+  echo "$as_me:17328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17335,7 +17337,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17338 "configure"
+#line 17340 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17361,15 +17363,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17367: \$? = $ac_status" >&5
+  echo "$as_me:17369: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17372: \$? = $ac_status" >&5
+  echo "$as_me:17374: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17380,7 +17382,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-	echo "$as_me:17383: result: $cf_result" >&5
+	echo "$as_me:17385: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result = yes ; then
 
@@ -17393,11 +17395,11 @@ EOF
 	fi
 fi
 
-echo "$as_me:17396: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:17398: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 17400 "configure"
+#line 17402 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17425,16 +17427,16 @@ void *foo = &(ttytype)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17431: \$? = $ac_status" >&5
+  echo "$as_me:17433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17437: \$? = $ac_status" >&5
+  echo "$as_me:17439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17443,7 +17445,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17446: result: $cf_result" >&5
+echo "$as_me:17448: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
@@ -17455,14 +17457,14 @@ cf_result=`echo "have_curses_data_ttytype" | sed y%abcdefghijklmnopqrstuvwxyz./-
 EOF
 
 else
-	echo "$as_me:17458: checking for data ttytype in library" >&5
+	echo "$as_me:17460: checking for data ttytype in library" >&5
 echo $ECHO_N "checking for data ttytype in library... $ECHO_C" >&6
 	# BSD linkers insist on making weak linkage, but resolve at runtime.
 	if test "$cross_compiling" = yes; then
 
 	# cross-compiling
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17465 "configure"
+#line 17467 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17495,16 +17497,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17501: \$? = $ac_status" >&5
+  echo "$as_me:17503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17507: \$? = $ac_status" >&5
+  echo "$as_me:17509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17516,7 +17518,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17519 "configure"
+#line 17521 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -17542,15 +17544,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17548: \$? = $ac_status" >&5
+  echo "$as_me:17550: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17553: \$? = $ac_status" >&5
+  echo "$as_me:17555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17561,7 +17563,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-	echo "$as_me:17564: result: $cf_result" >&5
+	echo "$as_me:17566: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result = yes ; then
 
@@ -17576,7 +17578,7 @@ fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:17579: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17581: 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.
@@ -17593,7 +17595,7 @@ else
 	with_warnings=no
 
 fi;
-echo "$as_me:17596: result: $with_warnings" >&5
+echo "$as_me:17598: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -17616,10 +17618,10 @@ cat > conftest.i <&5
+	{ echo "$as_me:17621: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <&5
+		if { (eval echo "$as_me:17673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17674: \$? = $ac_status" >&5
+  echo "$as_me:17676: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:17676: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:17678: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in
@@ -17737,12 +17739,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	(linux*|gnu*)
-		echo "$as_me:17740: checking if this is really Intel C compiler" >&5
+		echo "$as_me:17742: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17745 "configure"
+#line 17747 "configure"
 #include "confdefs.h"
 
 int
@@ -17759,16 +17761,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17765: \$? = $ac_status" >&5
+  echo "$as_me:17767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17771: \$? = $ac_status" >&5
+  echo "$as_me:17773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -17779,7 +17781,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:17782: result: $INTEL_COMPILER" >&5
+		echo "$as_me:17784: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -17788,12 +17790,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:17791: checking if this is really Clang C compiler" >&5
+	echo "$as_me:17793: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -Qunused-arguments"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17796 "configure"
+#line 17798 "configure"
 #include "confdefs.h"
 
 int
@@ -17810,16 +17812,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17815: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17816: \$? = $ac_status" >&5
+  echo "$as_me:17818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17822: \$? = $ac_status" >&5
+  echo "$as_me:17824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -17830,12 +17832,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:17833: result: $CLANG_COMPILER" >&5
+	echo "$as_me:17835: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <&5
+	{ echo "$as_me:17857: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -17868,12 +17870,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:17871: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17874: \$? = $ac_status" >&5
+  echo "$as_me:17876: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:17876: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17878: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -17882,7 +17884,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:17885: checking for $CC warning options..." >&5
+	{ echo "$as_me:17887: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -17906,12 +17908,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:17909: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:17911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17912: \$? = $ac_status" >&5
+  echo "$as_me:17914: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:17914: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:17916: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in
 			(Wcast-qual)
@@ -17922,7 +17924,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}:17925: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17927: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17932,7 +17934,7 @@ echo "${as_me:-configure}:17925: 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}:17935: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17937: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -17948,7 +17950,7 @@ rm -rf conftest*
 fi
 fi
 
-echo "$as_me:17951: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:17953: 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.
@@ -17965,7 +17967,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:17968: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:17970: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -18079,23 +18081,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:18082: checking for dmalloc.h" >&5
+	echo "$as_me:18084: 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 18088 "configure"
+#line 18090 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:18092: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18094: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18098: \$? = $ac_status" >&5
+  echo "$as_me:18100: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18114,11 +18116,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18117: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18119: 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:18121: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18123: 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
@@ -18126,7 +18128,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18129 "configure"
+#line 18131 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18145,16 +18147,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18151: \$? = $ac_status" >&5
+  echo "$as_me:18153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18157: \$? = $ac_status" >&5
+  echo "$as_me:18159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -18165,7 +18167,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18168: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18170: 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:18185: 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.
@@ -18197,7 +18199,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:18200: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18202: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -18311,23 +18313,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:18314: checking for dbmalloc.h" >&5
+	echo "$as_me:18316: 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 18320 "configure"
+#line 18322 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:18324: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18326: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18330: \$? = $ac_status" >&5
+  echo "$as_me:18332: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18346,11 +18348,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18349: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18351: 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:18353: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18355: 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
@@ -18358,7 +18360,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18361 "configure"
+#line 18363 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18377,16 +18379,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18383: \$? = $ac_status" >&5
+  echo "$as_me:18385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18389: \$? = $ac_status" >&5
+  echo "$as_me:18391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -18397,7 +18399,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18400: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18402: 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:18417: 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.
@@ -18429,7 +18431,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:18432: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18434: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in
@@ -18542,7 +18544,7 @@ fi
 	;;
 esac
 
-echo "$as_me:18545: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18547: 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.
@@ -18552,7 +18554,7 @@ if test "${enable_leaks+set}" = set; then
 else
   : ${with_no_leaks:=no}
 fi;
-echo "$as_me:18555: result: $with_no_leaks" >&5
+echo "$as_me:18557: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$with_no_leaks" = yes ; then
@@ -18568,7 +18570,7 @@ EOF
 fi
 
 LD_RPATH_OPT=
-echo "$as_me:18571: checking for an rpath option" >&5
+echo "$as_me:18573: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -18599,12 +18601,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:18602: result: $LD_RPATH_OPT" >&5
+echo "$as_me:18604: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:18607: checking if we need a space after rpath option" >&5
+	echo "$as_me:18609: 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"
 
@@ -18625,7 +18627,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18628 "configure"
+#line 18630 "configure"
 #include "confdefs.h"
 
 int
@@ -18637,16 +18639,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18643: \$? = $ac_status" >&5
+  echo "$as_me:18645: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18649: \$? = $ac_status" >&5
+  echo "$as_me:18651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -18656,13 +18658,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:18659: result: $cf_rpath_space" >&5
+	echo "$as_me:18661: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:18665: checking if rpath-hack should be disabled" >&5
+echo "$as_me:18667: 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.
@@ -18679,21 +18681,21 @@ else
 	cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:18682: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:18684: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:18686: checking for updated LDFLAGS" >&5
+echo "$as_me:18688: 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:18689: result: maybe" >&5
+	echo "$as_me:18691: 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:18696: checking for $ac_word" >&5
+echo "$as_me:18698: 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
@@ -18708,7 +18710,7 @@ 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:18711: found $ac_dir/$ac_word" >&5
+echo "$as_me:18713: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -18716,10 +18718,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:18719: result: $cf_ldd_prog" >&5
+  echo "$as_me:18721: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:18722: result: no" >&5
+  echo "$as_me:18724: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18733,7 +18735,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 18736 "configure"
+#line 18738 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -18745,16 +18747,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18751: \$? = $ac_status" >&5
+  echo "$as_me:18753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18757: \$? = $ac_status" >&5
+  echo "$as_me:18759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -18782,7 +18784,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}:18785: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:18787: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -18794,11 +18796,11 @@ echo "${as_me:-configure}:18785: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:18797: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18799: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:18801: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18803: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -18835,7 +18837,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:18838: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:18840: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -18848,11 +18850,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:18851: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18853: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:18855: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:18857: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -18889,7 +18891,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:18892: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:18894: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -18902,14 +18904,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:18905: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:18907: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:18909: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18911: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:18912: result: no" >&5
+	echo "$as_me:18914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18999,7 +19001,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:19002: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:19004: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -19175,7 +19177,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:19178: error: ambiguous option: $1
+    { { echo "$as_me:19180: 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;}
@@ -19194,7 +19196,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:19197: error: unrecognized option: $1
+  -*) { { echo "$as_me:19199: 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;}
@@ -19244,7 +19246,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:19247: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:19249: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19535,7 +19537,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19538: creating $ac_file" >&5
+    { echo "$as_me:19540: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19553,7 +19555,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:19556: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19558: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19566,7 +19568,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:19569: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19571: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19582,7 +19584,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:19585: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19587: 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;}
@@ -19591,7 +19593,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19594: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19596: 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;}
@@ -19628,7 +19630,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             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:19631: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19633: 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;}
@@ -19639,7 +19641,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:19642: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19644: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19688,7 +19690,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:19691: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19693: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19699,7 +19701,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:19702: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19704: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19712,7 +19714,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:19715: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19717: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19770,7 +19772,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:19773: $ac_file is unchanged" >&5
+      { echo "$as_me:19775: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/test/configure.in b/test/configure.in
index b9fad5be..85c0b1b5 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.129 2017/03/06 09:48:09 tom Exp $
+dnl $Id: configure.in,v 1.130 2017/03/31 12:15:36 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -216,6 +216,7 @@ getmaxx \
 getnstr \
 getparx \
 getwin \
+init_extended_color \
 mvvline \
 mvwvline \
 napms \
@@ -232,6 +233,7 @@ termattrs \
 tgetent \
 tigetnum \
 tigetstr \
+tputs_sp \
 typeahead \
 use_default_colors \
 use_env \
diff --git a/test/extended_color.c b/test/extended_color.c
new file mode 100644
index 00000000..9eef8ffd
--- /dev/null
+++ b/test/extended_color.c
@@ -0,0 +1,251 @@
+/****************************************************************************
+ * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ *                                                                          *
+ * Permission is hereby granted, free of charge, to any person obtaining a  *
+ * copy of this software and associated documentation files (the            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+/*
+ * $Id: extended_color.c,v 1.8 2017/04/01 19:35:18 tom Exp $
+ */
+
+#include 
+
+#if HAVE_INIT_EXTENDED_COLOR
+
+#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
+
+static bool opt_s = FALSE;
+
+static void
+failed(const char *name)
+{
+    printw("...%s failed", name);
+    getch();
+    endwin();
+    ExitProgram(EXIT_FAILURE);
+}
+
+static void
+do_pair_content(SCREEN *sp, int pair)
+{
+    int i, f, b;
+
+    if (opt_s) {
+	i = extended_pair_content_sp(sp, pair, &f, &b);
+    } else {
+	i = extended_pair_content(0, &f, &b);
+    }
+    if (i != OK)
+	failed("pair_content");
+    printw("pair %d contains (%d,%d)\n", pair, f, b);
+    getch();
+}
+
+static void
+do_init_pair(SCREEN *sp, int pair, int fg, int bg)
+{
+    int i;
+    if (opt_s) {
+	i = init_extended_pair_sp(sp, pair, fg, bg);
+    } else {
+	i = init_extended_pair(pair, fg, bg);
+    }
+    if (i != OK)
+	failed("init_pair");
+}
+
+static void
+do_init_color(SCREEN *sp, int color, int adjust)
+{
+    int r, g, b;
+    int i;
+    if (opt_s) {
+	i = extended_color_content_sp(sp, color, &r, &g, &b);
+    } else {
+	i = extended_color_content(color, &r, &g, &b);
+    }
+
+    r = (adjust + 1000 + r) % 1000;
+    g = (adjust + 1000 + g) % 1000;
+    b = (adjust + 1000 + b) % 1000;
+
+    if (opt_s) {
+	i = init_extended_color_sp(sp, color, r, g, b);
+    } else {
+	i = init_extended_color(color, r, g, b);
+    }
+    if (i != OK)
+	failed("init_color");
+}
+
+static void
+do_color_set(const char *expected, int pair)
+{
+    int i = color_set(pair, NULL);
+    printw("%s (%s)\n", expected, SHOW(i));
+    if (i != OK)
+	failed("color_set");
+    getch();
+}
+
+static void
+show_1_rgb(SCREEN *sp, const char *name, int color, int y, int x)
+{
+    int r, g, b;
+    int i;
+    if (opt_s) {
+	i = extended_color_content_sp(sp, color, &r, &g, &b);
+    } else {
+	i = extended_color_content(color, &r, &g, &b);
+    }
+    wmove(stdscr, y, x);
+    if (i == OK) {
+	printw("%-8s %3d/%3d/%3d", name, r, g, b);
+    } else {
+	printw("%-8s %s", name, SHOW(i));
+    }
+}
+
+static void
+show_rgb(SCREEN *sp)
+{
+    int y, x;
+    getyx(stdscr, y, x);
+    show_1_rgb(sp, "RED", COLOR_RED, y + 1, x);
+    show_1_rgb(sp, "GREEN", COLOR_GREEN, y + 2, x);
+    show_1_rgb(sp, "BLUE", COLOR_BLUE, y + 3, x);
+    wmove(stdscr, y, x);
+}
+
+static void
+usage(void)
+{
+    static const char *tbl[] =
+    {
+	"Usage: extended_color",
+	"",
+	"Options:",
+	" -s   use sp-funcs",
+	NULL
+    };
+    size_t n;
+    for (n = 0; n < SIZEOF(tbl); ++n) {
+	fprintf(stderr, "%s\n", tbl[n]);
+    }
+    ExitProgram(EXIT_FAILURE);
+}
+
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+    int i;
+    SCREEN *sp;
+
+    while ((i = getopt(argc, argv, "s")) != -1) {
+	switch (i) {
+	case 's':
+	    opt_s = TRUE;
+	    break;
+	default:
+	    usage();
+	    /* NOTREACHED */
+	}
+    }
+
+    slk_init(1);
+    sp = newterm(NULL, stdout, stdin);
+    cbreak();
+    noecho();
+
+    if (!has_colors()) {
+	endwin();
+	fprintf(stderr, "This demo requires a color terminal\n");
+	ExitProgram(EXIT_FAILURE);
+    }
+
+    start_color();
+
+    do_pair_content(sp, 0);
+
+    printw("Initializing pair 1 to red/black\n");
+    do_init_pair(sp, 1, COLOR_RED, COLOR_BLACK);
+    do_color_set("RED/BLACK", 1);
+
+    printw("Initializing pair 2 to white/blue\n");
+    do_init_pair(sp, 2, COLOR_WHITE, COLOR_BLUE);
+    do_color_set("WHITE/BLUE", 2);
+
+    printw("Initializing pair 3 to green/black\n");
+    do_init_pair(sp, 3, COLOR_GREEN, COLOR_BLACK);
+    do_color_set("GREEN/BLACK", 3);
+
+    printw("Resetting colors to pair 0\n");
+    do_color_set("Default Colors", 0);
+
+    printw("Resetting colors to pair 1\n");
+    do_color_set("RED/BLACK", 1);
+
+    printw("Drawing soft-key tabs with pair 2\n");
+    slk_attrset(A_BOLD);	/* reverse-video is hard to see */
+    if (opt_s) {
+	extended_slk_color_sp(sp, 2);
+    } else {
+	extended_slk_color(2);
+    }
+    for (i = 1; i <= 8; ++i) {
+	char temp[80];
+	sprintf(temp, "(SLK-%d)", i);
+	slk_set(i, temp, 0);
+    }
+    slk_touch();
+    slk_noutrefresh();
+
+    if (opt_s ? can_change_color_sp(sp) : can_change_color()) {
+	do_color_set("Default Colors", 0);
+	printw("Press any key to stop...\n");
+	nodelay(stdscr, TRUE);
+	while (getch() == ERR) {
+	    show_rgb(sp);
+	    do_init_color(sp, COLOR_RED, 1);
+	    do_init_color(sp, COLOR_BLUE, -1);
+	    napms(50);
+	}
+	printw("...done");
+	nodelay(stdscr, FALSE);
+	getch();
+    }
+
+    endwin();
+
+    ExitProgram(EXIT_SUCCESS);
+}
+
+#else
+int
+main(void)
+{
+    printf("This program requires the ncurses extended color/pair functions\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif
diff --git a/test/modules b/test/modules
index c55d3a84..119982ef 100644
--- a/test/modules
+++ b/test/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.55 2017/02/27 01:28:28 tom Exp $
+# $Id: modules,v 1.57 2017/03/31 13:01:31 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -55,6 +55,7 @@ dots_mvcur	progs		$(srcdir)	$(HEADER_DEPS)
 dots_termcap	progs		$(srcdir)	$(HEADER_DEPS)
 echochar	progs		$(srcdir)	$(HEADER_DEPS)
 edit_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+extended_color	progs		$(srcdir)	$(HEADER_DEPS)
 filter		progs		$(srcdir)	$(HEADER_DEPS)
 firework	progs		$(srcdir)	$(HEADER_DEPS)
 firstlast	progs		$(srcdir)	$(HEADER_DEPS)
@@ -80,6 +81,7 @@ railroad	progs		$(srcdir)	$(HEADER_DEPS)
 rain		progs		$(srcdir)	$(HEADER_DEPS)
 redraw		progs		$(srcdir)	$(HEADER_DEPS)
 savescreen	progs		$(srcdir)	$(HEADER_DEPS)
+sp_tinfo	progs		$(srcdir)	$(HEADER_DEPS)
 tclock		progs		$(srcdir)	$(HEADER_DEPS)
 test_add_wchstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/linedata.h
 test_addchstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/linedata.h
diff --git a/test/programs b/test/programs
index db973039..5e24f6b8 100644
--- a/test/programs
+++ b/test/programs
@@ -1,4 +1,4 @@
-# $Id: programs,v 1.29 2017/02/27 01:28:01 tom Exp $
+# $Id: programs,v 1.30 2017/03/31 13:01:52 tom Exp $
 ##############################################################################
 # Copyright (c) 2006-2016,2017 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -52,6 +52,7 @@ dots_curses	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	dots_curses
 dots_mvcur	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	dots_mvcur
 dots_termcap	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	dots_termcap
 echochar	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	echochar
+extended_color	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	extended_color
 filter		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	filter
 firework	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	firework
 firstlast	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	firstlast
@@ -77,6 +78,7 @@ railroad	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	railroad
 rain		$(LDFLAGS_THREADS)	$(LOCAL_LIBS)	rain
 redraw		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	redraw
 savescreen	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	savescreen
+sp_tinfo	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	sp_tinfo
 tclock		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	tclock
 test_add_wchstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_add_wchstr
 test_addchstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_addchstr
diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c
new file mode 100644
index 00000000..8e42ad32
--- /dev/null
+++ b/test/sp_tinfo.c
@@ -0,0 +1,338 @@
+/****************************************************************************
+ * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ *                                                                          *
+ * Permission is hereby granted, free of charge, to any person obtaining a  *
+ * copy of this software and associated documentation files (the            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/*
+ * $Id: sp_tinfo.c,v 1.17 2017/04/02 01:03:30 tom Exp $
+ *
+ * TOTO: add option for non-sp-funcs interface
+ */
+
+#define USE_TINFO
+#include 
+
+#if HAVE_TPUTS_SP
+/*
+ * The higher-level curses library stores a TERMINAL* inside SCREEN, but the
+ * latter is opaque.  This structure helps us keep the two associated.
+ */
+typedef struct {
+    const char *name;
+    FILE *fp;
+    SCREEN *sp;
+    TERMINAL *term;
+    int (*outc) (SCREEN *, int);
+} MYDATA;
+
+static bool opt_n = FALSE;	/* true to suppress new_prescr */
+static bool opt_t = FALSE;	/* true to use termcap */
+
+static int
+my_outc(SCREEN *sp, int ch)
+{
+    (void) sp;
+    return fputc(ch, stdout);
+}
+
+static int
+my_errc(SCREEN *sp, int ch)
+{
+    (void) sp;
+    return fputc(ch, stderr);
+}
+
+static MYDATA *
+initialize(const char *name, FILE *output)
+{
+    MYDATA *result = typeCalloc(MYDATA, 1);
+    int error;
+
+    result->fp = output;
+    result->name = name;
+    result->outc = (fileno(output) == 1) ? my_outc : my_errc;
+    result->sp = opt_n ? 0 : new_prescr();
+
+    if (opt_t) {
+	char *temp = strdup(name);
+	tgetent_sp(result->sp, temp, name);
+	free(temp);
+    } else {
+	setupterm(name, fileno(output), &error);
+    }
+    result->term = cur_term;
+
+    return result;
+}
+
+static void
+show_flag(MYDATA * data, const char *name, int value)
+{
+    if (value < 0) {
+	fprintf(data->fp, " %s = (unknown)\n", name);
+    } else if (value == 0) {
+	fprintf(data->fp, " %s = false\n", name);
+    } else {
+	fprintf(data->fp, " %s = true\n", name);
+    }
+}
+
+static void
+show_cap_flag(MYDATA * data, const char *ti, const char *tc)
+{
+    const char *name = (opt_t ? tc : ti);
+    show_flag(data, name, (opt_t
+			   ? tgetflag_sp(data->sp, tc)
+			   : tigetflag_sp(data->sp, ti)));
+}
+
+static void
+show_number(MYDATA * data, const char *name, int value)
+{
+    if (value <= -2) {
+	fprintf(data->fp, " %s = (unknown)\n", name);
+    } else if (value <= -1) {
+	fprintf(data->fp, " %s = (missing)\n", name);
+    } else {
+	fprintf(data->fp, " %s = %d\n", name, value);
+    }
+}
+
+static void
+show_cap_number(MYDATA * data, const char *ti, const char *tc)
+{
+    const char *name = (opt_t ? tc : ti);
+    show_number(data, name, (opt_t
+			     ? tgetnum_sp(data->sp, tc)
+			     : tigetnum_sp(data->sp, ti)));
+}
+
+static void
+show_string(MYDATA * data, const char *name, const char *value)
+{
+    fprintf(data->fp, " %s = ", name);
+    if (value == 0) {
+	fprintf(data->fp, "(missing)");
+    } else if (value == (char *) -1) {
+	fprintf(data->fp, "(canceled)");
+    } else {
+	int ch;
+	while ((ch = UChar(*value++)) != '\0') {
+	    if (ch < 32) {
+		fprintf(data->fp, "^%c", ch | '@');
+	    } else if (ch == 127) {
+		fprintf(data->fp, "^?");
+	    } else if (ch > 127) {
+		fprintf(data->fp, "\\%03o", ch);
+	    } else {
+		fprintf(data->fp, "%c", ch);
+	    }
+	}
+    }
+    fprintf(data->fp, "\n");
+}
+
+static void
+show_cap_string(MYDATA * data, const char *ti, const char *tc)
+{
+    const char *name = (opt_t ? tc : ti);
+    char tcapjunk[1024];
+    char *tcap_ptr = tcapjunk;
+    show_string(data, name, (opt_t
+			     ? tgetstr_sp(data->sp, tc, &tcap_ptr)
+			     : tigetstr_sp(data->sp, ti)));
+}
+
+static void
+show_char(MYDATA * data, const char *name, int value)
+{
+    if (value < 0) {
+	show_string(data, name, "(missing)");
+    } else {
+	char temp[2];
+	temp[0] = (char) value;
+	temp[1] = '\0';
+	show_string(data, name, temp);
+    }
+}
+
+static void
+do_stuff(MYDATA * data)
+{
+    char *s;
+    SCREEN *sp = data->sp;
+    int my_code = 1234;
+    const char *my_text = "\033[?m";
+
+    set_curterm_sp(sp, data->term);
+
+    /* putp always goes to standard output */
+    putp_sp(sp, "Hello ");
+    putp_sp(sp, data->name);
+    putp_sp(sp, "!\n");
+
+    fprintf(data->fp, "Term: %s\n", termname_sp(sp));
+    fprintf(data->fp, "Long: %s\n", longname_sp(sp));
+    show_cap_flag(data, "am", "am");
+    show_cap_number(data, "lines", "li");
+    show_cap_string(data, "clear", "cl");
+    show_cap_string(data, "tbc", "ct");
+    show_flag(data, "has_ic", has_ic_sp(sp));
+    show_flag(data, "has_il", has_il_sp(sp));
+    show_number(data, "baudrate", baudrate_sp(sp));
+    show_char(data, "erase ch", erasechar_sp(sp));
+    show_char(data, "kill ch", killchar_sp(sp));
+    show_string(data, "unctrl", unctrl_sp(sp, 033));
+    fflush(data->fp);
+
+    define_key_sp(sp, my_text, my_code);
+    has_key_sp(sp, 0);
+    key_defined_sp(sp, my_text);
+    if ((s = keybound_sp(sp, my_code, 0)) != 0)
+	free(s);
+    keyname_sp(sp, '?');
+    keyok_sp(sp, my_code, FALSE);
+    keyok_sp(sp, my_code, TRUE);
+
+    savetty_sp(sp);
+
+    def_shell_mode_sp(sp);
+
+    /*
+     * These functions are low-level settings for ncurses.
+     */
+    set_tabsize_sp(sp, 5);	/* waddch */
+    typeahead_sp(sp, FALSE);	/* waddch */
+    use_env_sp(sp, FALSE);	/* newterm */
+    use_tioctl_sp(sp, FALSE);	/* newterm */
+    intrflush_sp(sp, 0, 0);	/* wgetch */
+    flushinp_sp(sp);		/* waddch */
+    halfdelay_sp(sp, 5);	/* wgetch */
+
+    /*
+     * These manipulate the terminal modes, mainly for wgetch.
+     */
+    cbreak_sp(sp);
+    raw_sp(sp);
+    def_prog_mode_sp(sp);
+
+    delay_output_sp(sp, 200);
+
+    napms_sp(sp, 10);
+
+    nocbreak_sp(sp);
+    noqiflush_sp(sp);
+    noraw_sp(sp);
+    qiflush_sp(sp);
+
+    resetty_sp(sp);
+
+    tputs_sp(sp, "{reset-mode}\n", 0, data->outc);
+
+    reset_prog_mode_sp(sp);
+
+    curs_set_sp(sp, 0);
+    tputs_sp(sp, "{prog-mode}\n", 0, data->outc);
+
+    reset_shell_mode_sp(sp);
+
+    tputs_sp(sp, "{shell-mode}\n", 0, data->outc);
+}
+
+static void
+cleanup(MYDATA * data)
+{
+    set_curterm(data->term);
+    del_curterm(data->term);
+    free(data->sp);		/* cannot use delscreen in tinfo */
+    free(data);
+}
+
+static void
+usage(void)
+{
+    static const char *tbl[] =
+    {
+	"Usage: sp_tinfo [output] [error]",
+	"",
+	"Options:",
+	" -n   suppress call to new_prescr()",
+	" -t   use termcap functions rather than terminfo",
+	NULL
+    };
+    size_t n;
+    for (n = 0; n < SIZEOF(tbl); ++n) {
+	fprintf(stderr, "%s\n", tbl[n]);
+    }
+    ExitProgram(EXIT_FAILURE);
+}
+
+int
+main(int argc, char *argv[])
+{
+    MYDATA *my_out;
+    MYDATA *my_err;
+    int n;
+
+    while ((n = getopt(argc, argv, "nt")) != -1) {
+	switch (n) {
+	case 'n':
+	    opt_n = TRUE;
+	    break;
+	case 't':
+	    opt_t = TRUE;
+	    break;
+	default:
+	    usage();
+	    /* NOTREACHED */
+	}
+    }
+    argv += (optind - 1);
+    argc -= (optind - 1);
+
+    if (argc > 3)
+	usage();
+
+    my_out = initialize((argc > 1) ? argv[1] : "vt100", stdout);
+    my_err = initialize((argc > 2) ? argv[2] : "ansi", stderr);
+
+    do_stuff(my_out);
+    do_stuff(my_err);
+
+    cleanup(my_out);
+    cleanup(my_err);
+
+    ExitProgram(EXIT_SUCCESS);
+}
+#else
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+    fprintf(stderr,
+	    "This program requires the low-level ncurses sp-funcs tputs_sp\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif
diff --git a/test/test.priv.h b/test/test.priv.h
index a30ae551..ae0eb6bb 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.140 2017/03/06 09:43:51 tom Exp $ */
+/* $Id: test.priv.h,v 1.141 2017/03/31 13:09:31 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -113,6 +113,10 @@
 #define HAVE_GETWIN 0
 #endif
 
+#ifndef HAVE_INIT_EXTENDED_COLOR
+#define HAVE_INIT_EXTENDED_COLOR 0
+#endif
+
 #ifndef HAVE_LIBFORM
 #define HAVE_LIBFORM 0
 #endif
@@ -229,6 +233,10 @@
 #define HAVE_TIGETSTR 0
 #endif
 
+#ifndef HAVE_TPUTS_SP
+#define HAVE_TPUTS_SP 0
+#endif
+
 #ifndef HAVE_TYPEAHEAD
 #define HAVE_TYPEAHEAD 0
 #endif
-- 
2.44.0