From 790a85dbd4a81d5f5d8dd02a44d84f01512ef443 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Mon, 1 Jun 2020 00:02:30 +0000 Subject: [PATCH] ncurses 6.2 - patch 20200531 + correct configure version-check/warnng for g++ to allow for 10.x + re-enable "bel" in konsole-base (report by Nia Huang) + add linux-s entry (patch by Alexandre Montaron). + drop long-obsolete convert_configure.pl + add test/test_parm.c, for checking tparm changes. + improve parameter-checking for tparm, adding function _nc_tiparm() to handle the most-used case, which accepts only numeric parameters (report/testcase by "puppet-meteor"). + use a more conservative estimate of the buffer-size in lib_tparm.c's save_text() and save_number(), in case the sprintf() function passes-through unexpected characters from a format specifier (report/testcase by "puppet-meteor"). + add a check for end-of-string in cvtchar to handle a malformed string in infotocap (report/testcase by "puppet-meteor"). --- Ada95/aclocal.m4 | 6 +- Ada95/configure | 2 +- MANIFEST | 2 +- NEWS | 18 +- VERSION | 2 +- aclocal.m4 | 6 +- configure | 1199 +++++++++++++++--------------- configure.in | 13 +- convert_configure.pl | 120 --- dist.mk | 4 +- include/MKterm.h.awk.in | 5 +- include/curses.h.in | 3 +- include/nc_tparm.h | 14 +- misc/terminfo.src | 26 +- ncurses/base/lib_color.c | 31 +- ncurses/base/lib_mouse.c | 4 +- ncurses/base/lib_screen.c | 4 +- ncurses/tinfo/captoinfo.c | 11 +- ncurses/tinfo/lib_print.c | 4 +- ncurses/tinfo/lib_tgoto.c | 4 +- ncurses/tinfo/lib_tparm.c | 448 +++++++---- ncurses/tinfo/tinfo_driver.c | 26 +- ncurses/tinfo/trim_sgr0.c | 4 +- ncurses/trace/lib_trace.c | 4 +- ncurses/tty/hashmap.c | 4 +- ncurses/tty/lib_mvcur.c | 56 +- ncurses/tty/lib_vidattr.c | 22 +- ncurses/tty/tty_update.c | 40 +- ncurses/widechar/lib_vid_attr.c | 23 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.map | 9 +- package/ncurses.spec | 2 +- package/ncursest.map | 9 +- package/ncursest.spec | 2 +- package/ncursestw.map | 9 +- package/ncursesw.map | 9 +- progs/reset_cmd.c | 15 +- progs/tabs.c | 4 +- progs/tic.c | 56 +- progs/tput.c | 18 +- test/configure | 735 +++++++++--------- test/configure.in | 3 +- test/dots.c | 8 +- test/dots_curses.c | 8 +- test/dots_mvcur.c | 8 +- test/dots_termcap.c | 8 +- test/dots_xcurses.c | 8 +- test/modules | 3 +- test/programs | 3 +- test/test_tparm.c | 388 ++++++++++ 54 files changed, 2004 insertions(+), 1424 deletions(-) delete mode 100644 convert_configure.pl create mode 100644 test/test_tparm.c diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index e4ce3771..24f69deb 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.156 2020/05/23 23:39:36 tom Exp $ +dnl $Id: aclocal.m4,v 1.157 2020/05/31 20:52:36 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1421,7 +1421,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" AC_SUBST(GNATPREP_OPTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_GENERICS version: 4 updated: 2019/12/31 08:53:54 +dnl CF_GNAT_GENERICS version: 5 updated: 2020/05/31 16:49:35 dnl ---------------- AC_DEFUN([CF_GNAT_GENERICS], [ @@ -1429,7 +1429,7 @@ AC_REQUIRE([CF_GNAT_VERSION]) AC_MSG_CHECKING(if GNAT supports generics) case $cf_cv_gnat_version in -(3.[[1-9]]*|[[4-9]].*) +(3.[[1-9]]*|[[4-9]].*|[[1-9]][[0-9]].*) cf_gnat_generics=yes ;; (*) diff --git a/Ada95/configure b/Ada95/configure index 1b18acd8..61a921f1 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -16670,7 +16670,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" echo "$as_me:16670: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_cv_gnat_version in -(3.[1-9]*|[4-9].*) +(3.[1-9]*|[4-9].*|[1-9][0-9].*) cf_gnat_generics=yes ;; (*) diff --git a/MANIFEST b/MANIFEST index 61e64879..69edf157 100644 --- a/MANIFEST +++ b/MANIFEST @@ -235,7 +235,6 @@ ./config.sub ./configure ./configure.in -./convert_configure.pl ./dist.mk ./doc/hackguide.doc ./doc/html/Ada95.html @@ -1214,6 +1213,7 @@ ./test/test_setupterm.c ./test/test_sgr.c ./test/test_termattrs.c +./test/test_tparm.c ./test/test_vid_puts.c ./test/test_vidputs.c ./test/testaddch.c diff --git a/NEWS b/NEWS index 09e1555f..07434fa2 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3491 2020/05/24 00:07:37 tom Exp $ +-- $Id: NEWS,v 1.3502 2020/05/31 19:41:31 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,22 @@ 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. +20200531 + + correct configure version-check/warnng for g++ to allow for 10.x + + re-enable "bel" in konsole-base (report by Nia Huang) + + add linux-s entry (patch by Alexandre Montaron). + + drop long-obsolete convert_configure.pl + + add test/test_parm.c, for checking tparm changes. + + improve parameter-checking for tparm, adding function _nc_tiparm() to + handle the most-used case, which accepts only numeric parameters + (report/testcase by "puppet-meteor"). + + use a more conservative estimate of the buffer-size in lib_tparm.c's + save_text() and save_number(), in case the sprintf() function + passes-through unexpected characters from a format specifier + (report/testcase by "puppet-meteor"). + + add a check for end-of-string in cvtchar to handle a malformed + string in infotocap (report/testcase by "puppet-meteor"). + 20200523 + update version-check for gnat to allow for gnat 10.x to 99.x + fix an uninitialized variable in lib_mouse.c changes (cf: 20200502) diff --git a/VERSION b/VERSION index f78341a7..18172f0c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20200523 +5:0:10 6.2 20200531 diff --git a/aclocal.m4 b/aclocal.m4 index ba09e6e9..09260c46 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.913 2020/05/23 23:46:10 tom Exp $ +dnl $Id: aclocal.m4,v 1.914 2020/05/31 20:50:13 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -2811,7 +2811,7 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" AC_SUBST(GNATPREP_OPTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_GENERICS version: 4 updated: 2019/12/31 08:53:54 +dnl CF_GNAT_GENERICS version: 5 updated: 2020/05/31 16:49:35 dnl ---------------- AC_DEFUN([CF_GNAT_GENERICS], [ @@ -2819,7 +2819,7 @@ AC_REQUIRE([CF_GNAT_VERSION]) AC_MSG_CHECKING(if GNAT supports generics) case $cf_cv_gnat_version in -(3.[[1-9]]*|[[4-9]].*) +(3.[[1-9]]*|[[4-9]].*|[[1-9]][[0-9]].*) cf_gnat_generics=yes ;; (*) diff --git a/configure b/configure index 2478a5a1..b3b29cef 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.707 . +# From configure.in Revision: 1.709 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20200111. # @@ -3355,9 +3355,9 @@ echo "${ECHO_T}$GXX_VERSION" >&6 fi case $GXX_VERSION in -(1*|2.[0-6]*) - # GXX=""; CXX=""; ac_cv_prog_gxx=no - # cf_cxx_library=no +([1-9][0-9].*) + ;; +(1.*|2.[0-6]*) { echo "$as_me:3361: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; @@ -20100,6 +20100,7 @@ setenv \ setvbuf \ sigaction \ sigvec \ +snprintf \ strdup \ strstr \ sysconf \ @@ -20110,13 +20111,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:20113: checking for $ac_func" >&5 +echo "$as_me:20114: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20119 "configure" +#line 20120 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20147,16 +20148,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20150: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20151: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20153: \$? = $ac_status" >&5 + echo "$as_me:20154: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20156: \"$ac_try\"") >&5 + { (eval echo "$as_me:20157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20159: \$? = $ac_status" >&5 + echo "$as_me:20160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -20166,7 +20167,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20169: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:20170: result: `eval echo '${'$as_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:20182: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -20187,7 +20188,7 @@ if test "x$with_safe_sprintf" = xyes then if test "x$ac_cv_func_vsnprintf" = xyes then - { echo "$as_me:20190: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + { echo "$as_me:20191: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} else @@ -20200,14 +20201,14 @@ fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:20203: checking for terminal-capability database functions" >&5 +echo "$as_me:20204: 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 20210 "configure" +#line 20211 "configure" #include "confdefs.h" #include @@ -20227,16 +20228,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20230: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20231: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20233: \$? = $ac_status" >&5 + echo "$as_me:20234: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20236: \"$ac_try\"") >&5 + { (eval echo "$as_me:20237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20239: \$? = $ac_status" >&5 + echo "$as_me:20240: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -20247,7 +20248,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20250: result: $cf_cv_cgetent" >&5 +echo "$as_me:20251: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -20257,14 +20258,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:20260: checking if cgetent uses const parameter" >&5 +echo "$as_me:20261: 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 20267 "configure" +#line 20268 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -20287,16 +20288,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20290: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20291: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20293: \$? = $ac_status" >&5 + echo "$as_me:20294: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20296: \"$ac_try\"") >&5 + { (eval echo "$as_me:20297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20299: \$? = $ac_status" >&5 + echo "$as_me:20300: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -20307,7 +20308,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20310: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:20311: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -20321,14 +20322,14 @@ fi fi -echo "$as_me:20324: checking for isascii" >&5 +echo "$as_me:20325: 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 20331 "configure" +#line 20332 "configure" #include "confdefs.h" #include int @@ -20340,16 +20341,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20343: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20344: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20346: \$? = $ac_status" >&5 + echo "$as_me:20347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20349: \"$ac_try\"") >&5 + { (eval echo "$as_me:20350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20352: \$? = $ac_status" >&5 + echo "$as_me:20353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -20360,7 +20361,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20363: result: $cf_cv_have_isascii" >&5 +echo "$as_me:20364: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -20368,10 +20369,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:20371: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:20372: 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 20374 "configure" +#line 20375 "configure" #include "confdefs.h" #include @@ -20385,16 +20386,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20388: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20389: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20391: \$? = $ac_status" >&5 + echo "$as_me:20392: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20394: \"$ac_try\"") >&5 + { (eval echo "$as_me:20395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20397: \$? = $ac_status" >&5 + echo "$as_me:20398: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -20402,7 +20403,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20405 "configure" +#line 20406 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -20417,16 +20418,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20420: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20423: \$? = $ac_status" >&5 + echo "$as_me:20424: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20426: \"$ac_try\"") >&5 + { (eval echo "$as_me:20427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20429: \$? = $ac_status" >&5 + echo "$as_me:20430: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -20442,11 +20443,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:20445: result: $sigact_bad" >&5 +echo "$as_me:20446: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:20449: checking if nanosleep really works" >&5 +echo "$as_me:20450: 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 @@ -20456,7 +20457,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 20459 "configure" +#line 20460 "configure" #include "confdefs.h" #include @@ -20481,15 +20482,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20487: \$? = $ac_status" >&5 + echo "$as_me:20488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20489: \"$ac_try\"") >&5 + { (eval echo "$as_me:20490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20492: \$? = $ac_status" >&5 + echo "$as_me:20493: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -20501,7 +20502,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:20504: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:20505: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -20518,23 +20519,23 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20521: checking for $ac_header" >&5 +echo "$as_me:20522: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20527 "configure" +#line 20528 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20531: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20532: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20537: \$? = $ac_status" >&5 + echo "$as_me:20538: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20553,7 +20554,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20556: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20557: result: `eval echo '${'$as_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:20574: 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 20576 "configure" +#line 20577 "configure" #include "confdefs.h" #include int @@ -20585,16 +20586,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20588: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20589: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20591: \$? = $ac_status" >&5 + echo "$as_me:20592: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20594: \"$ac_try\"") >&5 + { (eval echo "$as_me:20595: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20597: \$? = $ac_status" >&5 + echo "$as_me:20598: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -20602,7 +20603,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20605 "configure" +#line 20606 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -20616,16 +20617,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20620: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20622: \$? = $ac_status" >&5 + echo "$as_me:20623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20625: \"$ac_try\"") >&5 + { (eval echo "$as_me:20626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20628: \$? = $ac_status" >&5 + echo "$as_me:20629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -20641,19 +20642,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:20644: result: $termios_bad" >&5 + echo "$as_me:20645: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:20649: checking for tcgetattr" >&5 +echo "$as_me:20650: 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 20656 "configure" +#line 20657 "configure" #include "confdefs.h" #include @@ -20681,16 +20682,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20685: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20687: \$? = $ac_status" >&5 + echo "$as_me:20688: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20690: \"$ac_try\"") >&5 + { (eval echo "$as_me:20691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20693: \$? = $ac_status" >&5 + echo "$as_me:20694: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -20700,21 +20701,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20703: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:20704: 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:20710: checking for vsscanf function or workaround" >&5 +echo "$as_me:20711: 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 20717 "configure" +#line 20718 "configure" #include "confdefs.h" #include @@ -20730,16 +20731,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20736: \$? = $ac_status" >&5 + echo "$as_me:20737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20739: \"$ac_try\"") >&5 + { (eval echo "$as_me:20740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20742: \$? = $ac_status" >&5 + echo "$as_me:20743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -20747,7 +20748,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20750 "configure" +#line 20751 "configure" #include "confdefs.h" #include @@ -20769,16 +20770,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20772: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20773: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20775: \$? = $ac_status" >&5 + echo "$as_me:20776: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20778: \"$ac_try\"") >&5 + { (eval echo "$as_me:20779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20781: \$? = $ac_status" >&5 + echo "$as_me:20782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -20786,7 +20787,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20789 "configure" +#line 20790 "configure" #include "confdefs.h" #include @@ -20808,16 +20809,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20811: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20812: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20814: \$? = $ac_status" >&5 + echo "$as_me:20815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20817: \"$ac_try\"") >&5 + { (eval echo "$as_me:20818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20820: \$? = $ac_status" >&5 + echo "$as_me:20821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -20832,7 +20833,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:20835: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:20836: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in @@ -20858,23 +20859,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20861: checking for $ac_header" >&5 +echo "$as_me:20862: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20867 "configure" +#line 20868 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20871: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20872: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20877: \$? = $ac_status" >&5 + echo "$as_me:20878: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20893,7 +20894,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20896: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20897: result: `eval echo '${'$as_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:20907: 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 @@ -20914,7 +20915,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 20917 "configure" +#line 20918 "configure" #include "confdefs.h" #include @@ -20955,15 +20956,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20958: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20959: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20961: \$? = $ac_status" >&5 + echo "$as_me:20962: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20963: \"$ac_try\"") >&5 + { (eval echo "$as_me:20964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20966: \$? = $ac_status" >&5 + echo "$as_me:20967: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -20978,16 +20979,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:20981: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:20982: 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:20984: checking for mkstemp" >&5 + echo "$as_me:20985: 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 20990 "configure" +#line 20991 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21018,16 +21019,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21021: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21022: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21024: \$? = $ac_status" >&5 + echo "$as_me:21025: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21027: \"$ac_try\"") >&5 + { (eval echo "$as_me:21028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21030: \$? = $ac_status" >&5 + echo "$as_me:21031: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -21037,7 +21038,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21040: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:21041: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -21058,21 +21059,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:21061: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:21062: 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:21064: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:21065: 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:21070: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:21071: 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 21075 "configure" +#line 21076 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -21089,15 +21090,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21092: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21093: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21095: \$? = $ac_status" >&5 + echo "$as_me:21096: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21097: \"$ac_try\"") >&5 + { (eval echo "$as_me:21098: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21100: \$? = $ac_status" >&5 + echo "$as_me:21101: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -21110,7 +21111,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:21113: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:21114: 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 @@ -21121,13 +21122,13 @@ EOF fi fi -echo "$as_me:21124: checking for intptr_t" >&5 +echo "$as_me:21125: 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 21130 "configure" +#line 21131 "configure" #include "confdefs.h" $ac_includes_default int @@ -21142,16 +21143,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21145: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21146: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21148: \$? = $ac_status" >&5 + echo "$as_me:21149: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21151: \"$ac_try\"") >&5 + { (eval echo "$as_me:21152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21154: \$? = $ac_status" >&5 + echo "$as_me:21155: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -21161,7 +21162,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21164: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:21165: 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 : @@ -21173,13 +21174,13 @@ EOF fi -echo "$as_me:21176: checking for ssize_t" >&5 +echo "$as_me:21177: 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 21182 "configure" +#line 21183 "configure" #include "confdefs.h" $ac_includes_default int @@ -21194,16 +21195,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21197: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21198: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21200: \$? = $ac_status" >&5 + echo "$as_me:21201: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21203: \"$ac_try\"") >&5 + { (eval echo "$as_me:21204: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21206: \$? = $ac_status" >&5 + echo "$as_me:21207: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ssize_t=yes else @@ -21213,7 +21214,7 @@ ac_cv_type_ssize_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21216: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:21217: 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 : @@ -21225,14 +21226,14 @@ EOF fi -echo "$as_me:21228: checking for type sigaction_t" >&5 +echo "$as_me:21229: 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 21235 "configure" +#line 21236 "configure" #include "confdefs.h" #include @@ -21245,16 +21246,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21251: \$? = $ac_status" >&5 + echo "$as_me:21252: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21254: \"$ac_try\"") >&5 + { (eval echo "$as_me:21255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21257: \$? = $ac_status" >&5 + echo "$as_me:21258: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -21265,14 +21266,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21268: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:21269: 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:21275: checking declaration of size-change" >&5 +echo "$as_me:21276: 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 @@ -21293,7 +21294,7 @@ do fi cat >conftest.$ac_ext <<_ACEOF -#line 21296 "configure" +#line 21297 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -21343,16 +21344,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21346: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21347: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21349: \$? = $ac_status" >&5 + echo "$as_me:21350: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21352: \"$ac_try\"") >&5 + { (eval echo "$as_me:21353: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21355: \$? = $ac_status" >&5 + echo "$as_me:21356: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -21371,7 +21372,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:21374: result: $cf_cv_sizechange" >&5 +echo "$as_me:21375: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -21389,13 +21390,13 @@ EOF esac fi -echo "$as_me:21392: checking for memmove" >&5 +echo "$as_me:21393: 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 21398 "configure" +#line 21399 "configure" #include "confdefs.h" #define memmove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21426,16 +21427,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21429: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21430: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21432: \$? = $ac_status" >&5 + echo "$as_me:21433: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21435: \"$ac_try\"") >&5 + { (eval echo "$as_me:21436: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21438: \$? = $ac_status" >&5 + echo "$as_me:21439: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -21445,19 +21446,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21448: result: $ac_cv_func_memmove" >&5 +echo "$as_me:21449: 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:21454: checking for bcopy" >&5 +echo "$as_me:21455: 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 21460 "configure" +#line 21461 "configure" #include "confdefs.h" #define bcopy autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21488,16 +21489,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21492: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21494: \$? = $ac_status" >&5 + echo "$as_me:21495: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21497: \"$ac_try\"") >&5 + { (eval echo "$as_me:21498: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21500: \$? = $ac_status" >&5 + echo "$as_me:21501: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -21507,11 +21508,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21510: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:21511: 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:21514: checking if bcopy does overlapping moves" >&5 + echo "$as_me:21515: 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 @@ -21521,7 +21522,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21524 "configure" +#line 21525 "configure" #include "confdefs.h" int main(void) { @@ -21535,15 +21536,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21538: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21539: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21541: \$? = $ac_status" >&5 + echo "$as_me:21542: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21543: \"$ac_try\"") >&5 + { (eval echo "$as_me:21544: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21546: \$? = $ac_status" >&5 + echo "$as_me:21547: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -21556,7 +21557,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:21559: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:21560: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -21583,13 +21584,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:21586: checking for $ac_func" >&5 +echo "$as_me:21587: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21592 "configure" +#line 21593 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21620,16 +21621,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21623: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21624: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21626: \$? = $ac_status" >&5 + echo "$as_me:21627: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21629: \"$ac_try\"") >&5 + { (eval echo "$as_me:21630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21632: \$? = $ac_status" >&5 + echo "$as_me:21633: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -21639,7 +21640,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21642: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:21643: result: `eval echo '${'$as_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:21653: 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 @@ -21659,7 +21660,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21662 "configure" +#line 21663 "configure" #include "confdefs.h" #include @@ -21711,15 +21712,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21714: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21717: \$? = $ac_status" >&5 + echo "$as_me:21718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21719: \"$ac_try\"") >&5 + { (eval echo "$as_me:21720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21722: \$? = $ac_status" >&5 + echo "$as_me:21723: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -21731,21 +21732,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:21734: result: $cf_cv_working_poll" >&5 +echo "$as_me:21735: 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:21741: checking for va_copy" >&5 +echo "$as_me:21742: 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 21748 "configure" +#line 21749 "configure" #include "confdefs.h" #include @@ -21762,16 +21763,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21765: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21766: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21768: \$? = $ac_status" >&5 + echo "$as_me:21769: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21771: \"$ac_try\"") >&5 + { (eval echo "$as_me:21772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21774: \$? = $ac_status" >&5 + echo "$as_me:21775: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -21781,7 +21782,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21784: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:21785: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 if test "$cf_cv_have_va_copy" = yes; @@ -21793,14 +21794,14 @@ EOF else # !cf_cv_have_va_copy -echo "$as_me:21796: checking for __va_copy" >&5 +echo "$as_me:21797: 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 21803 "configure" +#line 21804 "configure" #include "confdefs.h" #include @@ -21817,16 +21818,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21820: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21823: \$? = $ac_status" >&5 + echo "$as_me:21824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21826: \"$ac_try\"") >&5 + { (eval echo "$as_me:21827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21829: \$? = $ac_status" >&5 + echo "$as_me:21830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -21836,7 +21837,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21839: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:21840: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 if test "$cf_cv_have___va_copy" = yes @@ -21848,14 +21849,14 @@ EOF else # !cf_cv_have___va_copy -echo "$as_me:21851: checking for __builtin_va_copy" >&5 +echo "$as_me:21852: checking for __builtin_va_copy" >&5 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 if test "${cf_cv_have___builtin_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21858 "configure" +#line 21859 "configure" #include "confdefs.h" #include @@ -21872,16 +21873,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21875: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21878: \$? = $ac_status" >&5 + echo "$as_me:21879: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21881: \"$ac_try\"") >&5 + { (eval echo "$as_me:21882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21884: \$? = $ac_status" >&5 + echo "$as_me:21885: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___builtin_va_copy=yes else @@ -21891,7 +21892,7 @@ cf_cv_have___builtin_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21894: result: $cf_cv_have___builtin_va_copy" >&5 +echo "$as_me:21895: result: $cf_cv_have___builtin_va_copy" >&5 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 test "$cf_cv_have___builtin_va_copy" = yes && @@ -21909,14 +21910,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy ;; (*) - echo "$as_me:21912: checking if we can simply copy va_list" >&5 + echo "$as_me:21913: checking if we can simply copy va_list" >&5 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 if test "${cf_cv_pointer_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21919 "configure" +#line 21920 "configure" #include "confdefs.h" #include @@ -21933,16 +21934,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21936: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21939: \$? = $ac_status" >&5 + echo "$as_me:21940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21942: \"$ac_try\"") >&5 + { (eval echo "$as_me:21943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21945: \$? = $ac_status" >&5 + echo "$as_me:21946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_pointer_va_list=yes else @@ -21952,19 +21953,19 @@ cf_cv_pointer_va_list=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:21955: result: $cf_cv_pointer_va_list" >&5 +echo "$as_me:21956: result: $cf_cv_pointer_va_list" >&5 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 if test "$cf_cv_pointer_va_list" = no then - echo "$as_me:21960: checking if we can copy va_list indirectly" >&5 + echo "$as_me:21961: checking if we can copy va_list indirectly" >&5 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 if test "${cf_cv_array_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21967 "configure" +#line 21968 "configure" #include "confdefs.h" #include @@ -21981,16 +21982,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21984: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21985: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21987: \$? = $ac_status" >&5 + echo "$as_me:21988: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21990: \"$ac_try\"") >&5 + { (eval echo "$as_me:21991: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21993: \$? = $ac_status" >&5 + echo "$as_me:21994: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_array_va_list=yes else @@ -22000,7 +22001,7 @@ cf_cv_array_va_list=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22003: result: $cf_cv_array_va_list" >&5 +echo "$as_me:22004: result: $cf_cv_array_va_list" >&5 echo "${ECHO_T}$cf_cv_array_va_list" >&6 test "$cf_cv_array_va_list" = yes && cat >>confdefs.h <<\EOF @@ -22011,13 +22012,13 @@ EOF ;; esac -echo "$as_me:22014: checking for pid_t" >&5 +echo "$as_me:22015: 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 22020 "configure" +#line 22021 "configure" #include "confdefs.h" $ac_includes_default int @@ -22032,16 +22033,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22035: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22038: \$? = $ac_status" >&5 + echo "$as_me:22039: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22041: \"$ac_try\"") >&5 + { (eval echo "$as_me:22042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22044: \$? = $ac_status" >&5 + echo "$as_me:22045: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -22051,7 +22052,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:22054: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:22055: 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 : @@ -22066,23 +22067,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:22069: checking for $ac_header" >&5 +echo "$as_me:22070: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22075 "configure" +#line 22076 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22079: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:22080: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22085: \$? = $ac_status" >&5 + echo "$as_me:22086: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22101,7 +22102,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:22104: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:22105: result: `eval echo '${'$as_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:22118: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22123 "configure" +#line 22124 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22151,16 +22152,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22154: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22155: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22157: \$? = $ac_status" >&5 + echo "$as_me:22158: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22160: \"$ac_try\"") >&5 + { (eval echo "$as_me:22161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22163: \$? = $ac_status" >&5 + echo "$as_me:22164: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -22170,7 +22171,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:22173: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:22174: result: `eval echo '${'$as_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:22186: 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 @@ -22205,15 +22206,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22208: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22209: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22211: \$? = $ac_status" >&5 + echo "$as_me:22212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22213: \"$ac_try\"") >&5 + { (eval echo "$as_me:22214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22216: \$? = $ac_status" >&5 + echo "$as_me:22217: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -22225,7 +22226,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:22228: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:22229: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -22239,12 +22240,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:22242: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:22243: 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:22247: checking for working vfork" >&5 + echo "$as_me:22248: 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 @@ -22253,7 +22254,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 22256 "configure" +#line 22257 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -22350,15 +22351,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22353: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22356: \$? = $ac_status" >&5 + echo "$as_me:22357: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22358: \"$ac_try\"") >&5 + { (eval echo "$as_me:22359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22361: \$? = $ac_status" >&5 + echo "$as_me:22362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -22370,13 +22371,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:22373: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:22374: 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:22379: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:22380: 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 @@ -22401,7 +22402,7 @@ EOF fi -echo "$as_me:22404: checking if fopen accepts explicit binary mode" >&5 +echo "$as_me:22405: checking if fopen accepts explicit binary mode" >&5 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 if test "${cf_cv_fopen_bin_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22411,7 +22412,7 @@ else cf_cv_fopen_bin_r=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 22414 "configure" +#line 22415 "configure" #include "confdefs.h" #include @@ -22444,15 +22445,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22447: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22450: \$? = $ac_status" >&5 + echo "$as_me:22451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22452: \"$ac_try\"") >&5 + { (eval echo "$as_me:22453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22455: \$? = $ac_status" >&5 + echo "$as_me:22456: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fopen_bin_r=yes else @@ -22465,7 +22466,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:22468: result: $cf_cv_fopen_bin_r" >&5 +echo "$as_me:22469: result: $cf_cv_fopen_bin_r" >&5 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF @@ -22474,7 +22475,7 @@ EOF # special check for test/ditto.c -echo "$as_me:22477: checking for openpty in -lutil" >&5 +echo "$as_me:22478: 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 @@ -22482,7 +22483,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22485 "configure" +#line 22486 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22501,16 +22502,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22504: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22505: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22507: \$? = $ac_status" >&5 + echo "$as_me:22508: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22510: \"$ac_try\"") >&5 + { (eval echo "$as_me:22511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22513: \$? = $ac_status" >&5 + echo "$as_me:22514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -22521,7 +22522,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22524: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:22525: 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 @@ -22529,7 +22530,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:22532: checking for openpty header" >&5 +echo "$as_me:22533: 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 @@ -22556,7 +22557,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 22559 "configure" +#line 22560 "configure" #include "confdefs.h" #include <$cf_header> @@ -22573,16 +22574,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22576: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22577: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22579: \$? = $ac_status" >&5 + echo "$as_me:22580: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22582: \"$ac_try\"") >&5 + { (eval echo "$as_me:22583: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22585: \$? = $ac_status" >&5 + echo "$as_me:22586: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -22600,7 +22601,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:22603: result: $cf_cv_func_openpty" >&5 +echo "$as_me:22604: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -22673,7 +22674,7 @@ if test -n "$with_hashed_db/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 22676 "configure" +#line 22677 "configure" #include "confdefs.h" #include int @@ -22685,16 +22686,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22689: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22691: \$? = $ac_status" >&5 + echo "$as_me:22692: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22694: \"$ac_try\"") >&5 + { (eval echo "$as_me:22695: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22697: \$? = $ac_status" >&5 + echo "$as_me:22698: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -22711,7 +22712,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}:22714: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:22715: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -22747,7 +22748,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}:22750: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:22751: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22758,7 +22759,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:22761: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:22762: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -22830,7 +22831,7 @@ if test -n "$cf_item" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 22833 "configure" +#line 22834 "configure" #include "confdefs.h" #include int @@ -22842,16 +22843,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22845: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22846: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22848: \$? = $ac_status" >&5 + echo "$as_me:22849: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22851: \"$ac_try\"") >&5 + { (eval echo "$as_me:22852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22854: \$? = $ac_status" >&5 + echo "$as_me:22855: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -22868,7 +22869,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}:22871: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:22872: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -22948,7 +22949,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}:22951: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:22952: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22965,23 +22966,23 @@ fi fi esac -echo "$as_me:22968: checking for db.h" >&5 +echo "$as_me:22969: 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 22974 "configure" +#line 22975 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22978: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:22979: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22984: \$? = $ac_status" >&5 + echo "$as_me:22985: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23000,11 +23001,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:23003: result: $ac_cv_header_db_h" >&5 +echo "$as_me:23004: 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:23007: checking for version of db" >&5 +echo "$as_me:23008: 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 @@ -23015,10 +23016,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:23018: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:23019: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 23021 "configure" +#line 23022 "configure" #include "confdefs.h" $ac_includes_default @@ -23048,16 +23049,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23052: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23054: \$? = $ac_status" >&5 + echo "$as_me:23055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23057: \"$ac_try\"") >&5 + { (eval echo "$as_me:23058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23060: \$? = $ac_status" >&5 + echo "$as_me:23061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -23071,16 +23072,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:23074: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:23075: 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:23078: error: Cannot determine version of db" >&5 + { { echo "$as_me:23079: 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:23083: checking for db libraries" >&5 +echo "$as_me:23084: 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 @@ -23110,10 +23111,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:23113: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:23114: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 23116 "configure" +#line 23117 "configure" #include "confdefs.h" $ac_includes_default @@ -23168,16 +23169,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23171: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23174: \$? = $ac_status" >&5 + echo "$as_me:23175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23177: \"$ac_try\"") >&5 + { (eval echo "$as_me:23178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23180: \$? = $ac_status" >&5 + echo "$as_me:23181: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -23197,11 +23198,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:23200: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:23201: 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:23204: error: Cannot determine library for db" >&5 + { { echo "$as_me:23205: 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 @@ -23227,7 +23228,7 @@ fi else - { { echo "$as_me:23230: error: Cannot find db.h" >&5 + { { echo "$as_me:23231: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -23242,7 +23243,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:23245: checking if we should include stdbool.h" >&5 +echo "$as_me:23246: 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 @@ -23250,7 +23251,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 23253 "configure" +#line 23254 "configure" #include "confdefs.h" int @@ -23262,23 +23263,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23265: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23268: \$? = $ac_status" >&5 + echo "$as_me:23269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23271: \"$ac_try\"") >&5 + { (eval echo "$as_me:23272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23274: \$? = $ac_status" >&5 + echo "$as_me:23275: \$? = $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 23281 "configure" +#line 23282 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -23294,16 +23295,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23297: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23298: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23300: \$? = $ac_status" >&5 + echo "$as_me:23301: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23303: \"$ac_try\"") >&5 + { (eval echo "$as_me:23304: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23306: \$? = $ac_status" >&5 + echo "$as_me:23307: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -23317,13 +23318,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:23320: result: yes" >&5 +then echo "$as_me:23321: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:23322: result: no" >&5 +else echo "$as_me:23323: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:23326: checking for builtin bool type" >&5 +echo "$as_me:23327: 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 @@ -23331,7 +23332,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 23334 "configure" +#line 23335 "configure" #include "confdefs.h" #include @@ -23346,16 +23347,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23349: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23350: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23352: \$? = $ac_status" >&5 + echo "$as_me:23353: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23355: \"$ac_try\"") >&5 + { (eval echo "$as_me:23356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23358: \$? = $ac_status" >&5 + echo "$as_me:23359: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -23368,9 +23369,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:23371: result: yes" >&5 +then echo "$as_me:23372: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:23373: result: no" >&5 +else echo "$as_me:23374: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23387,10 +23388,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:23390: checking if we already have C++ library" >&5 + echo "$as_me:23391: 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 23393 "configure" +#line 23394 "configure" #include "confdefs.h" #include @@ -23404,16 +23405,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23407: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23408: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23410: \$? = $ac_status" >&5 + echo "$as_me:23411: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23413: \"$ac_try\"") >&5 + { (eval echo "$as_me:23414: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23416: \$? = $ac_status" >&5 + echo "$as_me:23417: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_libstdcpp=yes else @@ -23422,7 +23423,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:23425: result: $cf_have_libstdcpp" >&5 + echo "$as_me:23426: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -23441,7 +23442,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:23444: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:23445: 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 @@ -23467,7 +23468,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 23470 "configure" +#line 23471 "configure" #include "confdefs.h" #include @@ -23481,16 +23482,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23487: \$? = $ac_status" >&5 + echo "$as_me:23488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23490: \"$ac_try\"") >&5 + { (eval echo "$as_me:23491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23493: \$? = $ac_status" >&5 + echo "$as_me:23494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -23502,7 +23503,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:23505: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:23506: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="$CXXLIBS" @@ -23524,7 +23525,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:23527: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:23528: 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 @@ -23539,15 +23540,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:23542: \"$ac_try\"") >&5 +if { (eval echo "$as_me:23543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23545: \$? = $ac_status" >&5 + echo "$as_me:23546: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:23547: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:23548: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23550: \$? = $ac_status" >&5 + echo "$as_me:23551: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -23558,15 +23559,15 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:23561: result: yes" >&5 + echo "$as_me:23562: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:23564: result: no" >&5 + echo "$as_me:23565: result: no" >&5 echo "${ECHO_T}no" >&6 fi case $GXX_VERSION in - (1*|2.0-6*) + (1.*|2.[0-6]*|[1-9][0-9].*) cf_cxx_library=yes ;; (*-2.7*|2.7*) @@ -23581,7 +23582,7 @@ case $cf_cv_system_name in ;; esac if test "$GXX" = yes; then - echo "$as_me:23584: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:23585: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -23602,7 +23603,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 23605 "configure" +#line 23606 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -23616,16 +23617,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23619: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23622: \$? = $ac_status" >&5 + echo "$as_me:23623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23625: \"$ac_try\"") >&5 + { (eval echo "$as_me:23626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23628: \$? = $ac_status" >&5 + echo "$as_me:23629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -23662,7 +23663,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 23665 "configure" +#line 23666 "configure" #include "confdefs.h" #include @@ -23676,16 +23677,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23679: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23680: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23682: \$? = $ac_status" >&5 + echo "$as_me:23683: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23685: \"$ac_try\"") >&5 + { (eval echo "$as_me:23686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23688: \$? = $ac_status" >&5 + echo "$as_me:23689: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -23718,7 +23719,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:23721: result: $cf_cxx_library" >&5 + echo "$as_me:23722: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -23734,7 +23735,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:23737: checking how to run the C++ preprocessor" >&5 +echo "$as_me:23738: 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 @@ -23751,18 +23752,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 23754 "configure" +#line 23755 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:23759: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23760: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23765: \$? = $ac_status" >&5 + echo "$as_me:23766: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -23785,17 +23786,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 23788 "configure" +#line 23789 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:23792: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23793: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23798: \$? = $ac_status" >&5 + echo "$as_me:23799: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -23832,7 +23833,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:23835: result: $CXXCPP" >&5 +echo "$as_me:23836: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -23842,18 +23843,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 23845 "configure" +#line 23846 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:23850: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23851: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23856: \$? = $ac_status" >&5 + echo "$as_me:23857: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -23876,17 +23877,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 23879 "configure" +#line 23880 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:23883: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23884: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23889: \$? = $ac_status" >&5 + echo "$as_me:23890: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -23914,7 +23915,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:23917: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:23918: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -23929,23 +23930,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:23932: checking for $ac_header" >&5 +echo "$as_me:23933: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23938 "configure" +#line 23939 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23942: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23943: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23948: \$? = $ac_status" >&5 + echo "$as_me:23949: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -23964,7 +23965,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:23967: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:23968: result: `eval echo '${'$as_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:23981: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23986 "configure" +#line 23987 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23990: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:23991: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23996: \$? = $ac_status" >&5 + echo "$as_me:23997: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -24012,7 +24013,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:24015: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:24016: result: `eval echo '${'$as_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:24027: 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 24029 "configure" +#line 24030 "configure" #include "confdefs.h" #include @@ -24043,16 +24044,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24046: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24047: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24049: \$? = $ac_status" >&5 + echo "$as_me:24050: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24052: \"$ac_try\"") >&5 + { (eval echo "$as_me:24053: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24055: \$? = $ac_status" >&5 + echo "$as_me:24056: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -24061,7 +24062,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:24064: result: $cf_iostream_namespace" >&5 + echo "$as_me:24065: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -24072,7 +24073,7 @@ EOF fi fi -echo "$as_me:24075: checking if we should include stdbool.h" >&5 +echo "$as_me:24076: 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 @@ -24080,7 +24081,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 24083 "configure" +#line 24084 "configure" #include "confdefs.h" int @@ -24092,23 +24093,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24098: \$? = $ac_status" >&5 + echo "$as_me:24099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24101: \"$ac_try\"") >&5 + { (eval echo "$as_me:24102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24104: \$? = $ac_status" >&5 + echo "$as_me:24105: \$? = $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 24111 "configure" +#line 24112 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -24124,16 +24125,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24127: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24128: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24130: \$? = $ac_status" >&5 + echo "$as_me:24131: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24133: \"$ac_try\"") >&5 + { (eval echo "$as_me:24134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24136: \$? = $ac_status" >&5 + echo "$as_me:24137: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -24147,13 +24148,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:24150: result: yes" >&5 +then echo "$as_me:24151: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:24152: result: no" >&5 +else echo "$as_me:24153: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:24156: checking for builtin bool type" >&5 +echo "$as_me:24157: 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 @@ -24161,7 +24162,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 24164 "configure" +#line 24165 "configure" #include "confdefs.h" #include @@ -24176,16 +24177,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24179: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24180: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24182: \$? = $ac_status" >&5 + echo "$as_me:24183: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24185: \"$ac_try\"") >&5 + { (eval echo "$as_me:24186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24188: \$? = $ac_status" >&5 + echo "$as_me:24189: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -24198,13 +24199,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:24201: result: yes" >&5 +then echo "$as_me:24202: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:24203: result: no" >&5 +else echo "$as_me:24204: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:24207: checking for size of bool" >&5 +echo "$as_me:24208: 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 @@ -24215,7 +24216,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 24218 "configure" +#line 24219 "configure" #include "confdefs.h" #include @@ -24257,15 +24258,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24260: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24261: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24263: \$? = $ac_status" >&5 + echo "$as_me:24264: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24265: \"$ac_try\"") >&5 + { (eval echo "$as_me:24266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24268: \$? = $ac_status" >&5 + echo "$as_me:24269: \$? = $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 @@ -24283,18 +24284,18 @@ fi fi rm -f cf_test.out -echo "$as_me:24286: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:24287: 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:24292: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:24293: 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:24297: checking for special defines needed for etip.h" >&5 +echo "$as_me:24298: 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" @@ -24312,7 +24313,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 24315 "configure" +#line 24316 "configure" #include "confdefs.h" #include @@ -24326,16 +24327,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24330: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24332: \$? = $ac_status" >&5 + echo "$as_me:24333: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24335: \"$ac_try\"") >&5 + { (eval echo "$as_me:24336: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24338: \$? = $ac_status" >&5 + echo "$as_me:24339: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:24360: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:24364: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:24365: 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 @@ -24378,7 +24379,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 24381 "configure" +#line 24382 "configure" #include "confdefs.h" class TEST { @@ -24397,15 +24398,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24400: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24401: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24403: \$? = $ac_status" >&5 + echo "$as_me:24404: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24405: \"$ac_try\"") >&5 + { (eval echo "$as_me:24406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24408: \$? = $ac_status" >&5 + echo "$as_me:24409: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -24424,7 +24425,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:24427: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:24428: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -24434,7 +24435,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:24437: checking if $CXX accepts static_cast" >&5 +echo "$as_me:24438: 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 @@ -24448,7 +24449,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 24451 "configure" +#line 24452 "configure" #include "confdefs.h" class NCursesPanel @@ -24492,16 +24493,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24495: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24496: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24498: \$? = $ac_status" >&5 + echo "$as_me:24499: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24501: \"$ac_try\"") >&5 + { (eval echo "$as_me:24502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24504: \$? = $ac_status" >&5 + echo "$as_me:24505: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -24519,7 +24520,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:24522: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:24523: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -24568,7 +24569,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:24571: checking for size of bool" >&5 +echo "$as_me:24572: 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 @@ -24579,7 +24580,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 24582 "configure" +#line 24583 "configure" #include "confdefs.h" #include @@ -24621,15 +24622,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24625: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24627: \$? = $ac_status" >&5 + echo "$as_me:24628: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24629: \"$ac_try\"") >&5 + { (eval echo "$as_me:24630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24632: \$? = $ac_status" >&5 + echo "$as_me:24633: \$? = $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 @@ -24647,25 +24648,25 @@ fi fi rm -f cf_test.out -echo "$as_me:24650: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:24651: 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:24656: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:24657: 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:24662: checking for fallback type of bool" >&5 + echo "$as_me:24663: 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:24668: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:24669: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -24694,7 +24695,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:24697: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:24698: 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 @@ -24711,7 +24712,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:24714: checking for $ac_word" >&5 +echo "$as_me:24715: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24728,7 +24729,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:24731: found $ac_dir/$ac_word" >&5 + echo "$as_me:24732: found $ac_dir/$ac_word" >&5 break fi done @@ -24740,10 +24741,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:24743: result: $cf_TEMP_gnat" >&5 + echo "$as_me:24744: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:24746: result: no" >&5 + echo "$as_me:24747: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24753,7 +24754,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:24756: checking for $cf_prog_gnat version" >&5 +echo "$as_me:24757: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24764,7 +24765,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:24767: result: $cf_cv_gnat_version" >&5 +echo "$as_me:24768: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -24793,7 +24794,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:24796: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:24797: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test $cf_gprconfig = C then @@ -24812,10 +24813,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value - echo "$as_me:24815: result: $cf_gprconfig_value" >&5 + echo "$as_me:24816: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:24818: result: missing" >&5 + echo "$as_me:24819: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -24828,7 +24829,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:24831: checking for gnat version" >&5 +echo "$as_me:24832: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24839,7 +24840,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:24842: result: $cf_cv_gnat_version" >&5 +echo "$as_me:24843: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -24848,7 +24849,7 @@ case $cf_cv_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:24851: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:24852: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -24856,7 +24857,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:24859: checking for $ac_word" >&5 +echo "$as_me:24860: 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 @@ -24871,7 +24872,7 @@ 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:24874: found $ac_dir/$ac_word" >&5 +echo "$as_me:24875: found $ac_dir/$ac_word" >&5 break done @@ -24880,20 +24881,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:24883: result: $M4_exists" >&5 + echo "$as_me:24884: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:24886: result: no" >&5 + echo "$as_me:24887: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:24892: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:24893: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:24896: checking if GNAT works" >&5 + echo "$as_me:24897: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -24921,7 +24922,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:24924: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:24925: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -24933,7 +24934,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:24936: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:24937: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -24950,10 +24951,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:24953: result: $ADAFLAGS" >&5 + echo "$as_me:24954: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:24956: checking if GNATPREP supports -T option" >&5 +echo "$as_me:24957: 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 @@ -24963,21 +24964,21 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:24966: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:24967: 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:24970: checking if GNAT supports generics" >&5 +echo "$as_me:24971: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_cv_gnat_version in -(3.[1-9]*|[4-9].*) +(3.[1-9]*|[4-9].*|[1-9][0-9].*) cf_gnat_generics=yes ;; (*) cf_gnat_generics=no ;; esac -echo "$as_me:24980: result: $cf_gnat_generics" >&5 +echo "$as_me:24981: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -24989,7 +24990,7 @@ else cf_generic_objects= fi -echo "$as_me:24992: checking if GNAT supports SIGINT" >&5 +echo "$as_me:24993: 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 @@ -25037,7 +25038,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:25040: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:25041: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -25050,7 +25051,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:25053: checking if GNAT supports project files" >&5 +echo "$as_me:25054: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_cv_gnat_version in (3.[0-9]*) @@ -25113,15 +25114,15 @@ CF_EOF esac ;; esac -echo "$as_me:25116: result: $cf_gnat_projects" >&5 +echo "$as_me:25117: 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:25122: checking if GNAT supports libraries" >&5 + echo "$as_me:25123: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:25124: result: $cf_gnat_libraries" >&5 + echo "$as_me:25125: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -25141,7 +25142,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:25144: checking for ada-compiler" >&5 +echo "$as_me:25145: 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. @@ -25152,12 +25153,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:25155: result: $cf_ada_compiler" >&5 +echo "$as_me:25156: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:25160: checking for ada-include" >&5 +echo "$as_me:25161: 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. @@ -25193,7 +25194,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:25196: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:25197: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -25202,10 +25203,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:25205: result: $ADA_INCLUDE" >&5 +echo "$as_me:25206: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:25208: checking for ada-objects" >&5 +echo "$as_me:25209: 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. @@ -25241,7 +25242,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:25244: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:25245: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -25250,10 +25251,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:25253: result: $ADA_OBJECTS" >&5 +echo "$as_me:25254: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:25256: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:25257: 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. @@ -25263,14 +25264,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:25266: result: $with_ada_sharedlib" >&5 +echo "$as_me:25267: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:25273: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:25274: WARNING: disabling shared-library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no fi @@ -25290,7 +25291,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:25293: checking for ada-libname" >&5 +echo "$as_me:25294: checking for ada-libname" >&5 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -25306,7 +25307,7 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:25309: result: $ADA_LIBNAME" >&5 +echo "$as_me:25310: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 fi @@ -25317,13 +25318,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:25320: checking for wchar_t" >&5 + echo "$as_me:25321: 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 25326 "configure" +#line 25327 "configure" #include "confdefs.h" $ac_includes_default int @@ -25338,16 +25339,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25341: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25342: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25344: \$? = $ac_status" >&5 + echo "$as_me:25345: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25347: \"$ac_try\"") >&5 + { (eval echo "$as_me:25348: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25350: \$? = $ac_status" >&5 + echo "$as_me:25351: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -25357,10 +25358,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:25360: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:25361: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:25363: checking size of wchar_t" >&5 +echo "$as_me:25364: 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 @@ -25369,7 +25370,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 25372 "configure" +#line 25373 "configure" #include "confdefs.h" $ac_includes_default int @@ -25381,21 +25382,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25384: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25385: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25387: \$? = $ac_status" >&5 + echo "$as_me:25388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25390: \"$ac_try\"") >&5 + { (eval echo "$as_me:25391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25393: \$? = $ac_status" >&5 + echo "$as_me:25394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 25398 "configure" +#line 25399 "configure" #include "confdefs.h" $ac_includes_default int @@ -25407,16 +25408,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25410: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25413: \$? = $ac_status" >&5 + echo "$as_me:25414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25416: \"$ac_try\"") >&5 + { (eval echo "$as_me:25417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25419: \$? = $ac_status" >&5 + echo "$as_me:25420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -25432,7 +25433,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 25435 "configure" +#line 25436 "configure" #include "confdefs.h" $ac_includes_default int @@ -25444,16 +25445,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25447: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25448: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25450: \$? = $ac_status" >&5 + echo "$as_me:25451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25453: \"$ac_try\"") >&5 + { (eval echo "$as_me:25454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25456: \$? = $ac_status" >&5 + echo "$as_me:25457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -25469,7 +25470,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 25472 "configure" +#line 25473 "configure" #include "confdefs.h" $ac_includes_default int @@ -25481,16 +25482,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25484: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25485: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25487: \$? = $ac_status" >&5 + echo "$as_me:25488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25490: \"$ac_try\"") >&5 + { (eval echo "$as_me:25491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25493: \$? = $ac_status" >&5 + echo "$as_me:25494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -25503,12 +25504,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:25506: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:25507: 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 25511 "configure" +#line 25512 "configure" #include "confdefs.h" $ac_includes_default int @@ -25524,15 +25525,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:25527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25528: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25530: \$? = $ac_status" >&5 + echo "$as_me:25531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:25532: \"$ac_try\"") >&5 + { (eval echo "$as_me:25533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25535: \$? = $ac_status" >&5 + echo "$as_me:25536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -25548,7 +25549,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:25551: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:25552: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&6 -echo "${as_me:-configure}:25564: testing test failed (assume 2) ..." 1>&5 +echo "${as_me:-configure}:25565: testing test failed (assume 2) ..." 1>&5 sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -25579,7 +25580,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:25582: checking for library subsets" >&5 +echo "$as_me:25583: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -25621,7 +25622,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:25624: result: $LIB_SUBSETS" >&5 +echo "$as_me:25625: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -25652,7 +25653,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:25655: checking default library suffix" >&5 +echo "$as_me:25656: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -25663,10 +25664,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:25666: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:25667: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:25669: checking default library-dependency suffix" >&5 +echo "$as_me:25670: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -25749,10 +25750,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:25752: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:25753: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:25755: checking default object directory" >&5 +echo "$as_me:25756: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -25768,11 +25769,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:25771: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:25772: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:25775: checking c++ library-dependency suffix" >&5 +echo "$as_me:25776: 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++) @@ -25865,7 +25866,7 @@ else fi fi -echo "$as_me:25868: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:25869: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -26041,19 +26042,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:26044: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:26045: 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:26053: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:26054: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26056: \$? = $ac_status" >&5 + echo "$as_me:26057: \$? = $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 @@ -26064,10 +26065,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 26067 "configure" +#line 26068 "configure" #include "confdefs.h" -#line 26070 "configure" +#line 26071 "configure" #include int cf_ldflags_static(FILE *fp); @@ -26082,16 +26083,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:26085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26088: \$? = $ac_status" >&5 + echo "$as_me:26089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:26091: \"$ac_try\"") >&5 + { (eval echo "$as_me:26092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26094: \$? = $ac_status" >&5 + echo "$as_me:26095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -26114,7 +26115,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:26117: result: $cf_ldflags_static" >&5 + echo "$as_me:26118: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -26130,7 +26131,7 @@ fi ;; esac -echo "$as_me:26133: checking where we will install curses.h" >&5 +echo "$as_me:26134: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -26140,7 +26141,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:26143: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:26144: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -26148,7 +26149,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:26151: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:26152: 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 @@ -26165,7 +26166,7 @@ EOF # pkgsrc uses these -echo "$as_me:26168: checking for desired basename for form library" >&5 +echo "$as_me:26169: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -26185,10 +26186,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:26188: result: $FORM_NAME" >&5 +echo "$as_me:26189: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:26191: checking for desired basename for menu library" >&5 +echo "$as_me:26192: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -26208,10 +26209,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:26211: result: $MENU_NAME" >&5 +echo "$as_me:26212: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:26214: checking for desired basename for panel library" >&5 +echo "$as_me:26215: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -26231,10 +26232,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:26234: result: $PANEL_NAME" >&5 +echo "$as_me:26235: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:26237: checking for desired basename for cxx library" >&5 +echo "$as_me:26238: checking for desired basename for cxx library" >&5 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 # Check whether --with-cxx-libname or --without-cxx-libname was given. @@ -26254,13 +26255,13 @@ case "x$CXX_NAME" in ;; esac -echo "$as_me:26257: result: $CXX_NAME" >&5 +echo "$as_me:26258: result: $CXX_NAME" >&5 echo "${ECHO_T}$CXX_NAME" >&6 ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:26263: checking for src modules" >&5 +echo "$as_me:26264: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -26329,7 +26330,7 @@ eval TEST_ROOT=\$${cf_map_lib_basename}_NAME fi fi done -echo "$as_me:26332: result: $cf_cv_src_modules" >&5 +echo "$as_me:26333: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -26590,7 +26591,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}:26593: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:26594: 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//'` @@ -26601,7 +26602,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:26604: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:26605: 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 @@ -26617,7 +26618,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:26620: result: $PKG_CFLAGS" >&5 +echo "$as_me:26621: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -26678,7 +26679,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}:26681: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:26682: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -26705,7 +26706,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:26708: checking for linker search path" >&5 +echo "$as_me:26709: checking for linker search path" >&5 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 if test "${cf_cv_ld_searchpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26769,7 +26770,7 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:26772: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:26773: result: $cf_cv_ld_searchpath" >&5 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` @@ -26859,7 +26860,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:26862: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:26863: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -27035,7 +27036,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:27038: error: ambiguous option: $1 + { { echo "$as_me:27039: 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;} @@ -27054,7 +27055,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:27057: error: unrecognized option: $1 + -*) { { echo "$as_me:27058: 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;} @@ -27177,7 +27178,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:27180: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:27181: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -27676,7 +27677,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:27679: creating $ac_file" >&5 + { echo "$as_me:27680: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -27694,7 +27695,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:27697: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:27698: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -27707,7 +27708,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:27710: error: cannot find input file: $f" >&5 + { { echo "$as_me:27711: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -27723,7 +27724,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:27726: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:27727: 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;} @@ -27732,7 +27733,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:27735: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:27736: 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;} @@ -27769,7 +27770,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:27772: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:27773: 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;} @@ -27780,7 +27781,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:27783: WARNING: Some variables may not be substituted: + { echo "$as_me:27784: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -27829,7 +27830,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:27832: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:27833: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -27840,7 +27841,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:27843: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:27844: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -27853,7 +27854,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:27856: error: cannot find input file: $f" >&5 + { { echo "$as_me:27857: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -27911,7 +27912,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:27914: $ac_file is unchanged" >&5 + { echo "$as_me:27915: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -28298,7 +28299,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw|msvcdll) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:28301: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:28302: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index 10857b8d..7454c9ae 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.707 2020/05/23 18:16:07 tom Exp $ +dnl $Id: configure.in,v 1.709 2020/05/31 20:04:09 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20200111) -AC_REVISION($Revision: 1.707 $) +AC_REVISION($Revision: 1.709 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -145,9 +145,9 @@ fi CF_GXX_VERSION case $GXX_VERSION in -(1*|2.[[0-6]]*) - # GXX=""; CXX=""; ac_cv_prog_gxx=no - # cf_cxx_library=no +([[1-9]][[0-9]].*) + ;; +(1.*|2.[[0-6]]*) AC_MSG_WARN(templates do not work) ;; esac @@ -1761,6 +1761,7 @@ setenv \ setvbuf \ sigaction \ sigvec \ +snprintf \ strdup \ strstr \ sysconf \ @@ -1848,7 +1849,7 @@ if test -n "$CXX" ; then CF_PROG_CC_C_O(CXX,[$CXXFLAGS $CPPFLAGS]) case $GXX_VERSION in - (1*|2.[0-6]*) + (1.*|2.[[0-6]]*|[[1-9]][[0-9]].*) cf_cxx_library=yes ;; (*-2.7*|2.7*) diff --git a/convert_configure.pl b/convert_configure.pl deleted file mode 100644 index f35d154f..00000000 --- a/convert_configure.pl +++ /dev/null @@ -1,120 +0,0 @@ -extproc perl -S -w - -# $Id: convert_configure.pl,v 1.4 2020/02/02 23:34:34 tom Exp $ -############################################################################## -# Copyright 2020 Thomas E. Dickey # -# Copyright 1998-2000,2006 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. # -############################################################################## - -# The converted script is written to stdout, so run this script as -# convert_configure configure > configure.cmd -# -# When the converted script runs, it expects that /tmp dir is -# available (so we create it). -# -# run the result like this: -# .\configure - -# Some frequent manual intervention: -# a) Some makefiles hardwire SHELL = /bin/sh ==> change to: sh -# b) Some makefiles recognize that exe files terminate on .exe -# You need to give this script -no-zexe option... - -shift, $no_zexe = 1 if @ARGV and $ARGV[0] eq '-no-zexe'; - -mkdir '/tmp', 0777 unless -d '/tmp'; - -print <) { - if (/for\s+(\w+)\s+in\s*\$(PATH|ac_dummy)\s*;/) { - $checking_path = 1; - $varname = $1; - $subst= <\E[?5l, hpa=\E[%i%p1%dG, invis=\E[8m, kbs=^?, kdch1=\E[3~, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, @@ -20911,6 +20914,17 @@ linux-m2|Linux Minitel 2 "like" Couleurs (Vert/Blanc/Noir+Bleu), \E]PFFFFFFF\E[;37m, use=linux-m1, +# From: Alexandre Montaron, 27 May 2020 +linux-s|Linux Console with added status line at bottom, + hs, + clear=\E[255;255H\E[A\E[1J\E[H, csr@, + dsl=\E7\E[255H\E[K\E8, ed@, fsl=\E8, + iprog=\sbash\s-c\s'echo\s-ne\s"\E[?6l\E[255H\E[A\E[6n"\s; + \sread\s-d\sR\sTMP\s;\sLINES=`echo\s$TMP\s|\scut\s-f1 + \s-d\s";"\s|\scut\s-f2\s-d\s"["`\s;\sstty\srows\s$LINE + S\s;\secho\s-ne\s"\E[;"$LINES"r\E[J"', + rs1=\E]R, tsl=\E7\E[255;%p1%dH, .rc@, .sc@, use=linux, + # Screen entries counterpart : screen.linux-m1|Linux m1 specific for screen, @@ -26557,4 +26571,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, # 2020-05-16 # + update notes on vscode / xterm.js -TD # +# 2020-05-30 +# + re-enable "bel" in konsole-base (report by Nia Huang) +# + add linux-s entry (patch by Alexandre Montaron). +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c index 376ad4f6..2343219e 100644 --- a/ncurses/base/lib_color.c +++ b/ncurses/base/lib_color.c @@ -49,7 +49,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_color.c,v 1.143 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_color.c,v 1.145 2020/05/27 23:55:32 tom Exp $") #ifdef USE_TERM_DRIVER #define CanChange InfoOf(SP_PARM).canchange @@ -140,7 +140,6 @@ NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette = hls_palette; #endif /* *INDENT-ON* */ - #if NCURSES_EXT_FUNCS /* * These are called from _nc_do_color(), which in turn is called from @@ -190,12 +189,12 @@ set_background_color(NCURSES_SP_DCLx int bg, NCURSES_SP_OUTC outc) if (set_a_background) { TPUTS_TRACE("set_a_background"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_a_background, bg), + TIPARM_1(set_a_background, bg), 1, outc); } else { TPUTS_TRACE("set_background"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_background, toggled_colors(bg)), + TIPARM_1(set_background, toggled_colors(bg)), 1, outc); } #endif @@ -210,12 +209,12 @@ set_foreground_color(NCURSES_SP_DCLx int fg, NCURSES_SP_OUTC outc) if (set_a_foreground) { TPUTS_TRACE("set_a_foreground"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_a_foreground, fg), + TIPARM_1(set_a_foreground, fg), 1, outc); } else { TPUTS_TRACE("set_foreground"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_foreground, toggled_colors(fg)), + TIPARM_1(set_foreground, toggled_colors(fg)), 1, outc); } #endif @@ -672,14 +671,14 @@ _nc_init_pair(SCREEN *sp, int pair, int f, int b) (int) tp[b].red, (int) tp[b].green, (int) tp[b].blue)); NCURSES_PUTP2("initialize_pair", - TPARM_7(initialize_pair, - pair, - (int) tp[f].red, - (int) tp[f].green, - (int) tp[f].blue, - (int) tp[b].red, - (int) tp[b].green, - (int) tp[b].blue)); + TIPARM_7(initialize_pair, + pair, + (int) tp[f].red, + (int) tp[f].green, + (int) tp[f].blue, + (int) tp[b].red, + (int) tp[b].green, + (int) tp[b].blue)); } #endif @@ -746,7 +745,7 @@ _nc_init_color(SCREEN *sp, int color, int r, int g, int b) CallDriver_4(sp, td_initcolor, color, r, g, b); #else NCURSES_PUTP2("initialize_color", - TPARM_4(initialize_color, color, r, g, b)); + TIPARM_4(initialize_color, color, r, g, b)); #endif sp->_color_defs = max(color + 1, sp->_color_defs); @@ -1004,7 +1003,7 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx if (set_color_pair) { TPUTS_TRACE("set_color_pair"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_color_pair, pair), + TIPARM_1(set_color_pair, pair), 1, outc); return; } else if (SP_PARM != 0) { diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c index 887f1ab5..6422b52e 100644 --- a/ncurses/base/lib_mouse.c +++ b/ncurses/base/lib_mouse.c @@ -85,7 +85,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_mouse.c,v 1.188 2020/05/23 23:35:35 tom Exp $") +MODULE_ID("$Id: lib_mouse.c,v 1.190 2020/05/27 23:55:32 tom Exp $") #include @@ -436,7 +436,7 @@ enable_xterm_mouse(SCREEN *sp, int enable) #if USE_EMX_MOUSE sp->_emxmouse_activated = enable; #else - NCURSES_PUTP2("xterm-mouse", TPARM_1(sp->_mouse_xtermcap, enable)); + NCURSES_PUTP2("xterm-mouse", TIPARM_1(sp->_mouse_xtermcap, enable)); #endif sp->_mouse_active = enable; } diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c index d306e1e8..6afba661 100644 --- a/ncurses/base/lib_screen.c +++ b/ncurses/base/lib_screen.c @@ -42,7 +42,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_screen.c,v 1.99 2020/05/23 19:12:01 tom Exp $") +MODULE_ID("$Id: lib_screen.c,v 1.100 2020/05/25 22:48:41 tom Exp $") #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ @@ -58,7 +58,7 @@ MODULE_ID("$Id: lib_screen.c,v 1.99 2020/05/23 19:12:01 tom Exp $") #define ARG_SLIMIT(name) /* nothing */ #endif -#define CUR_SLIMIT _nc_SLIMIT(limit - (target - base)) +#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target - base)) #define TOP_SLIMIT _nc_SLIMIT(sizeof(buffer)) /* diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c index 8b3b83d1..9362105a 100644 --- a/ncurses/tinfo/captoinfo.c +++ b/ncurses/tinfo/captoinfo.c @@ -98,7 +98,7 @@ #include #include -MODULE_ID("$Id: captoinfo.c,v 1.98 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: captoinfo.c,v 1.99 2020/05/25 21:28:29 tom Exp $") #if 0 #define DEBUG_THIS(p) DEBUG(9, p) @@ -216,12 +216,15 @@ cvtchar(register const char *sp) } break; case '^': + len = 2; c = UChar(*++sp); - if (c == '?') + if (c == '?') { c = 127; - else + } else if (c == '\0') { + len = 1; + } else { c &= 0x1f; - len = 2; + } break; default: c = UChar(*sp); diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c index eb921492..25e45170 100644 --- a/ncurses/tinfo/lib_print.c +++ b/ncurses/tinfo/lib_print.c @@ -40,7 +40,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_print.c,v 1.25 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_print.c,v 1.27 2020/05/27 23:55:56 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) @@ -60,7 +60,7 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) } if (prtr_non) { - switchon = TPARM_1(prtr_non, len); + switchon = TIPARM_1(prtr_non, len); onsize = strlen(switchon); offsize = 0; } else { diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c index 8e240856..9cf5e100 100644 --- a/ncurses/tinfo/lib_tgoto.c +++ b/ncurses/tinfo/lib_tgoto.c @@ -36,7 +36,7 @@ #include #include -MODULE_ID("$Id: lib_tgoto.c,v 1.19 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tgoto.c,v 1.21 2020/05/27 23:55:56 tom Exp $") #if !PURE_TERMINFO static bool @@ -207,6 +207,6 @@ tgoto(const char *string, int x, int y) result = tgoto_internal(string, x, y); else #endif - result = TPARM_2(string, y, x); + result = TIPARM_2(string, y, x); returnPtr(result); } diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c index 400cd319..00380151 100644 --- a/ncurses/tinfo/lib_tparm.c +++ b/ncurses/tinfo/lib_tparm.c @@ -38,12 +38,22 @@ * */ +#define entry _ncu_entry +#define ENTRY _ncu_ENTRY + #include +#undef entry +#undef ENTRY + +#if HAVE_TSEARCH +#include +#endif + #include #include -MODULE_ID("$Id: lib_tparm.c,v 1.108 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tparm.c,v 1.126 2020/05/31 00:02:03 tom Exp $") /* * char * @@ -110,17 +120,81 @@ NCURSES_EXPORT_VAR(int) _nc_tparm_err = 0; #define TPS(var) _nc_prescreen.tparm_state.var #define popcount _nc_popcount /* workaround for NetBSD 6.0 defect */ +#define isUPPER(c) ((c) >= 'A' && (c) <= 'Z') +#define isLOWER(c) ((c) >= 'a' && (c) <= 'z') +#define tc_BUMP() if (level < 0 && number < 2) number++ + +typedef struct { + const char *format; /* format-string can be used as cache-key */ + int tparm_type; /* bit-set for each string-parameter */ + int num_actual; + int num_parsed; + int num_popped; + TPARM_ARG param[NUM_PARM]; + char *p_is_s[NUM_PARM]; +} TPARM_DATA; + +#if HAVE_TSEARCH +static void *cached_tparm; +static int count_tparm; +#if NO_LEAKS +static int which_tparm; +static TPARM_DATA **delete_tparm; +#endif +#endif /* HAVE_TSEARCH */ + +static char dummy[] = ""; /* avoid const-cast */ + +#if HAVE_TSEARCH +static int +cmp_format(const void *p, const void *q) +{ + const char *a = *(char *const *) p; + const char *b = *(char *const *) q; + return strcmp(a, b); +} +#endif + #if NO_LEAKS +#if HAVE_TSEARCH +static void +visit_nodes(const void *nodep, const VISIT which, const int depth) +{ + (void) depth; + if (which == preorder || which == leaf) { + delete_tparm[which_tparm] = *(TPARM_DATA **) nodep; + which_tparm++; + } +} +#endif + NCURSES_EXPORT(void) _nc_free_tparm(void) { - if (TPS(out_buff) != 0) { - FreeAndNull(TPS(out_buff)); - TPS(out_size) = 0; - TPS(out_used) = 0; - FreeAndNull(TPS(fmt_buff)); - TPS(fmt_size) = 0; +#if HAVE_TSEARCH + if (count_tparm != 0) { + delete_tparm = typeMalloc(TPARM_DATA *, count_tparm); + which_tparm = 0; + twalk(cached_tparm, visit_nodes); + for (which_tparm = 0; which_tparm < count_tparm; ++which_tparm) { + TPARM_DATA *ptr = delete_tparm[which_tparm]; + tdelete(ptr, &cached_tparm, cmp_format); + free((char *) ptr->format); + free(ptr); + } + which_tparm = 0; + twalk(cached_tparm, visit_nodes); + FreeAndNull(delete_tparm); + count_tparm = 0; + which_tparm = 0; } +#endif + FreeAndNull(TPS(out_buff)); + TPS(out_size) = 0; + TPS(out_used) = 0; + + FreeAndNull(TPS(fmt_buff)); + TPS(fmt_size) = 0; } #endif @@ -137,10 +211,7 @@ get_space(size_t need) static NCURSES_INLINE void save_text(const char *fmt, const char *s, int len) { - size_t s_len = strlen(s); - if (len > (int) s_len) - s_len = (size_t) len; - + size_t s_len = (size_t) len + strlen(s) + strlen(fmt); get_space(s_len + 1); _nc_SPRINTF(TPS(out_buff) + TPS(out_used), @@ -152,10 +223,8 @@ save_text(const char *fmt, const char *s, int len) static NCURSES_INLINE void save_number(const char *fmt, int number, int len) { - if (len < 30) - len = 30; /* actually log10(MAX_INT)+1 */ - - get_space((size_t) len + 1); + size_t s_len = (size_t) len + 30 + strlen(fmt); + get_space(s_len + 1); _nc_SPRINTF(TPS(out_buff) + TPS(out_used), _nc_SLIMIT(TPS(out_size) - TPS(out_used)) @@ -216,7 +285,6 @@ spush(char *x) static NCURSES_INLINE char * spop(void) { - static char dummy[] = ""; /* avoid const-cast */ char *result = dummy; if (TPS(stack_ptr) > 0) { TPS(stack_ptr)--; @@ -325,10 +393,6 @@ parse_format(const char *s, char *format, int *len) return s; } -#define isUPPER(c) ((c) >= 'A' && (c) <= 'Z') -#define isLOWER(c) ((c) >= 'a' && (c) <= 'z') -#define tc_BUMP() if (level < 0 && number < 2) number++ - /* * Analyze the string to see how many parameters we need from the varargs list, * and what their types are. We will only accept string parameters if they @@ -350,7 +414,6 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount) int number = 0; int level = -1; const char *cp = string; - static char dummy[] = ""; if (cp == 0) return 0; @@ -469,106 +532,179 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount) return number; } -static NCURSES_INLINE char * -tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) +/* + * Analyze the capability string, finding the number of parameters and their + * types. + * + * TODO: cache the result so that this is done once per capability per term. + */ +static int +tparm_setup(const char *string, TPARM_DATA * result) { - char *p_is_s[NUM_PARM]; - TPARM_ARG param[NUM_PARM]; - int popcount = 0; - int number; - int num_args; - int len; - int level; - int x, y; - int i; - const char *cp = string; - size_t len2; - bool termcap_hack; - bool incremented_two; + int rc = OK; + + TPS(out_used) = 0; + memset(result, 0, sizeof(*result)); - if (cp == NULL) { + if (string == NULL) { TR(TRACE_CALLS, ("%s: format is null", TPS(tname))); - return NULL; - } + rc = ERR; + } else { +#if HAVE_TSEARCH + TPARM_DATA *fs; + void *ft; + + result->format = string; + if ((ft = tfind(result, &cached_tparm, cmp_format)) != 0) { + fs = *(TPARM_DATA **) ft; + *result = *fs; + } else +#endif + { + /* + * Find the highest parameter-number referred to in the format + * string. Use this value to limit the number of arguments copied + * from the variable-length argument list. + */ + result->num_parsed = _nc_tparm_analyze(string, + result->p_is_s, + &(result->num_popped)); + if (TPS(fmt_buff) == 0) { + TR(TRACE_CALLS, ("%s: error in analysis", TPS(tname))); + rc = ERR; + } else { + int n; - TPS(out_used) = 0; - len2 = strlen(cp); - - /* - * Find the highest parameter-number referred to in the format string. - * Use this value to limit the number of arguments copied from the - * variable-length argument list. - */ - number = _nc_tparm_analyze(cp, p_is_s, &popcount); - if (TPS(fmt_buff) == 0) { - TR(TRACE_CALLS, ("%s: error in analysis", TPS(tname))); - return NULL; + if (result->num_parsed > NUM_PARM) + result->num_parsed = NUM_PARM; + if (result->num_popped > NUM_PARM) + result->num_popped = NUM_PARM; + result->num_actual = max(result->num_popped, result->num_parsed); + + for (n = 0; n < result->num_actual; ++n) { + if (result->p_is_s[n]) + result->tparm_type |= (1 << n); + } +#if HAVE_TSEARCH + if ((fs = typeCalloc(TPARM_DATA, 1)) != 0) { + *fs = *result; + if ((fs->format = strdup(string)) != 0) { + if ((ft = tsearch(fs, &cached_tparm, cmp_format)) != 0) { + ++count_tparm; + } else { + rc = ERR; + } + } else { + rc = ERR; + } + } else { + rc = ERR; + } +#endif + } + } } - incremented_two = FALSE; + return rc; +} - if (number > NUM_PARM) - number = NUM_PARM; - if (popcount > NUM_PARM) - popcount = NUM_PARM; - num_args = max(popcount, number); +/* + * A few caps (such as plab_norm) have string-valued parms. We'll have to + * assume that the caller knows the difference, since a char* and an int may + * not be the same size on the stack. The normal prototype for tparm uses 9 + * long's, which is consistent with our va_arg() usage. + */ +static void +tparm_copy_valist(TPARM_DATA * data, int use_TPARM_ARG, va_list ap) +{ + int i; - for (i = 0; i < num_args; i++) { - /* - * A few caps (such as plab_norm) have string-valued parms. - * We'll have to assume that the caller knows the difference, since - * a char* and an int may not be the same size on the stack. The - * normal prototype for this uses 9 long's, which is consistent with - * our va_arg() usage. - */ - if (p_is_s[i] != 0) { - p_is_s[i] = va_arg(ap, char *); - param[i] = 0; + for (i = 0; i < data->num_actual; i++) { + if (data->p_is_s[i] != 0) { + char *value = va_arg(ap, char *); + if (value == 0) + value = dummy; + data->p_is_s[i] = value; + data->param[i] = 0; } else if (use_TPARM_ARG) { - param[i] = va_arg(ap, TPARM_ARG); + data->param[i] = va_arg(ap, TPARM_ARG); } else { - param[i] = (TPARM_ARG) va_arg(ap, int); + data->param[i] = (TPARM_ARG) va_arg(ap, int); } } +} + +/* + * This is a termcap compatibility hack. If there are no explicit pop + * operations in the string, load the stack in such a way that successive pops + * will grab successive parameters. That will make the expansion of (for + * example) \E[%d;%dH work correctly in termcap style, which means tparam() + * will expand termcap strings OK. + */ +static bool +tparm_tc_compat(TPARM_DATA * data) +{ + bool termcap_hack = FALSE; - /* - * This is a termcap compatibility hack. If there are no explicit pop - * operations in the string, load the stack in such a way that - * successive pops will grab successive parameters. That will make - * the expansion of (for example) \E[%d;%dH work correctly in termcap - * style, which means tparam() will expand termcap strings OK. - */ TPS(stack_ptr) = 0; - termcap_hack = FALSE; - if (popcount == 0) { + + if (data->num_popped == 0) { + int i; + termcap_hack = TRUE; - for (i = number - 1; i >= 0; i--) { - if (p_is_s[i]) - spush(p_is_s[i]); + for (i = data->num_parsed - 1; i >= 0; i--) { + if (data->p_is_s[i]) + spush(data->p_is_s[i]); else - npush((int) param[i]); + npush((int) data->param[i]); } } + return termcap_hack; +} + #ifdef TRACE +static void +tparm_trace_call(const char *string, TPARM_DATA * data) +{ if (USE_TRACEF(TRACE_CALLS)) { - for (i = 0; i < num_args; i++) { - if (p_is_s[i] != 0) { - save_text(", %s", _nc_visbuf(p_is_s[i]), 0); - } else if ((long) param[i] > MAX_OF_TYPE(NCURSES_INT2) || - (long) param[i] < 0) { + int i; + for (i = 0; i < data->num_actual; i++) { + if (data->p_is_s[i] != 0) { + save_text(", %s", _nc_visbuf(data->p_is_s[i]), 0); + } else if ((long) data->param[i] > MAX_OF_TYPE(NCURSES_INT2) || + (long) data->param[i] < 0) { _tracef("BUG: problem with tparm parameter #%d of %d", - i + 1, num_args); + i + 1, data->num_actual); break; } else { - save_number(", %d", (int) param[i], 0); + save_number(", %d", (int) data->param[i], 0); } } - _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff)); + _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(string), TPS(out_buff)); TPS(out_used) = 0; _nc_unlock_global(tracef); } +} + +#else +#define tparm_trace_call(string, data) /* nothing */ #endif /* TRACE */ +static NCURSES_INLINE char * +tparam_internal(const char *string, TPARM_DATA * data) +{ + int number; + int len; + int level; + int x, y; + int i; + const char *cp = string; + size_t len2 = strlen(cp); + bool incremented_two = FALSE; + bool termcap_hack = tparm_tc_compat(data); + + tparm_trace_call(string, data); + while ((cp - string) < (int) len2) { if (*cp != '%') { save_char(UChar(*cp)); @@ -619,10 +755,10 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) cp++; i = (UChar(*cp) - '1'); if (i >= 0 && i < NUM_PARM) { - if (p_is_s[i]) { - spush(p_is_s[i]); + if (data->p_is_s[i]) { + spush(data->p_is_s[i]); } else { - npush((int) param[i]); + npush((int) data->param[i]); } } break; @@ -751,15 +887,15 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) */ if (!incremented_two) { incremented_two = TRUE; - if (p_is_s[0] == 0) { - param[0]++; + if (data->p_is_s[0] == 0) { + data->param[0]++; if (termcap_hack) - TPS(stack)[0].data.num = (int) param[0]; + TPS(stack)[0].data.num = (int) data->param[0]; } - if (p_is_s[1] == 0) { - param[1]++; + if (data->p_is_s[1] == 0) { + data->param[1]++; if (termcap_hack) - TPS(stack)[1].data.num = (int) param[1]; + TPS(stack)[1].data.num = (int) data->param[1]; } } break; @@ -835,56 +971,118 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) } #if NCURSES_TPARM_VARARGS -#define tparm_varargs tparm -#else -#define tparm_proto tparm -#endif NCURSES_EXPORT(char *) -tparm_varargs(const char *string, ...) +tparm(const char *string, ...) { + TPARM_DATA myData; va_list ap; - char *result; + char *result = NULL; _nc_tparm_err = 0; - va_start(ap, string); #ifdef TRACE TPS(tname) = "tparm"; #endif /* TRACE */ - result = tparam_internal(TRUE, string, ap); - va_end(ap); + + if (tparm_setup(string, &myData) == OK) { + + va_start(ap, string); + tparm_copy_valist(&myData, TRUE, ap); + va_end(ap); + + result = tparam_internal(string, &myData); + } return result; } -#if !NCURSES_TPARM_VARARGS +#else /* !NCURSES_TPARM_VARARGS */ + NCURSES_EXPORT(char *) -tparm_proto(const char *string, - TPARM_ARG a1, - TPARM_ARG a2, - TPARM_ARG a3, - TPARM_ARG a4, - TPARM_ARG a5, - TPARM_ARG a6, - TPARM_ARG a7, - TPARM_ARG a8, - TPARM_ARG a9) +tparm(const char *string, + TPARM_ARG a1, + TPARM_ARG a2, + TPARM_ARG a3, + TPARM_ARG a4, + TPARM_ARG a5, + TPARM_ARG a6, + TPARM_ARG a7, + TPARM_ARG a8, + TPARM_ARG a9) { - return tparm_varargs(string, a1, a2, a3, a4, a5, a6, a7, a8, a9); + TPARM_DATA myData; + char *result = NULL; + + _nc_tparm_err = 0; +#ifdef TRACE + TPS(tname) = "tparm"; +#endif /* TRACE */ + + if (tparm_setup(string, &myData) == OK) { + + myData.param[0] = a1; + myData.param[1] = a2; + myData.param[2] = a3; + myData.param[3] = a4; + myData.param[4] = a5; + myData.param[5] = a6; + myData.param[6] = a7; + myData.param[7] = a8; + myData.param[8] = a9; + + result = tparam_internal(string, &myData); + } + return result; } + #endif /* NCURSES_TPARM_VARARGS */ NCURSES_EXPORT(char *) tiparm(const char *string, ...) { + TPARM_DATA myData; va_list ap; - char *result; + char *result = NULL; _nc_tparm_err = 0; - va_start(ap, string); #ifdef TRACE TPS(tname) = "tiparm"; #endif /* TRACE */ - result = tparam_internal(FALSE, string, ap); - va_end(ap); + + if (tparm_setup(string, &myData) == OK) { + + va_start(ap, string); + tparm_copy_valist(&myData, FALSE, ap); + va_end(ap); + + result = tparam_internal(string, &myData); + } + return result; +} + +/* + * The internal-use flavor ensures that the parameters are numbers, not strings + */ +NCURSES_EXPORT(char *) +_nc_tiparm(int expected, const char *string, ...) +{ + TPARM_DATA myData; + va_list ap; + char *result = NULL; + + _nc_tparm_err = 0; +#ifdef TRACE + TPS(tname) = "_nc_tiparm"; +#endif /* TRACE */ + + if (tparm_setup(string, &myData) == OK + && myData.num_actual <= expected + && myData.tparm_type == 0) { + + va_start(ap, string); + tparm_copy_valist(&myData, FALSE, ap); + va_end(ap); + + result = tparam_internal(string, &myData); + } return result; } diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c index 7919a9b0..3089cf0a 100644 --- a/ncurses/tinfo/tinfo_driver.c +++ b/ncurses/tinfo/tinfo_driver.c @@ -52,7 +52,7 @@ # endif #endif -MODULE_ID("$Id: tinfo_driver.c,v 1.67 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: tinfo_driver.c,v 1.69 2020/05/27 23:55:56 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -356,23 +356,23 @@ drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, if (set_a_foreground) { TPUTS_TRACE("set_a_foreground"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_a_foreground, color), 1, outc); + TIPARM_1(set_a_foreground, color), 1, outc); } else { TPUTS_TRACE("set_foreground"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_foreground, - toggled_colors(color)), 1, outc); + TIPARM_1(set_foreground, + toggled_colors(color)), 1, outc); } } else { if (set_a_background) { TPUTS_TRACE("set_a_background"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_a_background, color), 1, outc); + TIPARM_1(set_a_background, color), 1, outc); } else { TPUTS_TRACE("set_background"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_background, - toggled_colors(color)), 1, outc); + TIPARM_1(set_background, + toggled_colors(color)), 1, outc); } } } @@ -764,10 +764,10 @@ drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, int pair, int f, int b) tp[b].red, tp[b].green, tp[b].blue)); NCURSES_PUTP2("initialize_pair", - TPARM_7(initialize_pair, - pair, - tp[f].red, tp[f].green, tp[f].blue, - tp[b].red, tp[b].green, tp[b].blue)); + TIPARM_7(initialize_pair, + pair, + tp[f].red, tp[f].green, tp[f].blue, + tp[b].red, tp[b].green, tp[b].blue)); } } @@ -800,7 +800,7 @@ drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, AssertTCB(); if (initialize_color != NULL) { NCURSES_PUTP2("initialize_color", - TPARM_4(initialize_color, color, r, g, b)); + TIPARM_4(initialize_color, color, r, g, b)); } } @@ -826,7 +826,7 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, if (set_color_pair) { TPUTS_TRACE("set_color_pair"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(set_color_pair, pair), 1, outc); + TIPARM_1(set_color_pair, pair), 1, outc); return; } else if (sp != 0) { _nc_pair_content(SP_PARM, pair, &fg, &bg); diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c index 4d10529c..30c8f75c 100644 --- a/ncurses/tinfo/trim_sgr0.c +++ b/ncurses/tinfo/trim_sgr0.c @@ -37,7 +37,7 @@ #include -MODULE_ID("$Id: trim_sgr0.c,v 1.18 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: trim_sgr0.c,v 1.20 2020/05/27 23:54:31 tom Exp $") #undef CUR #define CUR tp-> @@ -52,7 +52,7 @@ set_attribute_9(TERMTYPE2 *tp, int flag) const char *value; char *result; - value = tparm(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag); + value = TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag); if (PRESENT(value)) result = strdup(value); else diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c index 2c10b51d..28ce5196 100644 --- a/ncurses/trace/lib_trace.c +++ b/ncurses/trace/lib_trace.c @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: lib_trace.c,v 1.95 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_trace.c,v 1.96 2020/05/25 22:48:18 tom Exp $") NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ @@ -349,7 +349,7 @@ _nc_fmt_funcptr(char *target, const char *source, size_t size) if (ch != 0 || (n + 1) >= size) leading = FALSE; if (!leading) { - _nc_SPRINTF(dst, _nc_SLIMIT(TR_FUNC_LEN - (dst - target)) + _nc_SPRINTF(dst, _nc_SLIMIT(TR_FUNC_LEN - (size_t) (dst - target)) "%02x", ch & 0xff); dst += 2; } diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c index 9d1e482b..3f124c96 100644 --- a/ncurses/tty/hashmap.c +++ b/ncurses/tty/hashmap.c @@ -74,7 +74,7 @@ AUTHOR #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: hashmap.c,v 1.68 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: hashmap.c,v 1.69 2020/05/31 17:50:48 tom Exp $") #ifdef HASHDEBUG @@ -88,7 +88,7 @@ MODULE_ID("$Id: hashmap.c,v 1.68 2020/02/02 23:34:34 tom Exp $") # undef screen_lines # define screen_lines(sp) MAXLINES # define TEXTWIDTH(sp) 1 -int oldnums[MAXLINES], reallines[MAXLINES]; +static int oldnums[MAXLINES], reallines[MAXLINES]; static NCURSES_CH_T oldtext[MAXLINES][TEXTWIDTH(sp)]; static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH(sp)]; # define OLDNUM(sp,n) oldnums[n] diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c index 5382b3bf..86e2fb18 100644 --- a/ncurses/tty/lib_mvcur.c +++ b/ncurses/tty/lib_mvcur.c @@ -160,7 +160,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_mvcur.c,v 1.151 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_mvcur.c,v 1.153 2020/05/27 23:56:32 tom Exp $") #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x] /* desired state */ @@ -279,8 +279,8 @@ reset_scroll_region(NCURSES_SP_DCL0) { if (change_scroll_region) { NCURSES_PUTP2("change_scroll_region", - TPARM_2(change_scroll_region, - 0, screen_lines(SP_PARM) - 1)); + TIPARM_2(change_scroll_region, + 0, screen_lines(SP_PARM) - 1)); } } @@ -399,13 +399,13 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0) * All these averages depend on the assumption that all parameter values * are equally probable. */ - SP_PARM->_cup_cost = CostOf(TPARM_2(SP_PARM->_address_cursor, 23, 23), 1); - SP_PARM->_cub_cost = CostOf(TPARM_1(parm_left_cursor, 23), 1); - SP_PARM->_cuf_cost = CostOf(TPARM_1(parm_right_cursor, 23), 1); - SP_PARM->_cud_cost = CostOf(TPARM_1(parm_down_cursor, 23), 1); - SP_PARM->_cuu_cost = CostOf(TPARM_1(parm_up_cursor, 23), 1); - SP_PARM->_hpa_cost = CostOf(TPARM_1(column_address, 23), 1); - SP_PARM->_vpa_cost = CostOf(TPARM_1(row_address, 23), 1); + SP_PARM->_cup_cost = CostOf(TIPARM_2(SP_PARM->_address_cursor, 23, 23), 1); + SP_PARM->_cub_cost = CostOf(TIPARM_1(parm_left_cursor, 23), 1); + SP_PARM->_cuf_cost = CostOf(TIPARM_1(parm_right_cursor, 23), 1); + SP_PARM->_cud_cost = CostOf(TIPARM_1(parm_down_cursor, 23), 1); + SP_PARM->_cuu_cost = CostOf(TIPARM_1(parm_up_cursor, 23), 1); + SP_PARM->_hpa_cost = CostOf(TIPARM_1(column_address, 23), 1); + SP_PARM->_vpa_cost = CostOf(TIPARM_1(row_address, 23), 1); /* non-parameterized screen-update strings */ SP_PARM->_ed_cost = NormalizedCost(clr_eos, 1); @@ -422,17 +422,16 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0) SP_PARM->_el_cost = 0; /* parameterized screen-update strings */ - SP_PARM->_dch_cost = NormalizedCost(TPARM_1(parm_dch, 23), 1); - SP_PARM->_ich_cost = NormalizedCost(TPARM_1(parm_ich, 23), 1); - SP_PARM->_ech_cost = NormalizedCost(TPARM_1(erase_chars, 23), 1); - SP_PARM->_rep_cost = NormalizedCost(TPARM_2(repeat_char, ' ', 23), 1); - - SP_PARM->_cup_ch_cost = NormalizedCost( - TPARM_2(SP_PARM->_address_cursor, - 23, 23), - 1); - SP_PARM->_hpa_ch_cost = NormalizedCost(TPARM_1(column_address, 23), 1); - SP_PARM->_cuf_ch_cost = NormalizedCost(TPARM_1(parm_right_cursor, 23), 1); + SP_PARM->_dch_cost = NormalizedCost(TIPARM_1(parm_dch, 23), 1); + SP_PARM->_ich_cost = NormalizedCost(TIPARM_1(parm_ich, 23), 1); + SP_PARM->_ech_cost = NormalizedCost(TIPARM_1(erase_chars, 23), 1); + SP_PARM->_rep_cost = NormalizedCost(TIPARM_2(repeat_char, ' ', 23), 1); + + SP_PARM->_cup_ch_cost = NormalizedCost(TIPARM_2(SP_PARM->_address_cursor, + 23, 23), + 1); + SP_PARM->_hpa_ch_cost = NormalizedCost(TIPARM_1(column_address, 23), 1); + SP_PARM->_cuf_ch_cost = NormalizedCost(TIPARM_1(parm_right_cursor, 23), 1); SP_PARM->_inline_cost = min(SP_PARM->_cup_ch_cost, min(SP_PARM->_hpa_ch_cost, SP_PARM->_cuf_ch_cost)); @@ -563,7 +562,7 @@ relative_move(NCURSES_SP_DCLx vcost = INFINITY; if (row_address != 0 - && _nc_safe_strcat(target, TPARM_1(row_address, to_y))) { + && _nc_safe_strcat(target, TIPARM_1(row_address, to_y))) { vcost = SP_PARM->_vpa_cost; } @@ -573,7 +572,7 @@ relative_move(NCURSES_SP_DCLx if (parm_down_cursor && SP_PARM->_cud_cost < vcost && _nc_safe_strcat(_nc_str_copy(target, &save), - TPARM_1(parm_down_cursor, n))) { + TIPARM_1(parm_down_cursor, n))) { vcost = SP_PARM->_cud_cost; } @@ -589,7 +588,7 @@ relative_move(NCURSES_SP_DCLx if (parm_up_cursor && SP_PARM->_cuu_cost < vcost && _nc_safe_strcat(_nc_str_copy(target, &save), - TPARM_1(parm_up_cursor, n))) { + TIPARM_1(parm_up_cursor, n))) { vcost = SP_PARM->_cuu_cost; } @@ -613,7 +612,7 @@ relative_move(NCURSES_SP_DCLx if (column_address && _nc_safe_strcat(_nc_str_copy(target, &save), - TPARM_1(column_address, to_x))) { + TIPARM_1(column_address, to_x))) { hcost = SP_PARM->_hpa_cost; } @@ -623,7 +622,7 @@ relative_move(NCURSES_SP_DCLx if (parm_right_cursor && SP_PARM->_cuf_cost < hcost && _nc_safe_strcat(_nc_str_copy(target, &save), - TPARM_1(parm_right_cursor, n))) { + TIPARM_1(parm_right_cursor, n))) { hcost = SP_PARM->_cuf_cost; } @@ -716,7 +715,7 @@ relative_move(NCURSES_SP_DCLx if (parm_left_cursor && SP_PARM->_cub_cost < hcost && _nc_safe_strcat(_nc_str_copy(target, &save), - TPARM_1(parm_left_cursor, n))) { + TIPARM_1(parm_left_cursor, n))) { hcost = SP_PARM->_cub_cost; } @@ -793,7 +792,8 @@ onscreen_mvcur(NCURSES_SP_DCLx #define InitResult _nc_str_init(&result, buffer, sizeof(buffer)) /* tactic #0: use direct cursor addressing */ - if (_nc_safe_strcpy(InitResult, TPARM_2(SP_PARM->_address_cursor, ynew, xnew))) { + if (_nc_safe_strcpy(InitResult, TIPARM_2(SP_PARM->_address_cursor, + ynew, xnew))) { tactic = 0; usecost = SP_PARM->_cup_cost; diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c index c752919b..15e7397d 100644 --- a/ncurses/tty/lib_vidattr.c +++ b/ncurses/tty/lib_vidattr.c @@ -70,7 +70,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_vidattr.c,v 1.76 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_vidattr.c,v 1.78 2020/05/27 23:56:32 tom Exp $") #define doPut(mode) \ TPUTS_TRACE(#mode); \ @@ -258,16 +258,16 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx if (turn_on || turn_off) { TPUTS_TRACE("set_attributes"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - tparm(set_attributes, - (newmode & A_STANDOUT) != 0, - (newmode & A_UNDERLINE) != 0, - (newmode & A_REVERSE) != 0, - (newmode & A_BLINK) != 0, - (newmode & A_DIM) != 0, - (newmode & A_BOLD) != 0, - (newmode & A_INVIS) != 0, - (newmode & A_PROTECT) != 0, - (newmode & A_ALTCHARSET) != 0), + TIPARM_9(set_attributes, + (newmode & A_STANDOUT) != 0, + (newmode & A_UNDERLINE) != 0, + (newmode & A_REVERSE) != 0, + (newmode & A_BLINK) != 0, + (newmode & A_DIM) != 0, + (newmode & A_BOLD) != 0, + (newmode & A_INVIS) != 0, + (newmode & A_PROTECT) != 0, + (newmode & A_ALTCHARSET) != 0), 1, outc); PreviousAttr &= ALL_BUT_COLOR; } diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c index d57f23f1..9691f899 100644 --- a/ncurses/tty/tty_update.c +++ b/ncurses/tty/tty_update.c @@ -85,7 +85,7 @@ #include -MODULE_ID("$Id: tty_update.c,v 1.307 2020/05/23 19:10:35 tom Exp $") +MODULE_ID("$Id: tty_update.c,v 1.309 2020/05/27 23:56:32 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a @@ -170,9 +170,9 @@ position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend) if (y - 1 != expected_y || x - 1 != expected_x) { NCURSES_SP_NAME(beep) (NCURSES_SP_ARG); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - tparm("\033[%d;%dH", - expected_y + 1, - expected_x + 1), + TIPARM_2("\033[%d;%dH", + expected_y + 1, + expected_x + 1), 1, NCURSES_SP_NAME(_nc_outch)); _tracef("position seen (%d, %d) doesn't match expected one (%d, %d) in %s", y - 1, x - 1, expected_y, expected_x, legend); @@ -605,7 +605,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num) && runcount > SP_PARM->_ech_cost + SP_PARM->_cup_ch_cost && can_clear_with(NCURSES_SP_ARGx CHREF(ntext0))) { UpdateAttrs(SP_PARM, ntext0); - NCURSES_PUTP2("erase_chars", TPARM_1(erase_chars, runcount)); + NCURSES_PUTP2("erase_chars", TIPARM_1(erase_chars, runcount)); /* * If this is the last part of the given interval, @@ -648,9 +648,9 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num) AttrOf(ntext0) | A_ALTCHARSET); } NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(repeat_char, - CharOf(temp), - rep_count), + TIPARM_2(repeat_char, + CharOf(temp), + rep_count), 1, NCURSES_SP_NAME(_nc_outch)); SP_PARM->_curscol += rep_count; @@ -1716,7 +1716,7 @@ InsStr(NCURSES_SP_DCLx NCURSES_CH_T *line, int count) if (parm_ich) { TPUTS_TRACE("parm_ich"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(parm_ich, count), + TIPARM_1(parm_ich, count), 1, NCURSES_SP_NAME(_nc_outch)); while (count > 0) { @@ -1769,7 +1769,7 @@ DelChar(NCURSES_SP_DCLx int count) if (parm_dch) { TPUTS_TRACE("parm_dch"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_1(parm_dch, count), + TIPARM_1(parm_dch, count), 1, NCURSES_SP_NAME(_nc_outch)); } else { @@ -1838,7 +1838,7 @@ scroll_csr_forward(NCURSES_SP_DCLx UpdateAttrs(SP_PARM, blank); TPUTS_TRACE("parm_index"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(parm_index, n, 0), + TIPARM_1(parm_index, n), n, NCURSES_SP_NAME(_nc_outch)); } else if (parm_delete_line && bot == maxy) { @@ -1846,7 +1846,7 @@ scroll_csr_forward(NCURSES_SP_DCLx UpdateAttrs(SP_PARM, blank); TPUTS_TRACE("parm_delete_line"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(parm_delete_line, n, 0), + TIPARM_1(parm_delete_line, n), n, NCURSES_SP_NAME(_nc_outch)); } else if (scroll_forward && top == miny && bot == maxy) { @@ -1903,7 +1903,7 @@ scroll_csr_backward(NCURSES_SP_DCLx UpdateAttrs(SP_PARM, blank); TPUTS_TRACE("parm_rindex"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(parm_rindex, n, 0), + TIPARM_1(parm_rindex, n), n, NCURSES_SP_NAME(_nc_outch)); } else if (parm_insert_line && bot == maxy) { @@ -1911,7 +1911,7 @@ scroll_csr_backward(NCURSES_SP_DCLx UpdateAttrs(SP_PARM, blank); TPUTS_TRACE("parm_insert_line"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(parm_insert_line, n, 0), + TIPARM_1(parm_insert_line, n), n, NCURSES_SP_NAME(_nc_outch)); } else if (scroll_reverse && top == miny && bot == maxy) { @@ -1959,7 +1959,7 @@ scroll_idl(NCURSES_SP_DCLx int n, int del, int ins, NCURSES_CH_T blank) } else if (parm_delete_line) { TPUTS_TRACE("parm_delete_line"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(parm_delete_line, n, 0), + TIPARM_1(parm_delete_line, n), n, NCURSES_SP_NAME(_nc_outch)); } else { /* if (delete_line) */ @@ -1975,7 +1975,7 @@ scroll_idl(NCURSES_SP_DCLx int n, int del, int ins, NCURSES_CH_T blank) } else if (parm_insert_line) { TPUTS_TRACE("parm_insert_line"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_2(parm_insert_line, n, 0), + TIPARM_1(parm_insert_line, n), n, NCURSES_SP_NAME(_nc_outch)); } else { /* if (insert_line) */ @@ -2040,7 +2040,7 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx NCURSES_PUTP2("save_cursor", save_cursor); } NCURSES_PUTP2("change_scroll_region", - TPARM_2(change_scroll_region, top, bot)); + TIPARM_2(change_scroll_region, top, bot)); if (cursor_saved) { NCURSES_PUTP2("restore_cursor", restore_cursor); } else { @@ -2050,7 +2050,7 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx res = scroll_csr_forward(NCURSES_SP_ARGx n, top, bot, top, bot, blank); NCURSES_PUTP2("change_scroll_region", - TPARM_2(change_scroll_region, 0, maxy)); + TIPARM_2(change_scroll_region, 0, maxy)); SP_PARM->_cursrow = SP_PARM->_curscol = -1; } @@ -2086,7 +2086,7 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx NCURSES_PUTP2("save_cursor", save_cursor); } NCURSES_PUTP2("change_scroll_region", - TPARM_2(change_scroll_region, top, bot)); + TIPARM_2(change_scroll_region, top, bot)); if (cursor_saved) { NCURSES_PUTP2("restore_cursor", restore_cursor); } else { @@ -2097,7 +2097,7 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx -n, top, bot, top, bot, blank); NCURSES_PUTP2("change_scroll_region", - TPARM_2(change_scroll_region, 0, maxy)); + TIPARM_2(change_scroll_region, 0, maxy)); SP_PARM->_cursrow = SP_PARM->_curscol = -1; } diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c index e167bebe..2d9531f1 100644 --- a/ncurses/widechar/lib_vid_attr.c +++ b/ncurses/widechar/lib_vid_attr.c @@ -37,7 +37,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_vid_attr.c,v 1.28 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_vid_attr.c,v 1.30 2020/05/27 23:54:31 tom Exp $") #define doPut(mode) \ TPUTS_TRACE(#mode); \ @@ -191,16 +191,16 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx if (turn_on || turn_off) { TPUTS_TRACE("set_attributes"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx - TPARM_9(set_attributes, - (newmode & A_STANDOUT) != 0, - (newmode & A_UNDERLINE) != 0, - (newmode & A_REVERSE) != 0, - (newmode & A_BLINK) != 0, - (newmode & A_DIM) != 0, - (newmode & A_BOLD) != 0, - (newmode & A_INVIS) != 0, - (newmode & A_PROTECT) != 0, - (newmode & A_ALTCHARSET) != 0), + TIPARM_9(set_attributes, + (newmode & A_STANDOUT) != 0, + (newmode & A_UNDERLINE) != 0, + (newmode & A_REVERSE) != 0, + (newmode & A_BLINK) != 0, + (newmode & A_DIM) != 0, + (newmode & A_BOLD) != 0, + (newmode & A_INVIS) != 0, + (newmode & A_PROTECT) != 0, + (newmode & A_ALTCHARSET) != 0), 1, outc); previous_attr &= ALL_BUT_COLOR; previous_pair = 0; @@ -264,7 +264,6 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx TurnOn(A_VERTICAL, enter_vertical_hl_mode); #endif /* *INDENT-ON* */ - } if (reverse) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 9e844799..7a9d961d 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200523) unstable; urgency=low +ncurses6 (6.2+20200531) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 23 May 2020 05:35:39 -0400 + -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 9e844799..7a9d961d 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200523) unstable; urgency=low +ncurses6 (6.2+20200531) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 23 May 2020 05:35:39 -0400 + -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 47a55f77..843c49b8 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200523) unstable; urgency=low +ncurses6 (6.2+20200531) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 23 May 2020 05:35:39 -0400 + -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 634b0df5..ce1de07c 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.395 2020/05/23 09:35:39 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.398 2020/05/31 18:56:59 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "2" !define VERSION_YYYY "2020" -!define VERSION_MMDD "0523" +!define VERSION_MMDD "0531" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 40522dd5..cefaa9b4 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.2 -Release: 20200523 +Release: 20200531 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.map b/package/ncurses.map index 1c400dee..0b2a1ab2 100644 --- a/package/ncurses.map +++ b/package/ncurses.map @@ -1,4 +1,4 @@ -# $Id: ncurses.map,v 1.51 2020/02/04 11:44:12 tom Exp $ +# $Id: ncurses.map,v 1.52 2020/05/27 19:26:59 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -1206,6 +1206,11 @@ NCURSES_TINFO_6.2.20200212 { _nc_wacs_width; curses_trace; exit_terminfo; +} NCURSES_TINFO_6.1.20171230; + +NCURSES_TINFO_6.2.current { + global: + _nc_tiparm; local: _*; -} NCURSES_TINFO_6.1.20171230; +} NCURSES_TINFO_6.2.20200212; diff --git a/package/ncurses.spec b/package/ncurses.spec index 9aaac6c7..32bc053c 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.2 -Release: 20200523 +Release: 20200531 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.map b/package/ncursest.map index 643dc8e1..ed8f4e19 100644 --- a/package/ncursest.map +++ b/package/ncursest.map @@ -1,4 +1,4 @@ -# $Id: ncursest.map,v 1.49 2020/02/04 11:44:12 tom Exp $ +# $Id: ncursest.map,v 1.50 2020/05/27 19:29:10 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -485,9 +485,14 @@ NCURSES_TINFO_6.2.20200212 { _nc_wacs_width; curses_trace; exit_terminfo; +} NCURSES_TINFO_6.1.20171230; + +NCURSES_TINFO_6.2.current { + global: + _nc_tiparm; local: _*; -} NCURSES_TINFO_6.1.20171230; +} NCURSES_TINFO_6.2.20200212; NCURSEST_5.7.20081102 { global: diff --git a/package/ncursest.spec b/package/ncursest.spec index 710d6e5b..b3c4bff1 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.2 -Release: 20200523 +Release: 20200531 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursestw.map b/package/ncursestw.map index 0c932b93..ff857389 100644 --- a/package/ncursestw.map +++ b/package/ncursestw.map @@ -1,4 +1,4 @@ -# $Id: ncursestw.map,v 1.51 2020/02/04 11:44:12 tom Exp $ +# $Id: ncursestw.map,v 1.52 2020/05/27 19:29:32 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -491,9 +491,14 @@ NCURSES_TINFO_6.2.20200212 { _nc_wacs_width; curses_trace; exit_terminfo; +} NCURSES_TINFO_6.1.20171230; + +NCURSES_TINFO_6.2.current { + global: + _nc_tiparm; local: _*; -} NCURSES_TINFO_6.1.20171230; +} NCURSES_TINFO_6.2.20200212; NCURSESTW_5.7.20081102 { global: diff --git a/package/ncursesw.map b/package/ncursesw.map index da68b73c..021cd577 100644 --- a/package/ncursesw.map +++ b/package/ncursesw.map @@ -1,4 +1,4 @@ -# $Id: ncursesw.map,v 1.54 2020/02/04 11:44:12 tom Exp $ +# $Id: ncursesw.map,v 1.55 2020/05/27 19:27:45 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -485,9 +485,14 @@ NCURSES_TINFO_6.2.20200212 { _nc_wacs_width; curses_trace; exit_terminfo; +} NCURSES_TINFO_6.1.20171230; + +NCURSES_TINFO_6.2.current { + global: + _nc_tiparm; local: _*; -} NCURSES_TINFO_6.1.20171230; +} NCURSES_TINFO_6.2.20200212; NCURSESW_5.1.20000708 { global: diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c index 9d23cd05..2e118ae5 100644 --- a/progs/reset_cmd.c +++ b/progs/reset_cmd.c @@ -53,7 +53,7 @@ #include #endif -MODULE_ID("$Id: reset_cmd.c,v 1.19 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: reset_cmd.c,v 1.21 2020/05/27 23:46:20 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -501,16 +501,15 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) } else #if defined(set_lr_margin) if (VALID_STRING(set_lr_margin)) { - need_flush |= sent_string(TPARM_2(set_lr_margin, 0, - columns - 1)); + need_flush |= sent_string(TIPARM_2(set_lr_margin, 0, columns - 1)); } else #endif #if defined(set_left_margin_parm) && defined(set_right_margin_parm) if (VALID_STRING(set_left_margin_parm) && VALID_STRING(set_right_margin_parm)) { - need_flush |= sent_string(TPARM_1(set_left_margin_parm, 0)); - need_flush |= sent_string(TPARM_1(set_right_margin_parm, - columns - 1)); + need_flush |= sent_string(TIPARM_1(set_left_margin_parm, 0)); + need_flush |= sent_string(TIPARM_1(set_right_margin_parm, + columns - 1)); } else #endif if (VALID_STRING(set_left_margin) @@ -518,8 +517,8 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) need_flush |= to_left_margin(); need_flush |= sent_string(set_left_margin); if (VALID_STRING(parm_right_cursor)) { - need_flush |= sent_string(TPARM_1(parm_right_cursor, - columns - 1)); + need_flush |= sent_string(TIPARM_1(parm_right_cursor, + columns - 1)); } else { for (i = 0; i < columns - 1; i++) { out_char(' '); diff --git a/progs/tabs.c b/progs/tabs.c index 8a3bc108..0539e856 100644 --- a/progs/tabs.c +++ b/progs/tabs.c @@ -39,7 +39,7 @@ #include #include -MODULE_ID("$Id: tabs.c,v 1.42 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: tabs.c,v 1.45 2020/05/27 23:47:22 tom Exp $") static void usage(void) GCC_NORETURN; @@ -75,7 +75,7 @@ do_tabs(int *tab_list) } } if (stop <= max_cols) { - tputs(tparm(set_tab, stop), 1, putch); + tputs(TIPARM_1(set_tab, stop), 1, putch); last = stop; } else { break; diff --git a/progs/tic.c b/progs/tic.c index 328bcd6b..ae172ece 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -49,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.282 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.286 2020/05/31 21:05:44 tom Exp $") #define STDIN_NAME "" @@ -1179,6 +1179,14 @@ check_acs(TERMTYPE2 *tp) } } +static char * +safe_strdup(const char *value) +{ + if (value == NULL) + value = ""; + return strdup(value); +} + static bool same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit) { @@ -1189,8 +1197,8 @@ same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit) int n; int same; for (n = same = 0; n < limit; ++n) { - char *oldvalue = strdup(TPARM_1(oldcap, n)); - char *newvalue = strdup(TPARM_1(newcap, n)); + char *oldvalue = safe_strdup(TIPARM_1(oldcap, n)); + char *newvalue = safe_strdup(TIPARM_1(newcap, n)); same += !strcmp(oldvalue, newvalue); free(oldvalue); free(newvalue); @@ -1835,7 +1843,6 @@ expected_params(const char *name) DATA( "wingo", 1 ), }; /* *INDENT-ON* */ - #undef DATA unsigned n; @@ -1910,7 +1917,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) int expected = expected_params(name); int actual = 0; int n; - bool params[NUM_PARM]; + bool params[1 + NUM_PARM]; char *s = value; #ifdef set_top_margin_parm @@ -1919,7 +1926,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended) expected = 2; #endif - for (n = 0; n < NUM_PARM; n++) + for (n = 0; n <= NUM_PARM; n++) params[n] = FALSE; while (*s != 0) { @@ -2192,6 +2199,19 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count) result = TPARM_3(value, numbers[1], strings[2], strings[3]); break; case Numbers: +#define myParam(n) numbers[n] + result = TIPARM_9(value, + myParam(1), + myParam(2), + myParam(3), + myParam(4), + myParam(5), + myParam(6), + myParam(7), + myParam(8), + myParam(9)); +#undef myParam + break; default: (void) _nc_tparm_analyze(value, p_is_s, &ignored); #define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) @@ -2205,6 +2225,7 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count) myParam(7), myParam(8), myParam(9)); +#undef myParam break; } return strdup(result); @@ -2515,16 +2536,16 @@ check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name) char *test; _nc_tparm_err = 0; - test = TPARM_9(set_attributes, - num == 1, - num == 2, - num == 3, - num == 4, - num == 5, - num == 6, - num == 7, - num == 8, - num == 9); + test = TIPARM_9(set_attributes, + num == 1, + num == 2, + num == 3, + num == 4, + num == 5, + num == 6, + num == 7, + num == 8, + num == 9); if (test != 0) { if (PRESENT(cap)) { if (!similar_sgr(num, test, cap)) { @@ -2695,7 +2716,6 @@ check_conflict(TERMTYPE2 *tp) { NULL, NULL }, }; /* *INDENT-ON* */ - /* * SVr4 curses defines the "xcurses" names listed above except for * the special cases in the "shifted" column. When using these @@ -2973,7 +2993,7 @@ check_termtype(TERMTYPE2 *tp, bool literal) if (PRESENT(exit_attribute_mode)) { zero = strdup(CHECK_SGR(0, exit_attribute_mode)); } else { - zero = strdup(TPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, 0)); + zero = strdup(TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } if (_nc_tparm_err) _nc_warning("stack error in sgr(0) string"); diff --git a/progs/tput.c b/progs/tput.c index 295b83fb..4bb77147 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -51,7 +51,7 @@ #include #include -MODULE_ID("$Id: tput.c,v 1.81 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.83 2020/05/27 23:47:51 tom Exp $") #define PUTS(s) fputs(s, stdout) @@ -63,7 +63,7 @@ static bool is_reset = FALSE; static bool is_clear = FALSE; static void -quit(int status, const char *fmt,...) +quit(int status, const char *fmt, ...) { va_list argp; @@ -251,6 +251,19 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[]) s = TPARM_3(s, numbers[1], strings[2], strings[3]); break; case Numbers: +#define myParam(n) numbers[n] + s = TIPARM_9(s, + myParam(1), + myParam(2), + myParam(3), + myParam(4), + myParam(5), + myParam(6), + myParam(7), + myParam(8), + myParam(9)); +#undef myParam + break; default: (void) _nc_tparm_analyze(s, p_is_s, &ignored); #define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) @@ -264,6 +277,7 @@ tput_cmd(int fd, TTY * saved_settings, bool opt_x, int argc, char *argv[]) myParam(7), myParam(8), myParam(9)); +#undef myParam break; } } diff --git a/test/configure b/test/configure index 6a19a63b..41cd8efd 100755 --- a/test/configure +++ b/test/configure @@ -17576,18 +17576,19 @@ fi for ac_func in \ getopt \ gettimeofday \ +snprintf \ strstr \ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17584: checking for $ac_func" >&5 +echo "$as_me:17585: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17590 "configure" +#line 17591 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17618,16 +17619,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17621: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17622: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17624: \$? = $ac_status" >&5 + echo "$as_me:17625: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17627: \"$ac_try\"") >&5 + { (eval echo "$as_me:17628: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17630: \$? = $ac_status" >&5 + echo "$as_me:17631: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17637,7 +17638,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17640: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17641: result: `eval echo '${'$as_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:17652: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17658 "configure" +#line 17659 "configure" #include "confdefs.h" #include @@ -17676,16 +17677,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17679: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17680: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17682: \$? = $ac_status" >&5 + echo "$as_me:17683: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17685: \"$ac_try\"") >&5 + { (eval echo "$as_me:17686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17688: \$? = $ac_status" >&5 + echo "$as_me:17689: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_termcap_h=yes else @@ -17695,7 +17696,7 @@ cf_cv_have_termcap_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17698: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:17699: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -17705,14 +17706,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:17708: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:17709: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17715 "configure" +#line 17716 "configure" #include "confdefs.h" #include @@ -17733,16 +17734,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17736: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17737: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17739: \$? = $ac_status" >&5 + echo "$as_me:17740: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17742: \"$ac_try\"") >&5 + { (eval echo "$as_me:17743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17745: \$? = $ac_status" >&5 + echo "$as_me:17746: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_ncurses_termcap_h=yes else @@ -17752,7 +17753,7 @@ cf_cv_have_ncurses_termcap_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17755: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:17756: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -17762,7 +17763,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:17765: error: getopt is required for building programs" >&5 + { { echo "$as_me:17766: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -17781,13 +17782,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17784: checking for $ac_func" >&5 +echo "$as_me:17785: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17790 "configure" +#line 17791 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17818,16 +17819,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17821: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17822: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17824: \$? = $ac_status" >&5 + echo "$as_me:17825: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17827: \"$ac_try\"") >&5 + { (eval echo "$as_me:17828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17830: \$? = $ac_status" >&5 + echo "$as_me:17831: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17837,7 +17838,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17840: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17841: result: `eval echo '${'$as_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:17853: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17857,7 +17858,7 @@ else cf_cv_need_xopen_extension=unknown cat >conftest.$ac_ext <<_ACEOF -#line 17860 "configure" +#line 17861 "configure" #include "confdefs.h" #include @@ -17890,16 +17891,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17893: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17894: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17896: \$? = $ac_status" >&5 + echo "$as_me:17897: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17899: \"$ac_try\"") >&5 + { (eval echo "$as_me:17900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17902: \$? = $ac_status" >&5 + echo "$as_me:17903: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=none else @@ -17909,7 +17910,7 @@ cat conftest.$ac_ext >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >conftest.$ac_ext <<_ACEOF -#line 17912 "configure" +#line 17913 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -17938,16 +17939,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17941: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17942: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17944: \$? = $ac_status" >&5 + echo "$as_me:17945: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17947: \"$ac_try\"") >&5 + { (eval echo "$as_me:17948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17950: \$? = $ac_status" >&5 + echo "$as_me:17951: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -17961,7 +17962,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17964: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:17965: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case $cf_cv_need_xopen_extension in @@ -17973,7 +17974,7 @@ case $cf_cv_need_xopen_extension in ;; esac -echo "$as_me:17976: checking for term.h" >&5 +echo "$as_me:17977: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17994,7 +17995,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 17997 "configure" +#line 17998 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18008,16 +18009,16 @@ WINDOW *x; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18012: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18014: \$? = $ac_status" >&5 + echo "$as_me:18015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18017: \"$ac_try\"") >&5 + { (eval echo "$as_me:18018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18020: \$? = $ac_status" >&5 + echo "$as_me:18021: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -18036,7 +18037,7 @@ case $cf_cv_term_header in for cf_header in ncurses/term.h ncursesw/term.h do cat >conftest.$ac_ext <<_ACEOF -#line 18039 "configure" +#line 18040 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18054,16 +18055,16 @@ WINDOW *x; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18057: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18058: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18060: \$? = $ac_status" >&5 + echo "$as_me:18061: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18063: \"$ac_try\"") >&5 + { (eval echo "$as_me:18064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18066: \$? = $ac_status" >&5 + echo "$as_me:18067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -18078,7 +18079,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext esac fi -echo "$as_me:18081: result: $cf_cv_term_header" >&5 +echo "$as_me:18082: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in @@ -18105,7 +18106,7 @@ EOF ;; esac -echo "$as_me:18108: checking for unctrl.h" >&5 +echo "$as_me:18109: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18126,7 +18127,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 18129 "configure" +#line 18130 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18140,16 +18141,16 @@ WINDOW *x; (void)x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18143: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18146: \$? = $ac_status" >&5 + echo "$as_me:18147: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18149: \"$ac_try\"") >&5 + { (eval echo "$as_me:18150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18152: \$? = $ac_status" >&5 + echo "$as_me:18153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unctrl_header=$cf_header break @@ -18162,12 +18163,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:18165: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:18166: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case $cf_cv_unctrl_header in (no) - { echo "$as_me:18170: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:18171: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -18256,10 +18257,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:18259: checking for ${cf_func}" >&5 + echo "$as_me:18260: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:18262: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:18263: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18268,7 +18269,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 18271 "configure" +#line 18272 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18301,16 +18302,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18304: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18305: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18307: \$? = $ac_status" >&5 + echo "$as_me:18308: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18310: \"$ac_try\"") >&5 + { (eval echo "$as_me:18311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18313: \$? = $ac_status" >&5 + echo "$as_me:18314: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -18326,7 +18327,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:18329: result: $cf_result" >&5 + echo "$as_me:18330: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <&5 + echo "$as_me:18345: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:18347: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:18348: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18353,7 +18354,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 18356 "configure" +#line 18357 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18386,16 +18387,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18389: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18392: \$? = $ac_status" >&5 + echo "$as_me:18393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18395: \"$ac_try\"") >&5 + { (eval echo "$as_me:18396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18398: \$? = $ac_status" >&5 + echo "$as_me:18399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -18411,7 +18412,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:18414: result: $cf_result" >&5 + echo "$as_me:18415: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 18438 "configure" +#line 18439 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18455,21 +18456,21 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18458: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18459: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18461: \$? = $ac_status" >&5 + echo "$as_me:18462: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18464: \"$ac_try\"") >&5 + { (eval echo "$as_me:18465: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18467: \$? = $ac_status" >&5 + echo "$as_me:18468: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:18472: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:18473: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:18493: 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 18499 "configure" +#line 18500 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18511,16 +18512,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18514: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18515: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18517: \$? = $ac_status" >&5 + echo "$as_me:18518: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18520: \"$ac_try\"") >&5 + { (eval echo "$as_me:18521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18523: \$? = $ac_status" >&5 + echo "$as_me:18524: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -18528,7 +18529,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18531 "configure" +#line 18532 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18553,16 +18554,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18556: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18557: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18559: \$? = $ac_status" >&5 + echo "$as_me:18560: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18562: \"$ac_try\"") >&5 + { (eval echo "$as_me:18563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18565: \$? = $ac_status" >&5 + echo "$as_me:18566: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -18576,7 +18577,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18579: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:18580: 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 @@ -18590,11 +18591,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:18593: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:18594: 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 18597 "configure" +#line 18598 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18607,16 +18608,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18610: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18611: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18613: \$? = $ac_status" >&5 + echo "$as_me:18614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18616: \"$ac_try\"") >&5 + { (eval echo "$as_me:18617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18619: \$? = $ac_status" >&5 + echo "$as_me:18620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -18625,7 +18626,7 @@ cat conftest.$ac_ext >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >conftest.$ac_ext <<_ACEOF -#line 18628 "configure" +#line 18629 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18638,16 +18639,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18641: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18642: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18644: \$? = $ac_status" >&5 + echo "$as_me:18645: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18647: \"$ac_try\"") >&5 + { (eval echo "$as_me:18648: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18650: \$? = $ac_status" >&5 + echo "$as_me:18651: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_define_xpg5=yes else @@ -18658,7 +18659,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:18661: result: $cf_define_xpg5" >&5 + echo "$as_me:18662: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -18667,14 +18668,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:18670: checking for wide-character functions" >&5 + echo "$as_me:18671: 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 18677 "configure" +#line 18678 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18691,16 +18692,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18694: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18695: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18697: \$? = $ac_status" >&5 + echo "$as_me:18698: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18700: \"$ac_try\"") >&5 + { (eval echo "$as_me:18701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18703: \$? = $ac_status" >&5 + echo "$as_me:18704: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widechar_funcs=yes else @@ -18711,7 +18712,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18714: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:18715: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -18732,14 +18733,14 @@ EOF fi -echo "$as_me:18735: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:18736: 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 18742 "configure" +#line 18743 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18757,16 +18758,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18760: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18761: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18763: \$? = $ac_status" >&5 + echo "$as_me:18764: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18766: \"$ac_try\"") >&5 + { (eval echo "$as_me:18767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18769: \$? = $ac_status" >&5 + echo "$as_me:18770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_use_pthreads=yes else @@ -18777,21 +18778,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18780: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:18781: 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:18787: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:18788: 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 18794 "configure" +#line 18795 "configure" #include "confdefs.h" #include @@ -18811,16 +18812,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18814: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18815: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18817: \$? = $ac_status" >&5 + echo "$as_me:18818: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18820: \"$ac_try\"") >&5 + { (eval echo "$as_me:18821: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18823: \$? = $ac_status" >&5 + echo "$as_me:18824: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -18832,7 +18833,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18835: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:18836: 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 @@ -18841,7 +18842,7 @@ EOF # special check for test/ditto.c -echo "$as_me:18844: checking for openpty in -lutil" >&5 +echo "$as_me:18845: 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 @@ -18849,7 +18850,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18852 "configure" +#line 18853 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18868,16 +18869,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18871: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18874: \$? = $ac_status" >&5 + echo "$as_me:18875: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18877: \"$ac_try\"") >&5 + { (eval echo "$as_me:18878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18880: \$? = $ac_status" >&5 + echo "$as_me:18881: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -18888,7 +18889,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18891: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:18892: 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 @@ -18896,7 +18897,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:18899: checking for openpty header" >&5 +echo "$as_me:18900: 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 @@ -18923,7 +18924,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 18926 "configure" +#line 18927 "configure" #include "confdefs.h" #include <$cf_header> @@ -18940,16 +18941,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18943: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18944: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18946: \$? = $ac_status" >&5 + echo "$as_me:18947: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18949: \"$ac_try\"") >&5 + { (eval echo "$as_me:18950: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18952: \$? = $ac_status" >&5 + echo "$as_me:18953: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -18967,7 +18968,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:18970: result: $cf_cv_func_openpty" >&5 +echo "$as_me:18971: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19001,7 +19002,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:19004: checking for function curses_version" >&5 +echo "$as_me:19005: 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 @@ -19011,7 +19012,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19014 "configure" +#line 19015 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19024,15 +19025,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19028: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19030: \$? = $ac_status" >&5 + echo "$as_me:19031: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19032: \"$ac_try\"") >&5 + { (eval echo "$as_me:19033: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19035: \$? = $ac_status" >&5 + echo "$as_me:19036: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_curses_version=yes @@ -19047,14 +19048,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core fi -echo "$as_me:19050: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:19051: 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:19057: checking for alternate character set array" >&5 +echo "$as_me:19058: 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 @@ -19064,7 +19065,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 19067 "configure" +#line 19068 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19080,16 +19081,16 @@ $name['k'] = ACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19083: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19084: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19086: \$? = $ac_status" >&5 + echo "$as_me:19087: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19089: \"$ac_try\"") >&5 + { (eval echo "$as_me:19090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19092: \$? = $ac_status" >&5 + echo "$as_me:19093: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_acs_map=$name; break else @@ -19100,7 +19101,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:19103: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:19104: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -19110,7 +19111,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:19113: checking for wide alternate character set array" >&5 +echo "$as_me:19114: 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 @@ -19120,7 +19121,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 19123 "configure" +#line 19124 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19136,16 +19137,16 @@ void *foo = &($name['k']); (void)foo } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19139: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19140: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19142: \$? = $ac_status" >&5 + echo "$as_me:19143: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19145: \"$ac_try\"") >&5 + { (eval echo "$as_me:19146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19148: \$? = $ac_status" >&5 + echo "$as_me:19149: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -19156,7 +19157,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:19159: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:19160: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -19164,7 +19165,7 @@ cat >>confdefs.h <&5 +echo "$as_me:19168: 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 @@ -19174,7 +19175,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 19177 "configure" +#line 19178 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19191,16 +19192,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19194: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19195: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19197: \$? = $ac_status" >&5 + echo "$as_me:19198: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19200: \"$ac_try\"") >&5 + { (eval echo "$as_me:19201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19203: \$? = $ac_status" >&5 + echo "$as_me:19204: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -19210,7 +19211,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 19213 "configure" +#line 19214 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19226,16 +19227,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19229: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19232: \$? = $ac_status" >&5 + echo "$as_me:19233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19235: \"$ac_try\"") >&5 + { (eval echo "$as_me:19236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19238: \$? = $ac_status" >&5 + echo "$as_me:19239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -19246,7 +19247,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:19249: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:19250: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -19256,10 +19257,10 @@ EOF fi -echo "$as_me:19259: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19260: 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 19262 "configure" +#line 19263 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19277,16 +19278,16 @@ attr_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19283: \$? = $ac_status" >&5 + echo "$as_me:19284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19286: \"$ac_try\"") >&5 + { (eval echo "$as_me:19287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19289: \$? = $ac_status" >&5 + echo "$as_me:19290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -19295,7 +19296,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19298: result: $cf_result" >&5 +echo "$as_me:19299: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -19316,14 +19317,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:19319: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:19320: 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 19326 "configure" +#line 19327 "configure" #include "confdefs.h" #include @@ -19341,23 +19342,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19344: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19345: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19347: \$? = $ac_status" >&5 + echo "$as_me:19348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19350: \"$ac_try\"") >&5 + { (eval echo "$as_me:19351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19353: \$? = $ac_status" >&5 + echo "$as_me:19354: \$? = $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 19360 "configure" +#line 19361 "configure" #include "confdefs.h" #include @@ -19376,16 +19377,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19379: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19380: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19382: \$? = $ac_status" >&5 + echo "$as_me:19383: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19385: \"$ac_try\"") >&5 + { (eval echo "$as_me:19386: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19388: \$? = $ac_status" >&5 + echo "$as_me:19389: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -19397,7 +19398,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19400: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:19401: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -19420,14 +19421,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:19423: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:19424: 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 19430 "configure" +#line 19431 "configure" #include "confdefs.h" #include @@ -19445,23 +19446,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19448: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19449: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19451: \$? = $ac_status" >&5 + echo "$as_me:19452: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19454: \"$ac_try\"") >&5 + { (eval echo "$as_me:19455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19457: \$? = $ac_status" >&5 + echo "$as_me:19458: \$? = $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 19464 "configure" +#line 19465 "configure" #include "confdefs.h" #include @@ -19480,16 +19481,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19483: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19484: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19486: \$? = $ac_status" >&5 + echo "$as_me:19487: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19489: \"$ac_try\"") >&5 + { (eval echo "$as_me:19490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19492: \$? = $ac_status" >&5 + echo "$as_me:19493: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -19501,7 +19502,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19504: result: $cf_cv_wchar_t" >&5 +echo "$as_me:19505: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -19524,14 +19525,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:19527: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:19528: 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 19534 "configure" +#line 19535 "configure" #include "confdefs.h" #include @@ -19549,23 +19550,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19552: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19553: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19555: \$? = $ac_status" >&5 + echo "$as_me:19556: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19558: \"$ac_try\"") >&5 + { (eval echo "$as_me:19559: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19561: \$? = $ac_status" >&5 + echo "$as_me:19562: \$? = $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 19568 "configure" +#line 19569 "configure" #include "confdefs.h" #include @@ -19584,16 +19585,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19587: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19588: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19590: \$? = $ac_status" >&5 + echo "$as_me:19591: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19593: \"$ac_try\"") >&5 + { (eval echo "$as_me:19594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19596: \$? = $ac_status" >&5 + echo "$as_me:19597: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -19605,7 +19606,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19608: result: $cf_cv_wint_t" >&5 +echo "$as_me:19609: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -19629,10 +19630,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:19632: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19633: 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 19635 "configure" +#line 19636 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19650,16 +19651,16 @@ mbstate_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19653: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19654: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19656: \$? = $ac_status" >&5 + echo "$as_me:19657: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19659: \"$ac_try\"") >&5 + { (eval echo "$as_me:19660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19662: \$? = $ac_status" >&5 + echo "$as_me:19663: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -19668,7 +19669,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19671: result: $cf_result" >&5 +echo "$as_me:19672: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -19690,10 +19691,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:19693: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19694: 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 19696 "configure" +#line 19697 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19711,16 +19712,16 @@ wchar_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19715: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19717: \$? = $ac_status" >&5 + echo "$as_me:19718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19720: \"$ac_try\"") >&5 + { (eval echo "$as_me:19721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19723: \$? = $ac_status" >&5 + echo "$as_me:19724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -19729,7 +19730,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19732: result: $cf_result" >&5 +echo "$as_me:19733: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -19751,10 +19752,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:19754: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19755: 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 19757 "configure" +#line 19758 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19772,16 +19773,16 @@ wint_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19775: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19776: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19778: \$? = $ac_status" >&5 + echo "$as_me:19779: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19781: \"$ac_try\"") >&5 + { (eval echo "$as_me:19782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19784: \$? = $ac_status" >&5 + echo "$as_me:19785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -19790,7 +19791,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19793: result: $cf_result" >&5 +echo "$as_me:19794: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -19819,11 +19820,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:19822: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19823: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 19826 "configure" +#line 19827 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19856,16 +19857,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19859: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19860: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19862: \$? = $ac_status" >&5 + echo "$as_me:19863: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19865: \"$ac_try\"") >&5 + { (eval echo "$as_me:19866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19868: \$? = $ac_status" >&5 + echo "$as_me:19869: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -19875,7 +19876,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19878: result: $cf_result" >&5 +echo "$as_me:19879: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -19887,14 +19888,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:19890: checking for data $cf_data in library" >&5 + echo "$as_me:19891: checking for data $cf_data in library" >&5 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 19897 "configure" +#line 19898 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19933,16 +19934,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19936: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19939: \$? = $ac_status" >&5 + echo "$as_me:19940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19942: \"$ac_try\"") >&5 + { (eval echo "$as_me:19943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19945: \$? = $ac_status" >&5 + echo "$as_me:19946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -19954,7 +19955,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 19957 "configure" +#line 19958 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19986,15 +19987,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19989: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19990: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19992: \$? = $ac_status" >&5 + echo "$as_me:19993: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19994: \"$ac_try\"") >&5 + { (eval echo "$as_me:19995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19997: \$? = $ac_status" >&5 + echo "$as_me:19998: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -20006,7 +20007,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:20009: result: $cf_result" >&5 + echo "$as_me:20010: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -20023,7 +20024,7 @@ done if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:20026: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:20027: 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. @@ -20040,7 +20041,7 @@ else with_warnings=no fi; -echo "$as_me:20043: result: $with_warnings" >&5 +echo "$as_me:20044: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -20063,10 +20064,10 @@ cat > conftest.i <&5 + { echo "$as_me:20067: 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:20119: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20121: \$? = $ac_status" >&5 + echo "$as_me:20122: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:20123: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:20124: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -20198,7 +20199,7 @@ do done cat >conftest.$ac_ext <<_ACEOF -#line 20201 "configure" +#line 20202 "configure" #include "confdefs.h" #include @@ -20213,26 +20214,26 @@ String foo = malloc(1); (void)foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20216: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20217: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20219: \$? = $ac_status" >&5 + echo "$as_me:20220: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20222: \"$ac_try\"") >&5 + { (eval echo "$as_me:20223: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20225: \$? = $ac_status" >&5 + echo "$as_me:20226: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -echo "$as_me:20228: checking for X11/Xt const-feature" >&5 +echo "$as_me:20229: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20235 "configure" +#line 20236 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -20249,16 +20250,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20252: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20253: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20255: \$? = $ac_status" >&5 + echo "$as_me:20256: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20258: \"$ac_try\"") >&5 + { (eval echo "$as_me:20259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20261: \$? = $ac_status" >&5 + echo "$as_me:20262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_const_x_string=no @@ -20273,7 +20274,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20276: result: $cf_cv_const_x_string" >&5 +echo "$as_me:20277: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -20302,7 +20303,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi cat > conftest.$ac_ext <&5 + { echo "$as_me:20322: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -20334,12 +20335,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:20337: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:20338: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20340: \$? = $ac_status" >&5 + echo "$as_me:20341: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:20342: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:20343: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -20347,7 +20348,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:20350: checking for $CC warning options..." >&5 + { echo "$as_me:20351: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -20371,12 +20372,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:20374: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:20375: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20377: \$? = $ac_status" >&5 + echo "$as_me:20378: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:20379: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:20380: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Winline) @@ -20384,7 +20385,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}:20387: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:20388: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -20394,7 +20395,7 @@ echo "${as_me:-configure}:20387: 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}:20397: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:20398: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -20410,7 +20411,7 @@ rm -rf conftest* fi fi -echo "$as_me:20413: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:20414: 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. @@ -20427,7 +20428,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:20430: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:20431: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -20541,23 +20542,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:20544: checking for dmalloc.h" >&5 + echo "$as_me:20545: 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 20550 "configure" +#line 20551 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20554: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20555: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20560: \$? = $ac_status" >&5 + echo "$as_me:20561: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20576,11 +20577,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20579: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:20580: 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:20583: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:20584: 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 @@ -20588,7 +20589,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 20591 "configure" +#line 20592 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20607,16 +20608,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20610: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20613: \$? = $ac_status" >&5 + echo "$as_me:20614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20616: \"$ac_try\"") >&5 + { (eval echo "$as_me:20617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20619: \$? = $ac_status" >&5 + echo "$as_me:20620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -20627,7 +20628,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20630: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:20631: 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:20646: 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. @@ -20659,7 +20660,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:20662: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:20663: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -20773,23 +20774,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:20776: checking for dbmalloc.h" >&5 + echo "$as_me:20777: 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 20782 "configure" +#line 20783 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20786: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20787: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20792: \$? = $ac_status" >&5 + echo "$as_me:20793: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20808,11 +20809,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20811: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:20812: 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:20815: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:20816: 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 @@ -20820,7 +20821,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 20823 "configure" +#line 20824 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20839,16 +20840,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20843: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20845: \$? = $ac_status" >&5 + echo "$as_me:20846: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20848: \"$ac_try\"") >&5 + { (eval echo "$as_me:20849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20851: \$? = $ac_status" >&5 + echo "$as_me:20852: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -20859,7 +20860,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20862: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:20863: 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:20878: 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. @@ -20891,7 +20892,7 @@ EOF else with_valgrind= fi; -echo "$as_me:20894: result: ${with_valgrind:-no}" >&5 +echo "$as_me:20895: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -21004,7 +21005,7 @@ fi ;; esac -echo "$as_me:21007: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:21008: 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. @@ -21014,7 +21015,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:21017: result: $with_no_leaks" >&5 +echo "$as_me:21018: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -21032,7 +21033,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:21035: checking for an rpath option" >&5 + echo "$as_me:21036: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in (irix*) @@ -21063,12 +21064,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:21066: result: $LD_RPATH_OPT" >&5 + echo "$as_me:21067: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:21071: checking if we need a space after rpath option" >&5 + echo "$as_me:21072: 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" @@ -21089,7 +21090,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 21092 "configure" +#line 21093 "configure" #include "confdefs.h" int @@ -21101,16 +21102,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21104: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21105: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21107: \$? = $ac_status" >&5 + echo "$as_me:21108: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21110: \"$ac_try\"") >&5 + { (eval echo "$as_me:21111: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21113: \$? = $ac_status" >&5 + echo "$as_me:21114: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -21120,14 +21121,14 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:21123: result: $cf_rpath_space" >&5 + echo "$as_me:21124: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:21130: checking if rpath-hack should be disabled" >&5 +echo "$as_me:21131: 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. @@ -21144,21 +21145,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:21147: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:21148: 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:21151: checking for updated LDFLAGS" >&5 +echo "$as_me:21152: 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:21154: result: maybe" >&5 + echo "$as_me:21155: 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:21161: checking for $ac_word" >&5 +echo "$as_me:21162: 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 @@ -21173,7 +21174,7 @@ 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:21176: found $ac_dir/$ac_word" >&5 +echo "$as_me:21177: found $ac_dir/$ac_word" >&5 break done @@ -21181,10 +21182,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:21184: result: $cf_ldd_prog" >&5 + echo "$as_me:21185: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:21187: result: no" >&5 + echo "$as_me:21188: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21198,7 +21199,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 21201 "configure" +#line 21202 "configure" #include "confdefs.h" #include int @@ -21210,16 +21211,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21213: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21214: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21216: \$? = $ac_status" >&5 + echo "$as_me:21217: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21219: \"$ac_try\"") >&5 + { (eval echo "$as_me:21220: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21222: \$? = $ac_status" >&5 + echo "$as_me:21223: \$? = $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` @@ -21247,7 +21248,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}:21250: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:21251: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -21259,11 +21260,11 @@ echo "${as_me:-configure}:21250: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:21262: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:21263: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:21266: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:21267: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -21300,7 +21301,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:21303: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:21304: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -21313,11 +21314,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:21316: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:21317: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:21320: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:21321: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -21354,7 +21355,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:21357: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:21358: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -21367,14 +21368,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:21370: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:21371: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:21374: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:21375: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:21377: result: no" >&5 + echo "$as_me:21378: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21464,7 +21465,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:21467: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:21468: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -21640,7 +21641,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:21643: error: ambiguous option: $1 + { { echo "$as_me:21644: 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;} @@ -21659,7 +21660,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:21662: error: unrecognized option: $1 + -*) { { echo "$as_me:21663: 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;} @@ -21709,7 +21710,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:21712: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:21713: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -22008,7 +22009,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:22011: creating $ac_file" >&5 + { echo "$as_me:22012: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -22026,7 +22027,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:22029: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22030: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22039,7 +22040,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22042: error: cannot find input file: $f" >&5 + { { echo "$as_me:22043: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -22055,7 +22056,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:22058: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:22059: 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;} @@ -22064,7 +22065,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:22067: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:22068: 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;} @@ -22101,7 +22102,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:22104: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:22105: 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;} @@ -22112,7 +22113,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:22115: WARNING: Some variables may not be substituted: + { echo "$as_me:22116: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -22161,7 +22162,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:22164: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:22165: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -22172,7 +22173,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:22175: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22176: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22185,7 +22186,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22188: error: cannot find input file: $f" >&5 + { { echo "$as_me:22189: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -22243,7 +22244,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:22246: $ac_file is unchanged" >&5 + { echo "$as_me:22247: $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 87757d04..59ff30fe 100644 --- a/test/configure.in +++ b/test/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.158 2020/03/08 14:12:23 tom Exp $ +dnl $Id: configure.in,v 1.159 2020/05/30 00:13:37 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) @@ -256,6 +256,7 @@ CF_GETOPT_HEADER AC_CHECK_FUNCS( \ getopt \ gettimeofday \ +snprintf \ strstr \ tsearch \ ) diff --git a/test/dots.c b/test/dots.c index 11fc1cfe..94d90a13 100644 --- a/test/dots.c +++ b/test/dots.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey 1999 * - * $Id: dots.c,v 1.39 2020/05/10 00:31:03 tom Exp $ + * $Id: dots.c,v 1.40 2020/05/29 23:04:02 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -214,7 +214,8 @@ main(int argc, tputs(tparm2(set_a_foreground, z), 1, outc); } else { tputs(tparm2(set_a_background, z), 1, outc); - napms(s_option); + if (s_option) + napms(s_option); } } else if (VALID_STRING(exit_attribute_mode) && VALID_STRING(enter_reverse_mode)) { @@ -222,7 +223,8 @@ main(int argc, outs((ranf() > 0.6) ? enter_reverse_mode : exit_attribute_mode); - napms(s_option); + if (s_option) + napms(s_option); } } outc(p); diff --git a/test/dots_curses.c b/test/dots_curses.c index 4754e98a..e30a24ae 100644 --- a/test/dots_curses.c +++ b/test/dots_curses.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_curses.c,v 1.19 2020/05/10 00:31:59 tom Exp $ + * $Id: dots_curses.c,v 1.20 2020/05/29 23:04:02 tom Exp $ * * A simple demo of the curses interface used for comparison with termcap. */ @@ -206,7 +206,8 @@ main(int argc, char *argv[]) attron(COLOR_PAIR(mypair(fg, bg))); } else { set_colors(fg, bg = z); - napms(s_option); + if (s_option) + napms(s_option); } } else { if (ranf() <= 0.01) { @@ -215,7 +216,8 @@ main(int argc, char *argv[]) } else { attroff(A_REVERSE); } - napms(s_option); + if (s_option) + napms(s_option); } } AddCh(p); diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c index 76176642..a032124c 100644 --- a/test/dots_mvcur.c +++ b/test/dots_mvcur.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2007 * - * $Id: dots_mvcur.c,v 1.25 2020/05/10 00:32:11 tom Exp $ + * $Id: dots_mvcur.c,v 1.26 2020/05/29 23:04:02 tom Exp $ * * A simple demo of the terminfo interface, and mvcur. */ @@ -228,7 +228,8 @@ main(int argc GCC_UNUSED, tputs(tparm2(set_a_foreground, z), 1, outc); } else { tputs(tparm2(set_a_background, z), 1, outc); - napms(s_option); + if (s_option) + napms(s_option); } } else if (VALID_STRING(exit_attribute_mode) && VALID_STRING(enter_reverse_mode)) { @@ -236,7 +237,8 @@ main(int argc GCC_UNUSED, outs((ranf() > 0.6) ? enter_reverse_mode : exit_attribute_mode); - napms(s_option); + if (s_option) + napms(s_option); } } outc(p); diff --git a/test/dots_termcap.c b/test/dots_termcap.c index 0fc1a89e..52749c75 100644 --- a/test/dots_termcap.c +++ b/test/dots_termcap.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_termcap.c,v 1.23 2020/05/10 00:32:22 tom Exp $ + * $Id: dots_termcap.c,v 1.24 2020/05/29 23:04:02 tom Exp $ * * A simple demo of the termcap interface. */ @@ -297,7 +297,8 @@ main(int argc, char *argv[]) tputs(tgoto(t_AF, 0, z), 1, outc); } else { tputs(tgoto(t_AB, 0, z), 1, outc); - my_napms(s_option); + if (s_option) + my_napms(s_option); } } else if (VALID_STRING(t_me) && VALID_STRING(t_mr)) { @@ -305,7 +306,8 @@ main(int argc, char *argv[]) outs((ranf() > 0.6) ? t_mr : t_me); - my_napms(s_option); + if (s_option) + my_napms(s_option); } } outc(p); diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c index a2aa8b92..d8fe8031 100644 --- a/test/dots_xcurses.c +++ b/test/dots_xcurses.c @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_xcurses.c,v 1.22 2020/05/10 00:32:33 tom Exp $ + * $Id: dots_xcurses.c,v 1.23 2020/05/29 23:04:02 tom Exp $ * * A simple demo of the wide-curses interface used for comparison with termcap. */ @@ -244,7 +244,8 @@ main(int argc, char *argv[]) set_colors(fg = z, bg); } else { set_colors(fg, bg = z); - napms(s_option); + if (s_option) + napms(s_option); } } else { if (ranf() <= 0.01) { @@ -253,7 +254,8 @@ main(int argc, char *argv[]) } else { attr_off(WA_REVERSE, NULL); } - napms(s_option); + if (s_option) + napms(s_option); } } wch[0] = (wchar_t) p; diff --git a/test/modules b/test/modules index 7fb9b179..524a6000 100644 --- a/test/modules +++ b/test/modules @@ -1,4 +1,4 @@ -# $Id: modules,v 1.72 2020/03/21 16:09:48 tom Exp $ +# $Id: modules,v 1.73 2020/05/29 23:27:44 tom Exp $ ############################################################################## # Copyright 2018-2019,2020 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # @@ -107,6 +107,7 @@ test_opaque progs $(srcdir) $(HEADER_DEPS) test_setupterm progs $(srcdir) $(HEADER_DEPS) test_sgr progs $(srcdir) $(HEADER_DEPS) test_termattrs progs $(srcdir) $(HEADER_DEPS) +test_tparm progs $(srcdir) $(HEADER_DEPS) test_vid_puts progs $(srcdir) $(HEADER_DEPS) test_vidputs progs $(srcdir) $(HEADER_DEPS) testaddch progs $(srcdir) $(HEADER_DEPS) diff --git a/test/programs b/test/programs index f6a48f3a..b9faf99d 100644 --- a/test/programs +++ b/test/programs @@ -1,4 +1,4 @@ -# $Id: programs,v 1.46 2020/03/21 15:55:22 tom Exp $ +# $Id: programs,v 1.47 2020/05/29 23:27:58 tom Exp $ ############################################################################## # Copyright 2018-2019,2020 Thomas E. Dickey # # Copyright 2006-2016,2017 Free Software Foundation, Inc. # @@ -102,6 +102,7 @@ test_opaque $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_opaque test_setupterm $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_setupterm test_sgr $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_sgr test_termattrs $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_termattrs +test_tparm $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_tparm test_vid_puts $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_vid_puts test_vidputs $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_vidputs testaddch $(LDFLAGS_CURSES) $(LOCAL_LIBS) testaddch diff --git a/test/test_tparm.c b/test/test_tparm.c new file mode 100644 index 00000000..40ffc4fb --- /dev/null +++ b/test/test_tparm.c @@ -0,0 +1,388 @@ +/**************************************************************************** + * Copyright 2020 Thomas E. Dickey * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/* + * Author: Thomas E. Dickey + * + * $Id: test_tparm.c,v 1.4 2020/05/31 00:51:32 tom Exp $ + * + * Exercise tparm, either for all possible capabilities with fixed parameters, + * or one capability with all possible parameters. + * + * TODO: incorporate tic.h and _nc_tparm_analyze + * TODO: optionally test tiparm + * TODO: add checks/logic to handle "%s" in tparm + */ +#define USE_TINFO +#include + +static void failed(const char *) GCC_NORETURN; + +static void +failed(const char *msg) +{ + fprintf(stderr, "%s\n", msg); + ExitProgram(EXIT_FAILURE); +} + +#if HAVE_TIGETSTR + +static int a_opt; +static int v_opt; + +static int +isNumeric(char *source) +{ + char *next = 0; + long value = strtol(source, &next, 0); + int result = (next == 0 || next == source || *next != '\0') ? 0 : 1; + (void) value; + return result; +} + +static char * +validate(const char *name) +{ + char *value = tigetstr(name); + if (!VALID_STRING(value)) { + if (v_opt > 1) { + printf("? %s %s\n", + (value == ABSENT_STRING) + ? "absent" + : "cancel", + name); + } + value = 0; + } + return value; +} + +static int +increment(int *all_parms, int *num_parms, int len_parms, int end_parms) +{ + int rc = 0; + int n; + + if (len_parms > 9) + len_parms = 9; + + if (end_parms < len_parms) { + if (all_parms[end_parms]++ >= num_parms[end_parms]) { + all_parms[end_parms] = 0; + increment(all_parms, num_parms, len_parms, end_parms + 1); + } + } + for (n = 0; n < len_parms; ++n) { + if (all_parms[n] != 0) { + rc = 1; + break; + } + } + /* return 1 until the vector resets to all 0's */ + return rc; +} + +static void +test_tparm(const char *name, int *number) +{ + char *format = tigetstr(name); + if ((format = validate(name)) != 0) { + char *result = tparm(format, + number[0], + number[1], + number[2], + number[3], + number[4], + number[5], + number[6], + number[7], + number[8]); + if (v_opt > 1) + printf(".. %2d = %2d %2d %2d %2d %2d %2d %2d %2d %2d %s\n", + result != 0 ? (int) strlen(result) : -1, + number[0], + number[1], + number[2], + number[3], + number[4], + number[5], + number[6], + number[7], + number[8], + name); + } +} + +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: test_tparm [options] [capability] [value1 [value2 [...]]]", + "", + "Print all distinct combinations of given capability.", + "", + "Options:", + " -T TERM override $TERM; this may be a comma-separated list or \"-\"", + " to read a list from standard-input", + " -a if capability is given, test all combinations of values", + " -r NUM repeat tests NUM times", + " -v show values and results", + }; + unsigned n; + for (n = 0; n < SIZEOF(msg); ++n) { + fprintf(stderr, "%s\n", msg[n]); + } + ExitProgram(EXIT_FAILURE); +} + +#define PLURAL(n) n, (n != 1) ? "s" : "" +#define COLONS(n) (n >= 1) ? ":" : "" + +int +main(int argc, char *argv[]) +{ + int n; + int r_run, t_run, n_run; + char *old_term = getenv("TERM"); + int r_opt = 1; + char *t_opt = 0; + int len_names = 0; /* cur # of items in all_names[] */ + int use_names = 10; /* max # of items in all_names[] */ + char **all_names = typeCalloc(char *, use_names); + int all_parms[10]; /* workspace for "-a" option */ + int len_terms = 0; /* cur # of items in all_terms[] */ + int use_terms = 10; /* max # of items in all_terms[] */ + char **all_terms = typeCalloc(char *, use_terms); + int len_parms = 0; /* cur # of items in num_parms[], str_parms[] */ + int use_parms = argc + 10; /* max # of items in num_parms[], str_parms[] */ + int *num_parms = typeCalloc(int, use_parms); + char **str_parms = typeCalloc(char *, use_parms); + + if (all_names == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0) + failed("no memory"); + + while ((n = getopt(argc, argv, "T:ar:v")) != -1) { + switch (n) { + case 'T': + t_opt = optarg; + break; + case 'a': + ++a_opt; + break; + case 'r': + r_opt = atoi(optarg); + break; + case 'v': + ++v_opt; + break; + default: + usage(); + break; + } + } + + /* + * If there is a nonnumeric parameter after the options, use that as the + * capability name. + */ + if (optind < argc) { + if (!isNumeric(argv[optind])) { + all_names[len_names++] = strdup(argv[optind++]); + } + } + + /* + * Any remaining arguments must be possible parameter values. If numeric, + * and "-a" is not set, use those as the maximum values within which the + * test parameters should vary. + */ + while (optind < argc) { + if (isNumeric(argv[optind])) { + char *dummy = 0; + long value = strtol(argv[optind], &dummy, 0); + num_parms[len_parms] = (int) value; + } + str_parms[len_parms] = argv[optind]; + ++optind; + ++len_parms; + } + for (n = len_parms; n < use_parms; ++n) { + static char dummy[1]; + str_parms[n] = dummy; + } + if (v_opt) { + printf("%d parameter%s%s\n", PLURAL(len_parms), COLONS(len_parms)); + for (n = 0; n < len_parms; ++n) { + printf(" %d: %d (%s)\n", n + 1, num_parms[n], str_parms[n]); + } + } + + /* + * Make a list of values for $TERM. Accept "-" for standard input to + * simplify scripting a check of the whole database. + */ + old_term = strdup((old_term == 0) ? "unknown" : old_term); + if (t_opt != 0) { + if (!strcmp(t_opt, "-")) { + char buffer[BUFSIZ]; + while (fgets(buffer, sizeof(buffer) - 1, stdin) != 0) { + char *s = buffer; + char *t; + while (isspace(UChar(s[0]))) + ++s; + t = s + strlen(s); + while (t != s && isspace(UChar(t[-1]))) + *--t = '\0'; + s = strdup(s); + if (len_terms + 2 >= use_terms) { + use_terms *= 2; + all_terms = typeRealloc(char *, use_terms, all_terms); + if (all_terms == 0) + failed("no memory: all_terms"); + } + all_terms[len_terms++] = s; + } + } else { + char *s = t_opt; + char *t; + while ((t = strtok(s, ",")) != 0) { + s = 0; + if (len_terms + 2 >= use_terms) { + use_terms *= 2; + all_terms = typeRealloc(char *, use_terms, all_terms); + if (all_terms == 0) + failed("no memory: all_terms"); + } + all_terms[len_terms++] = strdup(t); + } + } + } else { + all_terms[len_terms++] = strdup(old_term); + } + all_terms[len_terms] = 0; + if (v_opt) { + printf("%d term%s:\n", PLURAL(len_terms)); + for (n = 0; n < len_terms; ++n) { + printf(" %d: %s\n", n + 1, all_terms[n]); + } + } + + /* + * If no capability name was selected, use the predefined list of string + * capabilities. + * + * TODO: To address the "other" systems which do not follow SVr4, + * just use the output from infocmp on $TERM. + */ + if (len_names == 0) { +#if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES) + for (n = 0; strnames[n] != 0; ++n) { + if (len_names + 2 >= use_names) { + use_names *= 2; + all_names = typeRealloc(char *, use_names, all_names); + if (all_names == 0) { + failed("no memory: all_names"); + } + } + all_names[len_names++] = strdup(strnames[n]); + } +#else + all_names[len_names++] = strdup("cup"); + all_names[len_names++] = strdup("sgr"); +#endif + } + all_names[len_names] = 0; + if (v_opt) { + printf("%d name%s%s\n", PLURAL(len_names), COLONS(len_names)); + for (n = 0; n < len_names; ++n) { + printf(" %d: %s\n", n + 1, all_names[n]); + } + } + + if (r_opt <= 0) + r_opt = 1; + + for (r_run = 0; r_run < r_opt; ++r_run) { + for (t_run = 0; t_run < len_terms; ++t_run) { + int errs; + + if (setupterm(all_terms[t_run], fileno(stdout), &errs) != OK) { + printf("** skipping %s (errs:%d)\n", all_terms[t_run], errs); + } + + if (v_opt) + printf("** testing %s\n", all_terms[t_run]); + if (len_names == 1) { + if (a_opt) { + /* for each combination of values */ + memset(all_parms, 0, sizeof(all_parms)); + do { + test_tparm(all_names[0], all_parms); + } + while (increment(all_parms, num_parms, len_parms, 0)); + } else { + /* for the given values */ + test_tparm(all_names[0], num_parms); + } + } else { + for (n_run = 0; n_run < len_names; ++n_run) { + test_tparm(all_names[n_run], num_parms); + } + } + if (cur_term != 0) { + del_curterm(cur_term); + } else { + printf("? no cur_term\n"); + } + } + } +#if NO_LEAKS + for (n = 0; n < len_names; ++n) { + free(all_names[n]); + } + free(all_names); + free(old_term); + for (n = 0; n < len_terms; ++n) { + free(all_terms[n]); + } + free(all_terms); + free(num_parms); + free(str_parms); +#endif + + ExitProgram(EXIT_SUCCESS); +} + +#else /* !HAVE_TIGETSTR */ +int +main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +{ + failed("This program requires the terminfo functions such as tigetstr"); +} +#endif /* HAVE_TIGETSTR */ -- 2.44.0