From: Thomas E. Dickey Date: Sun, 12 Mar 2017 01:04:32 +0000 (+0000) Subject: ncurses 6.0 - patch 20170311 X-Git-Tag: v6.1~46 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=90d42867e1296bc79021006a92032c76e59068b6 ncurses 6.0 - patch 20170311 + modify vt100 rs2 string to reset vt52 mode and scrolling regions (report/analysis by Robert King) -TD + add vt100+4bsd building block, use that for older terminals rather than "vt100" which is now mostly used as a building block for terminal emulators -TD + correct a few spelling errors in terminfo.src comments -TD + add fbterm -TD + fix a typo in ncurses.c test_attr legend (patch by Petr Vanek). + changed internal colorpair_t to a struct, eliminating an internal 8-bit limit on colors + add ncurses/new_pair.h + add ncurses/base/new_pair.c with alloc_pair(), find_pair() and free_pair() functions + add test/demo_new_pair.c --- diff --git a/MANIFEST b/MANIFEST index 9e05ad10..bc547fac 100644 --- a/MANIFEST +++ b/MANIFEST @@ -691,6 +691,7 @@ ./man/mitem_value.3x ./man/mitem_visible.3x ./man/ncurses.3x +./man/new_pair.3x ./man/panel.3x ./man/resizeterm.3x ./man/tabs.1 @@ -861,6 +862,7 @@ ./ncurses/base/lib_winch.c ./ncurses/base/lib_window.c ./ncurses/base/nc_panel.c +./ncurses/base/new_pair.c ./ncurses/base/resizeterm.c ./ncurses/base/safe_sprintf.c ./ncurses/base/sigaction.c @@ -885,6 +887,7 @@ ./ncurses/llib-ltinfotw ./ncurses/llib-ltinfow ./ncurses/modules +./ncurses/new_pair.h ./ncurses/tinfo/MKcaptab.awk ./ncurses/tinfo/MKcaptab.sh ./ncurses/tinfo/MKcodes.awk @@ -1088,6 +1091,7 @@ ./test/demo_forms.txt ./test/demo_keyok.c ./test/demo_menus.c +./test/demo_new_pair.c ./test/demo_panels.c ./test/demo_termcap.c ./test/demo_terminfo.c diff --git a/NEWS b/NEWS index 48882f1a..dba8fd13 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2767 2017/03/05 00:05:28 tom Exp $ +-- $Id: NEWS,v 1.2772 2017/03/11 23:29:01 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,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. +20170311 + + modify vt100 rs2 string to reset vt52 mode and scrolling regions + (report/analysis by Robert King) -TD + + add vt100+4bsd building block, use that for older terminals rather + than "vt100" which is now mostly used as a building block for + terminal emulators -TD + + correct a few spelling errors in terminfo.src comments -TD + + add fbterm -TD + + fix a typo in ncurses.c test_attr legend (patch by Petr Vanek). + + changed internal colorpair_t to a struct, eliminating an internal + 8-bit limit on colors + + add ncurses/new_pair.h + + add ncurses/base/new_pair.c with alloc_pair(), find_pair() and + free_pair() functions + + add test/demo_new_pair.c + 20170304 + improve terminfo manual description of terminfo syntax. + clarify the use of wint_t vs wchar_t in curs_get_wstr.3x diff --git a/VERSION b/VERSION index b613f680..a1d35f56 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20170304 +5:0:9 6.0 20170311 diff --git a/configure b/configure index 9708c579..a32f9dff 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.636 . +# From configure.in Revision: 1.638 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20150926. # @@ -12239,13 +12239,17 @@ fi cat >>confdefs.h <<\EOF #define NCURSES_EXT_COLORS 1 +EOF + +cat >>confdefs.h <<\EOF +#define HAVE_ALLOC_PAIR 1 EOF fi fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:12248: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:12252: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -12255,7 +12259,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:12258: result: $with_ext_mouse" >&5 +echo "$as_me:12262: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "x$with_ext_mouse" = xyes ; then @@ -12266,7 +12270,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12269: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12273: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12275,7 +12279,7 @@ fi fi ### use option --enable-ext-putwin to turn on extended screendumps -echo "$as_me:12278: checking if you want to use extended putwin/screendump" >&5 +echo "$as_me:12282: checking if you want to use extended putwin/screendump" >&5 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 # Check whether --enable-ext-putwin or --disable-ext-putwin was given. @@ -12285,7 +12289,7 @@ if test "${enable_ext_putwin+set}" = set; then else with_ext_putwin=$cf_dft_ext_putwin fi; -echo "$as_me:12288: result: $with_ext_putwin" >&5 +echo "$as_me:12292: result: $with_ext_putwin" >&5 echo "${ECHO_T}$with_ext_putwin" >&6 if test "x$with_ext_putwin" = xyes ; then @@ -12295,7 +12299,7 @@ EOF fi -echo "$as_me:12298: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:12302: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -12305,20 +12309,20 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:12308: result: $with_no_padding" >&5 +echo "$as_me:12312: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:12315: checking for ANSI C header files" >&5 +echo "$as_me:12319: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12321 "configure" +#line 12325 "configure" #include "confdefs.h" #include #include @@ -12326,13 +12330,13 @@ else #include _ACEOF -if { (eval echo "$as_me:12329: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12333: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12335: \$? = $ac_status" >&5 + echo "$as_me:12339: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12354,7 +12358,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 12357 "configure" +#line 12361 "configure" #include "confdefs.h" #include @@ -12372,7 +12376,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 12375 "configure" +#line 12379 "configure" #include "confdefs.h" #include @@ -12393,7 +12397,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 12396 "configure" +#line 12400 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -12419,15 +12423,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12422: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12426: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12425: \$? = $ac_status" >&5 + echo "$as_me:12429: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12427: \"$ac_try\"") >&5 + { (eval echo "$as_me:12431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12430: \$? = $ac_status" >&5 + echo "$as_me:12434: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12440,7 +12444,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:12443: result: $ac_cv_header_stdc" >&5 +echo "$as_me:12447: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -12456,28 +12460,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12459: checking for $ac_header" >&5 +echo "$as_me:12463: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12465 "configure" +#line 12469 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12471: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12474: \$? = $ac_status" >&5 + echo "$as_me:12478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12477: \"$ac_try\"") >&5 + { (eval echo "$as_me:12481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12480: \$? = $ac_status" >&5 + echo "$as_me:12484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -12487,7 +12491,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12490: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12494: result: `eval echo '${'$as_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:12504: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12506 "configure" +#line 12510 "configure" #include "confdefs.h" $ac_includes_default int @@ -12518,16 +12522,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12521: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12524: \$? = $ac_status" >&5 + echo "$as_me:12528: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12527: \"$ac_try\"") >&5 + { (eval echo "$as_me:12531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12530: \$? = $ac_status" >&5 + echo "$as_me:12534: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -12537,10 +12541,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12540: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:12544: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:12543: checking size of signed char" >&5 +echo "$as_me:12547: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12549,7 +12553,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 12552 "configure" +#line 12556 "configure" #include "confdefs.h" $ac_includes_default int @@ -12561,21 +12565,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12567: \$? = $ac_status" >&5 + echo "$as_me:12571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12570: \"$ac_try\"") >&5 + { (eval echo "$as_me:12574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12573: \$? = $ac_status" >&5 + echo "$as_me:12577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 12578 "configure" +#line 12582 "configure" #include "confdefs.h" $ac_includes_default int @@ -12587,16 +12591,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12590: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12594: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12593: \$? = $ac_status" >&5 + echo "$as_me:12597: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12596: \"$ac_try\"") >&5 + { (eval echo "$as_me:12600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12599: \$? = $ac_status" >&5 + echo "$as_me:12603: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -12612,7 +12616,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 12615 "configure" +#line 12619 "configure" #include "confdefs.h" $ac_includes_default int @@ -12624,16 +12628,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12627: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12631: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12630: \$? = $ac_status" >&5 + echo "$as_me:12634: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12633: \"$ac_try\"") >&5 + { (eval echo "$as_me:12637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12636: \$? = $ac_status" >&5 + echo "$as_me:12640: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -12649,7 +12653,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 12652 "configure" +#line 12656 "configure" #include "confdefs.h" $ac_includes_default int @@ -12661,16 +12665,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12664: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12667: \$? = $ac_status" >&5 + echo "$as_me:12671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12670: \"$ac_try\"") >&5 + { (eval echo "$as_me:12674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12673: \$? = $ac_status" >&5 + echo "$as_me:12677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -12683,12 +12687,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:12686: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12690: 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 12691 "configure" +#line 12695 "configure" #include "confdefs.h" $ac_includes_default int @@ -12704,15 +12708,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12707: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12710: \$? = $ac_status" >&5 + echo "$as_me:12714: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12712: \"$ac_try\"") >&5 + { (eval echo "$as_me:12716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12715: \$? = $ac_status" >&5 + echo "$as_me:12719: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -12728,7 +12732,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:12731: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:12735: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:12746: checking if you want to use signed Boolean array in term.h" >&5 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -12749,12 +12753,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:12752: result: $with_signed_char" >&5 +echo "$as_me:12756: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:12757: checking if you want SIGWINCH handler" >&5 +echo "$as_me:12761: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -12764,7 +12768,7 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:12767: result: $with_sigwinch" >&5 +echo "$as_me:12771: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF @@ -12772,7 +12776,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:12775: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:12779: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -12782,14 +12786,14 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:12785: result: $with_tcap_names" >&5 +echo "$as_me:12789: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 ############################################################################## -echo "$as_me:12792: checking if you want to link with the pthread library" >&5 +echo "$as_me:12796: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -12799,27 +12803,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:12802: result: $with_pthread" >&5 +echo "$as_me:12806: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:12806: checking for pthread.h" >&5 + echo "$as_me:12810: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12812 "configure" +#line 12816 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12816: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12820: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12822: \$? = $ac_status" >&5 + echo "$as_me:12826: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12838,7 +12842,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12841: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:12845: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then @@ -12848,7 +12852,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:12851: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:12855: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -12869,7 +12873,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 12872 "configure" +#line 12876 "configure" #include "confdefs.h" #include @@ -12886,16 +12890,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12889: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12892: \$? = $ac_status" >&5 + echo "$as_me:12896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12895: \"$ac_try\"") >&5 + { (eval echo "$as_me:12899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12898: \$? = $ac_status" >&5 + echo "$as_me:12902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -12905,7 +12909,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:12908: result: $with_pthread" >&5 + echo "$as_me:12912: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -12933,7 +12937,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:12936: error: Cannot link with pthread library" >&5 + { { echo "$as_me:12940: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -12943,13 +12947,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:12946: checking for pthread_kill" >&5 + echo "$as_me:12950: checking for pthread_kill" >&5 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 if test "${ac_cv_func_pthread_kill+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12952 "configure" +#line 12956 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -12980,16 +12984,16 @@ f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12983: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12986: \$? = $ac_status" >&5 + echo "$as_me:12990: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12989: \"$ac_try\"") >&5 + { (eval echo "$as_me:12993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12992: \$? = $ac_status" >&5 + echo "$as_me:12996: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -12999,11 +13003,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13002: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:13006: result: $ac_cv_func_pthread_kill" >&5 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 if test $ac_cv_func_pthread_kill = yes; then - echo "$as_me:13006: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:13010: checking if you want to allow EINTR in wgetch with pthreads" >&5 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. @@ -13013,7 +13017,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:13016: result: $use_pthreads_eintr" >&5 + echo "$as_me:13020: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -13024,7 +13028,7 @@ EOF fi fi - echo "$as_me:13027: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:13031: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -13034,18 +13038,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:13037: result: $use_weak_symbols" >&5 + echo "$as_me:13041: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:13041: checking if $CC supports weak symbols" >&5 +echo "$as_me:13045: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13048 "configure" +#line 13052 "configure" #include "confdefs.h" #include @@ -13071,16 +13075,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13074: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13078: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13077: \$? = $ac_status" >&5 + echo "$as_me:13081: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13080: \"$ac_try\"") >&5 + { (eval echo "$as_me:13084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13083: \$? = $ac_status" >&5 + echo "$as_me:13087: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -13091,7 +13095,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13094: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:13098: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -13124,7 +13128,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:13127: checking if you want reentrant code" >&5 +echo "$as_me:13131: checking if you want reentrant code" >&5 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -13134,7 +13138,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:13137: result: $with_reentrant" >&5 +echo "$as_me:13141: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 @@ -13206,7 +13210,7 @@ if test "${with_abi_version+set}" != set; then (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:13209: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:13213: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -13218,7 +13222,7 @@ else NCURSES_SIZE_T=short fi -echo "$as_me:13221: checking if you want opaque curses-library structures" >&5 +echo "$as_me:13225: checking if you want opaque curses-library structures" >&5 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-curses or --disable-opaque-curses was given. @@ -13240,16 +13244,16 @@ else test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no fi; -echo "$as_me:13243: result: $enable_opaque_curses" >&5 +echo "$as_me:13247: result: $enable_opaque_curses" >&5 echo "${ECHO_T}$enable_opaque_curses" >&6 test "$cf_cv_enable_reentrant" = 1 && \ test "$enable_opaque_curses" = no && \ -{ { echo "$as_me:13248: error: reentrant configuration requires opaque library" >&5 +{ { echo "$as_me:13252: error: reentrant configuration requires opaque library" >&5 echo "$as_me: error: reentrant configuration requires opaque library" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:13252: checking if you want opaque form-library structures" >&5 +echo "$as_me:13256: checking if you want opaque form-library structures" >&5 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-form or --disable-opaque-form was given. @@ -13259,10 +13263,10 @@ if test "${enable_opaque_form+set}" = set; then else enable_opaque_form=no fi; -echo "$as_me:13262: result: $enable_opaque_form" >&5 +echo "$as_me:13266: result: $enable_opaque_form" >&5 echo "${ECHO_T}$enable_opaque_form" >&6 -echo "$as_me:13265: checking if you want opaque menu-library structures" >&5 +echo "$as_me:13269: checking if you want opaque menu-library structures" >&5 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-menu or --disable-opaque-menu was given. @@ -13272,10 +13276,10 @@ if test "${enable_opaque_menu+set}" = set; then else enable_opaque_menu=no fi; -echo "$as_me:13275: result: $enable_opaque_menu" >&5 +echo "$as_me:13279: result: $enable_opaque_menu" >&5 echo "${ECHO_T}$enable_opaque_menu" >&6 -echo "$as_me:13278: checking if you want opaque panel-library structures" >&5 +echo "$as_me:13282: checking if you want opaque panel-library structures" >&5 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-panel or --disable-opaque-panel was given. @@ -13285,7 +13289,7 @@ if test "${enable_opaque_panel+set}" = set; then else enable_opaque_panel=no fi; -echo "$as_me:13288: result: $enable_opaque_panel" >&5 +echo "$as_me:13292: result: $enable_opaque_panel" >&5 echo "${ECHO_T}$enable_opaque_panel" >&6 NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -13295,7 +13299,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel" = yes && NCURSES_OPAQUE_PAN ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:13298: checking for prefix used to wrap public variables" >&5 + echo "$as_me:13302: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -13305,7 +13309,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:13308: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:13312: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -13318,7 +13322,7 @@ EOF ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:13321: checking if you want all development code" >&5 +echo "$as_me:13325: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -13328,11 +13332,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:13331: result: $with_develop" >&5 +echo "$as_me:13335: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:13335: checking if you want hard-tabs code" >&5 +echo "$as_me:13339: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -13342,7 +13346,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:13345: result: $enable_hard_tabs" >&5 +echo "$as_me:13349: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -13350,7 +13354,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:13353: checking if you want limited support for xmc" >&5 +echo "$as_me:13357: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -13360,7 +13364,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:13363: result: $enable_xmc_glitch" >&5 +echo "$as_me:13367: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -13370,7 +13374,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:13373: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:13377: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -13380,7 +13384,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:13383: result: $with_assumed_color" >&5 +echo "$as_me:13387: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -13388,7 +13392,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:13391: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:13395: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -13398,7 +13402,7 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:13401: result: $with_hashmap" >&5 +echo "$as_me:13405: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF @@ -13406,7 +13410,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:13409: checking if you want colorfgbg code" >&5 +echo "$as_me:13413: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -13416,7 +13420,7 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:13419: result: $with_colorfgbg" >&5 +echo "$as_me:13423: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "x$with_colorfgbg" = xyes && cat >>confdefs.h <<\EOF @@ -13424,7 +13428,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:13427: checking if you want interop bindings" >&5 +echo "$as_me:13431: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -13434,13 +13438,13 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=$cf_dft_interop fi; -echo "$as_me:13437: result: $with_exp_interop" >&5 +echo "$as_me:13441: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 -echo "$as_me:13443: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:13447: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -13450,7 +13454,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:13453: result: $with_safe_sprintf" >&5 +echo "$as_me:13457: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 test "x$with_safe_sprintf" = xyes && cat >>confdefs.h <<\EOF @@ -13460,7 +13464,7 @@ EOF ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:13463: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:13467: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -13470,7 +13474,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:13473: result: $with_scroll_hints" >&5 +echo "$as_me:13477: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -13479,7 +13483,7 @@ EOF fi -echo "$as_me:13482: checking if you want wgetch-events code" >&5 +echo "$as_me:13486: checking if you want wgetch-events code" >&5 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -13489,7 +13493,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:13492: result: $with_wgetch_events" >&5 +echo "$as_me:13496: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "x$with_wgetch_events" = xyes && cat >>confdefs.h <<\EOF @@ -13500,7 +13504,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:13503: checking if you want to see long compiling messages" >&5 +echo "$as_me:13507: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -13534,7 +13538,7 @@ else ECHO_CC='' fi; -echo "$as_me:13537: result: $enableval" >&5 +echo "$as_me:13541: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -13546,7 +13550,7 @@ else fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:13549: checking if you want to see compiler warnings" >&5 +echo "$as_me:13553: checking if you want to see compiler warnings" >&5 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -13554,7 +13558,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:13557: result: $with_warnings" >&5 +echo "$as_me:13561: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -13566,12 +13570,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:13569: checking if this is really Intel C compiler" >&5 + echo "$as_me:13573: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 13574 "configure" +#line 13578 "configure" #include "confdefs.h" int @@ -13588,16 +13592,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13595: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13594: \$? = $ac_status" >&5 + echo "$as_me:13598: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13597: \"$ac_try\"") >&5 + { (eval echo "$as_me:13601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13600: \$? = $ac_status" >&5 + echo "$as_me:13604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -13608,7 +13612,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13611: result: $INTEL_COMPILER" >&5 + echo "$as_me:13615: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -13617,12 +13621,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:13620: checking if this is really Clang C compiler" >&5 + echo "$as_me:13624: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 13625 "configure" +#line 13629 "configure" #include "confdefs.h" int @@ -13639,16 +13643,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13645: \$? = $ac_status" >&5 + echo "$as_me:13649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13648: \"$ac_try\"") >&5 + { (eval echo "$as_me:13652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13651: \$? = $ac_status" >&5 + echo "$as_me:13655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13659,12 +13663,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13662: result: $CLANG_COMPILER" >&5 + echo "$as_me:13666: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:13688: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -13697,12 +13701,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:13700: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13704: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13703: \$? = $ac_status" >&5 + echo "$as_me:13707: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13705: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13709: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -13711,7 +13715,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:13714: checking for $CC warning options..." >&5 + { echo "$as_me:13718: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -13735,12 +13739,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:13738: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13742: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13741: \$? = $ac_status" >&5 + echo "$as_me:13745: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13743: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13747: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -13751,7 +13755,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}:13754: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13758: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13761,7 +13765,7 @@ echo "${as_me:-configure}:13754: 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}:13764: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13768: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13781,12 +13785,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:13784: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:13788: checking if this is really Intel C++ compiler" >&5 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 13789 "configure" +#line 13793 "configure" #include "confdefs.h" int @@ -13803,16 +13807,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13806: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13809: \$? = $ac_status" >&5 + echo "$as_me:13813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13812: \"$ac_try\"") >&5 + { (eval echo "$as_me:13816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13815: \$? = $ac_status" >&5 + echo "$as_me:13819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -13823,7 +13827,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13826: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:13830: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -13832,12 +13836,12 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:13835: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:13839: checking if this is really Clang C++ compiler" >&5 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 13840 "configure" +#line 13844 "configure" #include "confdefs.h" int @@ -13854,16 +13858,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13857: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13860: \$? = $ac_status" >&5 + echo "$as_me:13864: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13863: \"$ac_try\"") >&5 + { (eval echo "$as_me:13867: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13866: \$? = $ac_status" >&5 + echo "$as_me:13870: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13874,7 +13878,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13877: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:13881: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -13886,7 +13890,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:13911: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -13921,12 +13925,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:13924: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13928: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13927: \$? = $ac_status" >&5 + echo "$as_me:13931: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13929: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13933: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -13935,7 +13939,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:13938: checking for $CXX warning options..." >&5 + { echo "$as_me:13942: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -13965,16 +13969,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13971: \$? = $ac_status" >&5 + echo "$as_me:13975: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13973: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13977: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:13977: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13981: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -14010,10 +14014,10 @@ cat > conftest.i <&5 + { echo "$as_me:14017: 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:14069: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14068: \$? = $ac_status" >&5 + echo "$as_me:14072: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:14070: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:14074: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -14126,7 +14130,7 @@ fi rm -rf conftest* fi -echo "$as_me:14129: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:14133: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -14136,7 +14140,7 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:14139: result: $with_string_hacks" >&5 +echo "$as_me:14143: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then @@ -14145,15 +14149,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:14148: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:14152: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:14150: checking for strlcat" >&5 + echo "$as_me:14154: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14156 "configure" +#line 14160 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strlcat (); below. */ @@ -14184,16 +14188,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14187: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14190: \$? = $ac_status" >&5 + echo "$as_me:14194: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14193: \"$ac_try\"") >&5 + { (eval echo "$as_me:14197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14196: \$? = $ac_status" >&5 + echo "$as_me:14200: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strlcat=yes else @@ -14203,7 +14207,7 @@ ac_cv_func_strlcat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14206: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:14210: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test $ac_cv_func_strlcat = yes; then @@ -14213,7 +14217,7 @@ EOF else - echo "$as_me:14216: checking for strlcat in -lbsd" >&5 + echo "$as_me:14220: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14221,7 +14225,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14224 "configure" +#line 14228 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14240,16 +14244,16 @@ strlcat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14243: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14247: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14246: \$? = $ac_status" >&5 + echo "$as_me:14250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14249: \"$ac_try\"") >&5 + { (eval echo "$as_me:14253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14252: \$? = $ac_status" >&5 + echo "$as_me:14256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -14260,7 +14264,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14263: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:14267: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test $ac_cv_lib_bsd_strlcat = yes; then @@ -14283,23 +14287,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14286: checking for $ac_header" >&5 +echo "$as_me:14290: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14292 "configure" +#line 14296 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14296: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14300: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14302: \$? = $ac_status" >&5 + echo "$as_me:14306: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14318,7 +14322,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14321: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14325: result: `eval echo '${'$as_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:14346: 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 14348 "configure" +#line 14352 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -14376,16 +14380,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14383: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14382: \$? = $ac_status" >&5 + echo "$as_me:14386: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14385: \"$ac_try\"") >&5 + { (eval echo "$as_me:14389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14388: \$? = $ac_status" >&5 + echo "$as_me:14392: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -14395,7 +14399,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14398: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14402: 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:14415: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -14418,7 +14422,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:14421: result: $with_assertions" >&5 +echo "$as_me:14425: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -14434,7 +14438,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:14437: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:14441: 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. @@ -14451,7 +14455,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:14454: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:14458: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -14565,23 +14569,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:14568: checking for dmalloc.h" >&5 + echo "$as_me:14572: 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 14574 "configure" +#line 14578 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14578: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14582: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14584: \$? = $ac_status" >&5 + echo "$as_me:14588: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14600,11 +14604,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14603: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:14607: 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:14607: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:14611: 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 @@ -14612,7 +14616,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14615 "configure" +#line 14619 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14631,16 +14635,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14634: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14637: \$? = $ac_status" >&5 + echo "$as_me:14641: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14640: \"$ac_try\"") >&5 + { (eval echo "$as_me:14644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14643: \$? = $ac_status" >&5 + echo "$as_me:14647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -14651,7 +14655,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14654: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:14658: 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:14673: 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. @@ -14683,7 +14687,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:14686: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:14690: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -14797,23 +14801,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:14800: checking for dbmalloc.h" >&5 + echo "$as_me:14804: 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 14806 "configure" +#line 14810 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14810: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14814: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14816: \$? = $ac_status" >&5 + echo "$as_me:14820: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14832,11 +14836,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14835: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:14839: 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:14839: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:14843: 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 @@ -14844,7 +14848,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14847 "configure" +#line 14851 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14863,16 +14867,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14866: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14870: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14869: \$? = $ac_status" >&5 + echo "$as_me:14873: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14872: \"$ac_try\"") >&5 + { (eval echo "$as_me:14876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14875: \$? = $ac_status" >&5 + echo "$as_me:14879: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -14883,7 +14887,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14886: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:14890: 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:14905: 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. @@ -14915,7 +14919,7 @@ EOF else with_valgrind= fi; -echo "$as_me:14918: result: ${with_valgrind:-no}" >&5 +echo "$as_me:14922: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -15028,7 +15032,7 @@ fi ;; esac -echo "$as_me:15031: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:15035: 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. @@ -15038,7 +15042,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:15041: result: $with_no_leaks" >&5 +echo "$as_me:15045: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -15090,7 +15094,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:15093: checking whether to add trace feature to all models" >&5 +echo "$as_me:15097: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -15100,7 +15104,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:15103: result: $cf_with_trace" >&5 +echo "$as_me:15107: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -15210,7 +15214,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:15213: checking if we want to use GNAT projects" >&5 +echo "$as_me:15217: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -15227,7 +15231,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:15230: result: $enable_gnat_projects" >&5 +echo "$as_me:15234: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -15237,13 +15241,13 @@ case $cf_cv_system_name in LIBS=" -lpsapi $LIBS" ;; (*) -echo "$as_me:15240: checking for gettimeofday" >&5 +echo "$as_me:15244: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15246 "configure" +#line 15250 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -15274,16 +15278,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15277: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15281: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15280: \$? = $ac_status" >&5 + echo "$as_me:15284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15283: \"$ac_try\"") >&5 + { (eval echo "$as_me:15287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15286: \$? = $ac_status" >&5 + echo "$as_me:15290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -15293,7 +15297,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15296: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:15300: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then @@ -15303,7 +15307,7 @@ EOF else -echo "$as_me:15306: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:15310: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15311,7 +15315,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15314 "configure" +#line 15318 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15330,16 +15334,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15333: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15337: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15336: \$? = $ac_status" >&5 + echo "$as_me:15340: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15339: \"$ac_try\"") >&5 + { (eval echo "$as_me:15343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15342: \$? = $ac_status" >&5 + echo "$as_me:15346: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -15350,7 +15354,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15353: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:15357: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test $ac_cv_lib_bsd_gettimeofday = yes; then @@ -15380,14 +15384,14 @@ fi ;; esac -echo "$as_me:15383: checking if -lm needed for math functions" >&5 +echo "$as_me:15387: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15390 "configure" +#line 15394 "configure" #include "confdefs.h" #include @@ -15403,16 +15407,16 @@ double x = rand(); printf("result = %g\n", pow(sin(x),x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15409: \$? = $ac_status" >&5 + echo "$as_me:15413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15412: \"$ac_try\"") >&5 + { (eval echo "$as_me:15416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15415: \$? = $ac_status" >&5 + echo "$as_me:15419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -15422,7 +15426,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15425: result: $cf_cv_need_libm" >&5 +echo "$as_me:15429: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -15430,13 +15434,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:15433: checking for ANSI C header files" >&5 +echo "$as_me:15437: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15439 "configure" +#line 15443 "configure" #include "confdefs.h" #include #include @@ -15444,13 +15448,13 @@ else #include _ACEOF -if { (eval echo "$as_me:15447: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15451: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15453: \$? = $ac_status" >&5 + echo "$as_me:15457: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15472,7 +15476,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 15475 "configure" +#line 15479 "configure" #include "confdefs.h" #include @@ -15490,7 +15494,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 15493 "configure" +#line 15497 "configure" #include "confdefs.h" #include @@ -15511,7 +15515,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 15514 "configure" +#line 15518 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -15537,15 +15541,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15540: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15544: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15543: \$? = $ac_status" >&5 + echo "$as_me:15547: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15545: \"$ac_try\"") >&5 + { (eval echo "$as_me:15549: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15548: \$? = $ac_status" >&5 + echo "$as_me:15552: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15558,7 +15562,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:15561: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15565: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -15571,13 +15575,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:15574: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:15578: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15580 "configure" +#line 15584 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -15592,16 +15596,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15599: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15598: \$? = $ac_status" >&5 + echo "$as_me:15602: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15601: \"$ac_try\"") >&5 + { (eval echo "$as_me:15605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15604: \$? = $ac_status" >&5 + echo "$as_me:15608: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -15611,7 +15615,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15614: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15618: result: `eval echo '${'$as_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:15631: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15632,7 +15636,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15635 "configure" +#line 15639 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15651,16 +15655,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15654: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15657: \$? = $ac_status" >&5 + echo "$as_me:15661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15660: \"$ac_try\"") >&5 + { (eval echo "$as_me:15664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15663: \$? = $ac_status" >&5 + echo "$as_me:15667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -15671,14 +15675,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15674: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:15678: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:15681: checking for opendir in -lx" >&5 + echo "$as_me:15685: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15686,7 +15690,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15689 "configure" +#line 15693 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15705,16 +15709,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15708: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15712: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15711: \$? = $ac_status" >&5 + echo "$as_me:15715: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15714: \"$ac_try\"") >&5 + { (eval echo "$as_me:15718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15717: \$? = $ac_status" >&5 + echo "$as_me:15721: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -15725,7 +15729,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15728: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:15732: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -15733,13 +15737,13 @@ fi fi -echo "$as_me:15736: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:15740: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15742 "configure" +#line 15746 "configure" #include "confdefs.h" #include #include @@ -15755,16 +15759,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15761: \$? = $ac_status" >&5 + echo "$as_me:15765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15764: \"$ac_try\"") >&5 + { (eval echo "$as_me:15768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15767: \$? = $ac_status" >&5 + echo "$as_me:15771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -15774,7 +15778,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15777: result: $ac_cv_header_time" >&5 +echo "$as_me:15781: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -15793,13 +15797,13 @@ case $host_os in ;; esac -echo "$as_me:15796: checking for regcomp" >&5 +echo "$as_me:15800: checking for regcomp" >&5 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 if test "${ac_cv_func_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15802 "configure" +#line 15806 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -15830,16 +15834,16 @@ f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15833: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15837: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15836: \$? = $ac_status" >&5 + echo "$as_me:15840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15839: \"$ac_try\"") >&5 + { (eval echo "$as_me:15843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15842: \$? = $ac_status" >&5 + echo "$as_me:15846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -15849,7 +15853,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15852: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:15856: result: $ac_cv_func_regcomp" >&5 echo "${ECHO_T}$ac_cv_func_regcomp" >&6 if test $ac_cv_func_regcomp = yes; then cf_regex_func=regcomp @@ -15858,7 +15862,7 @@ else for cf_regex_lib in $cf_regex_libs do as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:15861: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:15865: checking for regcomp in -l$cf_regex_lib" >&5 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15866,7 +15870,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15869 "configure" +#line 15873 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15885,16 +15889,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15888: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15892: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15891: \$? = $ac_status" >&5 + echo "$as_me:15895: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15894: \"$ac_try\"") >&5 + { (eval echo "$as_me:15898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15897: \$? = $ac_status" >&5 + echo "$as_me:15901: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -15905,7 +15909,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15908: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:15912: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then @@ -15934,13 +15938,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:15937: checking for compile" >&5 + echo "$as_me:15941: checking for compile" >&5 echo $ECHO_N "checking for compile... $ECHO_C" >&6 if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15943 "configure" +#line 15947 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -15971,16 +15975,16 @@ f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15974: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15978: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15977: \$? = $ac_status" >&5 + echo "$as_me:15981: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15980: \"$ac_try\"") >&5 + { (eval echo "$as_me:15984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15983: \$? = $ac_status" >&5 + echo "$as_me:15987: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -15990,13 +15994,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15993: result: $ac_cv_func_compile" >&5 +echo "$as_me:15997: result: $ac_cv_func_compile" >&5 echo "${ECHO_T}$ac_cv_func_compile" >&6 if test $ac_cv_func_compile = yes; then cf_regex_func=compile else - echo "$as_me:15999: checking for compile in -lgen" >&5 + echo "$as_me:16003: checking for compile in -lgen" >&5 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16004,7 +16008,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16007 "configure" +#line 16011 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16023,16 +16027,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16026: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16030: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16029: \$? = $ac_status" >&5 + echo "$as_me:16033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16032: \"$ac_try\"") >&5 + { (eval echo "$as_me:16036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16035: \$? = $ac_status" >&5 + echo "$as_me:16039: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -16043,7 +16047,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16046: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:16050: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test $ac_cv_lib_gen_compile = yes; then @@ -16071,11 +16075,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:16074: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:16078: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:16078: checking for regular-expression headers" >&5 +echo "$as_me:16082: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16087,7 +16091,7 @@ case $cf_regex_func in for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 16090 "configure" +#line 16094 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -16102,16 +16106,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16105: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16108: \$? = $ac_status" >&5 + echo "$as_me:16112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16111: \"$ac_try\"") >&5 + { (eval echo "$as_me:16115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16114: \$? = $ac_status" >&5 + echo "$as_me:16118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16128,7 +16132,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext for cf_regex_hdr in regex.h do cat >conftest.$ac_ext <<_ACEOF -#line 16131 "configure" +#line 16135 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -16146,16 +16150,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16149: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16153: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16152: \$? = $ac_status" >&5 + echo "$as_me:16156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16155: \"$ac_try\"") >&5 + { (eval echo "$as_me:16159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16158: \$? = $ac_status" >&5 + echo "$as_me:16162: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16171,11 +16175,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:16174: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:16178: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in - (no) { echo "$as_me:16178: WARNING: no regular expression header found" >&5 + (no) { echo "$as_me:16182: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; (regex.h) cat >>confdefs.h <<\EOF @@ -16214,23 +16218,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16217: checking for $ac_header" >&5 +echo "$as_me:16221: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16223 "configure" +#line 16227 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16227: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16231: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16233: \$? = $ac_status" >&5 + echo "$as_me:16237: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16249,7 +16253,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16252: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16256: result: `eval echo '${'$as_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:16269: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16271 "configure" +#line 16275 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16275: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16279: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16281: \$? = $ac_status" >&5 + echo "$as_me:16285: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16297,7 +16301,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16300: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16304: result: `eval echo '${'$as_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:16314: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16317,7 +16321,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >conftest.$ac_ext <<_ACEOF -#line 16320 "configure" +#line 16324 "configure" #include "confdefs.h" #include <$cf_header> @@ -16330,16 +16334,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16333: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16337: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16336: \$? = $ac_status" >&5 + echo "$as_me:16340: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16339: \"$ac_try\"") >&5 + { (eval echo "$as_me:16343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16342: \$? = $ac_status" >&5 + echo "$as_me:16346: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -16351,7 +16355,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16354: result: $cf_cv_getopt_header" >&5 +echo "$as_me:16358: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -16372,7 +16376,7 @@ fi # Note: even non-Posix ISC needs to declare fd_set if test "x$ISC" = xyes ; then -echo "$as_me:16375: checking for main in -lcposix" >&5 +echo "$as_me:16379: checking for main in -lcposix" >&5 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16380,7 +16384,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16383 "configure" +#line 16387 "configure" #include "confdefs.h" int @@ -16392,16 +16396,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16395: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16398: \$? = $ac_status" >&5 + echo "$as_me:16402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16401: \"$ac_try\"") >&5 + { (eval echo "$as_me:16405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16404: \$? = $ac_status" >&5 + echo "$as_me:16408: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -16412,7 +16416,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16415: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:16419: result: $ac_cv_lib_cposix_main" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 if test $ac_cv_lib_cposix_main = yes; then cat >>confdefs.h <&5 + echo "$as_me:16430: checking for bzero in -linet" >&5 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_bzero+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16431,7 +16435,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16434 "configure" +#line 16438 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16450,16 +16454,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16453: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16457: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16456: \$? = $ac_status" >&5 + echo "$as_me:16460: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16459: \"$ac_try\"") >&5 + { (eval echo "$as_me:16463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16462: \$? = $ac_status" >&5 + echo "$as_me:16466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -16470,7 +16474,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16473: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:16477: result: $ac_cv_lib_inet_bzero" >&5 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 if test $ac_cv_lib_inet_bzero = yes; then @@ -16493,14 +16497,14 @@ LIBS="$cf_add_libs" fi fi -echo "$as_me:16496: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:16500: 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 16503 "configure" +#line 16507 "configure" #include "confdefs.h" #include @@ -16520,16 +16524,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16523: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16526: \$? = $ac_status" >&5 + echo "$as_me:16530: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16529: \"$ac_try\"") >&5 + { (eval echo "$as_me:16533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16532: \$? = $ac_status" >&5 + echo "$as_me:16536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -16541,7 +16545,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16544: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:16548: 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 @@ -16556,13 +16560,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:16559: checking for an ANSI C-conforming const" >&5 +echo "$as_me:16563: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16565 "configure" +#line 16569 "configure" #include "confdefs.h" int @@ -16620,16 +16624,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16623: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16627: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16626: \$? = $ac_status" >&5 + echo "$as_me:16630: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16629: \"$ac_try\"") >&5 + { (eval echo "$as_me:16633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16632: \$? = $ac_status" >&5 + echo "$as_me:16636: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -16639,7 +16643,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16642: result: $ac_cv_c_const" >&5 +echo "$as_me:16646: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -16649,7 +16653,7 @@ EOF fi -echo "$as_me:16652: checking for inline" >&5 +echo "$as_me:16656: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16657,7 +16661,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 16660 "configure" +#line 16664 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -16666,16 +16670,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16669: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16673: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16672: \$? = $ac_status" >&5 + echo "$as_me:16676: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16675: \"$ac_try\"") >&5 + { (eval echo "$as_me:16679: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16678: \$? = $ac_status" >&5 + echo "$as_me:16682: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -16686,7 +16690,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16689: result: $ac_cv_c_inline" >&5 +echo "$as_me:16693: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -16712,7 +16716,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:16715: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:16719: checking if $CC supports options to tune inlining" >&5 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16721,7 +16725,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 16724 "configure" +#line 16728 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -16733,16 +16737,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16736: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16740: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16739: \$? = $ac_status" >&5 + echo "$as_me:16743: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16742: \"$ac_try\"") >&5 + { (eval echo "$as_me:16746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16745: \$? = $ac_status" >&5 + echo "$as_me:16749: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -16754,7 +16758,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:16757: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:16761: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -16860,7 +16864,7 @@ fi fi fi -echo "$as_me:16863: checking for signal global datatype" >&5 +echo "$as_me:16867: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16872,7 +16876,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 16875 "configure" +#line 16879 "configure" #include "confdefs.h" #include @@ -16895,16 +16899,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16898: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16902: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16901: \$? = $ac_status" >&5 + echo "$as_me:16905: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16904: \"$ac_try\"") >&5 + { (eval echo "$as_me:16908: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16907: \$? = $ac_status" >&5 + echo "$as_me:16911: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -16918,7 +16922,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16921: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:16925: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:16934: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16937,7 +16941,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 16940 "configure" +#line 16944 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -16972,15 +16976,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16975: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16979: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16978: \$? = $ac_status" >&5 + echo "$as_me:16982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16980: \"$ac_try\"") >&5 + { (eval echo "$as_me:16984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16983: \$? = $ac_status" >&5 + echo "$as_me:16987: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -16995,7 +16999,7 @@ fi fi -echo "$as_me:16998: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:17002: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:17014: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17017 "configure" +#line 17021 "configure" #include "confdefs.h" int @@ -17026,16 +17030,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17029: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17032: \$? = $ac_status" >&5 + echo "$as_me:17036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17035: \"$ac_try\"") >&5 + { (eval echo "$as_me:17039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17038: \$? = $ac_status" >&5 + echo "$as_me:17042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -17047,7 +17051,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17050: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:17054: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -17063,14 +17067,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:17066: checking if external errno is declared" >&5 +echo "$as_me:17070: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17073 "configure" +#line 17077 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -17088,16 +17092,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17091: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17095: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17094: \$? = $ac_status" >&5 + echo "$as_me:17098: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17097: \"$ac_try\"") >&5 + { (eval echo "$as_me:17101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17100: \$? = $ac_status" >&5 + echo "$as_me:17104: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -17108,7 +17112,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17111: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:17115: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -17123,14 +17127,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:17126: checking if external errno exists" >&5 +echo "$as_me:17130: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17133 "configure" +#line 17137 "configure" #include "confdefs.h" #undef errno @@ -17145,16 +17149,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17148: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17152: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17151: \$? = $ac_status" >&5 + echo "$as_me:17155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17154: \"$ac_try\"") >&5 + { (eval echo "$as_me:17158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17157: \$? = $ac_status" >&5 + echo "$as_me:17161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -17165,7 +17169,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17168: result: $cf_cv_have_errno" >&5 +echo "$as_me:17172: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -17178,7 +17182,7 @@ EOF fi -echo "$as_me:17181: checking if data-only library module links" >&5 +echo "$as_me:17185: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17186,20 +17190,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17196: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17195: \$? = $ac_status" >&5 + echo "$as_me:17199: \$? = $ac_status" >&5 (exit $ac_status); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17218: \$? = $ac_status" >&5 + echo "$as_me:17222: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -17228,7 +17232,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17231 "configure" +#line 17235 "configure" #include "confdefs.h" int main(void) @@ -17239,15 +17243,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17242: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17246: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17245: \$? = $ac_status" >&5 + echo "$as_me:17249: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17247: \"$ac_try\"") >&5 + { (eval echo "$as_me:17251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17250: \$? = $ac_status" >&5 + echo "$as_me:17254: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -17262,7 +17266,7 @@ fi fi -echo "$as_me:17265: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17269: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17301,13 +17305,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17304: checking for $ac_func" >&5 +echo "$as_me:17308: 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 17310 "configure" +#line 17314 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17338,16 +17342,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17341: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17344: \$? = $ac_status" >&5 + echo "$as_me:17348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17347: \"$ac_try\"") >&5 + { (eval echo "$as_me:17351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17350: \$? = $ac_status" >&5 + echo "$as_me:17354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17357,7 +17361,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17360: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17364: 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:17376: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:17379: checking for terminal-capability database functions" >&5 +echo "$as_me:17383: 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 17386 "configure" +#line 17390 "configure" #include "confdefs.h" #include @@ -17403,16 +17407,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17409: \$? = $ac_status" >&5 + echo "$as_me:17413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17412: \"$ac_try\"") >&5 + { (eval echo "$as_me:17416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17415: \$? = $ac_status" >&5 + echo "$as_me:17419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -17423,7 +17427,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17426: result: $cf_cv_cgetent" >&5 +echo "$as_me:17430: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -17433,14 +17437,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:17436: checking if cgetent uses const parameter" >&5 +echo "$as_me:17440: 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 17443 "configure" +#line 17447 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -17463,16 +17467,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17469: \$? = $ac_status" >&5 + echo "$as_me:17473: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17472: \"$ac_try\"") >&5 + { (eval echo "$as_me:17476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17475: \$? = $ac_status" >&5 + echo "$as_me:17479: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -17483,7 +17487,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17486: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:17490: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -17497,14 +17501,14 @@ fi fi -echo "$as_me:17500: checking for isascii" >&5 +echo "$as_me:17504: 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 17507 "configure" +#line 17511 "configure" #include "confdefs.h" #include int @@ -17516,16 +17520,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17519: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17523: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17522: \$? = $ac_status" >&5 + echo "$as_me:17526: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17525: \"$ac_try\"") >&5 + { (eval echo "$as_me:17529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17528: \$? = $ac_status" >&5 + echo "$as_me:17532: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -17536,7 +17540,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17539: result: $cf_cv_have_isascii" >&5 +echo "$as_me:17543: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -17544,10 +17548,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:17547: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:17551: 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 17550 "configure" +#line 17554 "configure" #include "confdefs.h" #include @@ -17561,16 +17565,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17567: \$? = $ac_status" >&5 + echo "$as_me:17571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17570: \"$ac_try\"") >&5 + { (eval echo "$as_me:17574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17573: \$? = $ac_status" >&5 + echo "$as_me:17577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -17578,7 +17582,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17581 "configure" +#line 17585 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -17593,16 +17597,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17596: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17599: \$? = $ac_status" >&5 + echo "$as_me:17603: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17602: \"$ac_try\"") >&5 + { (eval echo "$as_me:17606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17605: \$? = $ac_status" >&5 + echo "$as_me:17609: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -17618,11 +17622,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17621: result: $sigact_bad" >&5 +echo "$as_me:17625: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:17625: checking if nanosleep really works" >&5 +echo "$as_me:17629: 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 @@ -17632,7 +17636,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17635 "configure" +#line 17639 "configure" #include "confdefs.h" #include @@ -17657,15 +17661,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17660: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17664: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17663: \$? = $ac_status" >&5 + echo "$as_me:17667: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17665: \"$ac_try\"") >&5 + { (eval echo "$as_me:17669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17668: \$? = $ac_status" >&5 + echo "$as_me:17672: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -17677,7 +17681,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17680: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:17684: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -17692,23 +17696,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17695: checking for $ac_header" >&5 +echo "$as_me:17699: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17701 "configure" +#line 17705 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17705: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17709: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17711: \$? = $ac_status" >&5 + echo "$as_me:17715: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17727,7 +17731,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17730: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17734: result: `eval echo '${'$as_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:17749: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17751 "configure" +#line 17755 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17755: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17759: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17761: \$? = $ac_status" >&5 + echo "$as_me:17765: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17777,7 +17781,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17780: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17784: result: `eval echo '${'$as_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:17802: 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 17801 "configure" +#line 17805 "configure" #include "confdefs.h" #include int @@ -17810,16 +17814,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17813: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17817: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17816: \$? = $ac_status" >&5 + echo "$as_me:17820: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17819: \"$ac_try\"") >&5 + { (eval echo "$as_me:17823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17822: \$? = $ac_status" >&5 + echo "$as_me:17826: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -17827,7 +17831,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17830 "configure" +#line 17834 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -17841,16 +17845,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17844: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17847: \$? = $ac_status" >&5 + echo "$as_me:17851: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17850: \"$ac_try\"") >&5 + { (eval echo "$as_me:17854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17853: \$? = $ac_status" >&5 + echo "$as_me:17857: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -17866,19 +17870,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:17869: result: $termios_bad" >&5 + echo "$as_me:17873: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:17874: checking for tcgetattr" >&5 +echo "$as_me:17878: 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 17881 "configure" +#line 17885 "configure" #include "confdefs.h" #include @@ -17906,16 +17910,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17909: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17913: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17912: \$? = $ac_status" >&5 + echo "$as_me:17916: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17915: \"$ac_try\"") >&5 + { (eval echo "$as_me:17919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17918: \$? = $ac_status" >&5 + echo "$as_me:17922: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -17925,21 +17929,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17928: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:17932: 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:17935: checking for vsscanf function or workaround" >&5 +echo "$as_me:17939: 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 17942 "configure" +#line 17946 "configure" #include "confdefs.h" #include @@ -17955,16 +17959,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17958: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17962: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17961: \$? = $ac_status" >&5 + echo "$as_me:17965: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17964: \"$ac_try\"") >&5 + { (eval echo "$as_me:17968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17967: \$? = $ac_status" >&5 + echo "$as_me:17971: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -17972,7 +17976,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17975 "configure" +#line 17979 "configure" #include "confdefs.h" #include @@ -17994,16 +17998,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17997: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18000: \$? = $ac_status" >&5 + echo "$as_me:18004: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18003: \"$ac_try\"") >&5 + { (eval echo "$as_me:18007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18006: \$? = $ac_status" >&5 + echo "$as_me:18010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -18011,7 +18015,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18014 "configure" +#line 18018 "configure" #include "confdefs.h" #include @@ -18033,16 +18037,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18040: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18039: \$? = $ac_status" >&5 + echo "$as_me:18043: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18042: \"$ac_try\"") >&5 + { (eval echo "$as_me:18046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18045: \$? = $ac_status" >&5 + echo "$as_me:18049: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -18057,7 +18061,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:18060: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:18064: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in @@ -18083,23 +18087,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18086: checking for $ac_header" >&5 +echo "$as_me:18090: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18092 "configure" +#line 18096 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18096: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18100: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18102: \$? = $ac_status" >&5 + echo "$as_me:18106: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18118,7 +18122,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18121: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18125: result: `eval echo '${'$as_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:18135: 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 @@ -18139,7 +18143,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 18142 "configure" +#line 18146 "configure" #include "confdefs.h" #include @@ -18180,15 +18184,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18183: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18187: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18186: \$? = $ac_status" >&5 + echo "$as_me:18190: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18188: \"$ac_try\"") >&5 + { (eval echo "$as_me:18192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18191: \$? = $ac_status" >&5 + echo "$as_me:18195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -18203,16 +18207,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18206: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:18210: 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:18209: checking for mkstemp" >&5 + echo "$as_me:18213: 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 18215 "configure" +#line 18219 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -18243,16 +18247,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18249: \$? = $ac_status" >&5 + echo "$as_me:18253: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18252: \"$ac_try\"") >&5 + { (eval echo "$as_me:18256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18255: \$? = $ac_status" >&5 + echo "$as_me:18259: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -18262,7 +18266,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18265: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:18269: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -18283,21 +18287,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:18286: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:18290: 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:18289: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:18293: 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:18295: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18299: 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 18300 "configure" +#line 18304 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -18314,15 +18318,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18321: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18320: \$? = $ac_status" >&5 + echo "$as_me:18324: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18322: \"$ac_try\"") >&5 + { (eval echo "$as_me:18326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18325: \$? = $ac_status" >&5 + echo "$as_me:18329: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -18335,7 +18339,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:18338: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:18342: 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 @@ -18346,13 +18350,13 @@ EOF fi fi -echo "$as_me:18349: checking for intptr_t" >&5 +echo "$as_me:18353: 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 18355 "configure" +#line 18359 "configure" #include "confdefs.h" $ac_includes_default int @@ -18367,16 +18371,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18370: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18373: \$? = $ac_status" >&5 + echo "$as_me:18377: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18376: \"$ac_try\"") >&5 + { (eval echo "$as_me:18380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18379: \$? = $ac_status" >&5 + echo "$as_me:18383: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -18386,7 +18390,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18389: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:18393: 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 : @@ -18398,13 +18402,13 @@ EOF fi -echo "$as_me:18401: checking for ssize_t" >&5 +echo "$as_me:18405: 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 18407 "configure" +#line 18411 "configure" #include "confdefs.h" $ac_includes_default int @@ -18419,16 +18423,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18422: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18426: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18425: \$? = $ac_status" >&5 + echo "$as_me:18429: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18428: \"$ac_try\"") >&5 + { (eval echo "$as_me:18432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18431: \$? = $ac_status" >&5 + echo "$as_me:18435: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ssize_t=yes else @@ -18438,7 +18442,7 @@ ac_cv_type_ssize_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18441: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:18445: 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 : @@ -18450,14 +18454,14 @@ EOF fi -echo "$as_me:18453: checking for type sigaction_t" >&5 +echo "$as_me:18457: 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 18460 "configure" +#line 18464 "configure" #include "confdefs.h" #include @@ -18470,16 +18474,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18477: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18476: \$? = $ac_status" >&5 + echo "$as_me:18480: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18479: \"$ac_try\"") >&5 + { (eval echo "$as_me:18483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18482: \$? = $ac_status" >&5 + echo "$as_me:18486: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -18490,14 +18494,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18493: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:18497: 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:18500: checking declaration of size-change" >&5 +echo "$as_me:18504: 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 @@ -18512,7 +18516,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 18515 "configure" +#line 18519 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -18556,16 +18560,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18559: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18563: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18562: \$? = $ac_status" >&5 + echo "$as_me:18566: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18565: \"$ac_try\"") >&5 + { (eval echo "$as_me:18569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18568: \$? = $ac_status" >&5 + echo "$as_me:18572: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -18584,7 +18588,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:18587: result: $cf_cv_sizechange" >&5 +echo "$as_me:18591: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -18602,13 +18606,13 @@ EOF esac fi -echo "$as_me:18605: checking for memmove" >&5 +echo "$as_me:18609: 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 18611 "configure" +#line 18615 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -18639,16 +18643,16 @@ f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18642: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18646: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18645: \$? = $ac_status" >&5 + echo "$as_me:18649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18648: \"$ac_try\"") >&5 + { (eval echo "$as_me:18652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18651: \$? = $ac_status" >&5 + echo "$as_me:18655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -18658,19 +18662,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18661: result: $ac_cv_func_memmove" >&5 +echo "$as_me:18665: 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:18667: checking for bcopy" >&5 +echo "$as_me:18671: 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 18673 "configure" +#line 18677 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -18701,16 +18705,16 @@ f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18708: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18707: \$? = $ac_status" >&5 + echo "$as_me:18711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18710: \"$ac_try\"") >&5 + { (eval echo "$as_me:18714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18713: \$? = $ac_status" >&5 + echo "$as_me:18717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -18720,11 +18724,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18723: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:18727: 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:18727: checking if bcopy does overlapping moves" >&5 + echo "$as_me:18731: 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 @@ -18734,7 +18738,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18737 "configure" +#line 18741 "configure" #include "confdefs.h" int main(void) { @@ -18748,15 +18752,15 @@ int main(void) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18751: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18755: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18754: \$? = $ac_status" >&5 + echo "$as_me:18758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18756: \"$ac_try\"") >&5 + { (eval echo "$as_me:18760: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18759: \$? = $ac_status" >&5 + echo "$as_me:18763: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -18769,7 +18773,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18772: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:18776: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -18796,13 +18800,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:18799: checking for $ac_func" >&5 +echo "$as_me:18803: 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 18805 "configure" +#line 18809 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -18833,16 +18837,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18836: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18840: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18839: \$? = $ac_status" >&5 + echo "$as_me:18843: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18842: \"$ac_try\"") >&5 + { (eval echo "$as_me:18846: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18845: \$? = $ac_status" >&5 + echo "$as_me:18849: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -18852,7 +18856,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18855: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:18859: 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:18869: 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 @@ -18872,7 +18876,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18875 "configure" +#line 18879 "configure" #include "confdefs.h" #include @@ -18924,15 +18928,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18927: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18931: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18930: \$? = $ac_status" >&5 + echo "$as_me:18934: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18932: \"$ac_try\"") >&5 + { (eval echo "$as_me:18936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18935: \$? = $ac_status" >&5 + echo "$as_me:18939: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -18944,21 +18948,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18947: result: $cf_cv_working_poll" >&5 +echo "$as_me:18951: 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:18954: checking for va_copy" >&5 +echo "$as_me:18958: 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 18961 "configure" +#line 18965 "configure" #include "confdefs.h" #include @@ -18975,16 +18979,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18978: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18982: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18981: \$? = $ac_status" >&5 + echo "$as_me:18985: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18984: \"$ac_try\"") >&5 + { (eval echo "$as_me:18988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18987: \$? = $ac_status" >&5 + echo "$as_me:18991: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -18994,7 +18998,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:18997: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:19001: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && @@ -19002,14 +19006,14 @@ cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:19005: checking for __va_copy" >&5 +echo "$as_me:19009: 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 19012 "configure" +#line 19016 "configure" #include "confdefs.h" #include @@ -19026,16 +19030,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19029: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19032: \$? = $ac_status" >&5 + echo "$as_me:19036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19035: \"$ac_try\"") >&5 + { (eval echo "$as_me:19039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19038: \$? = $ac_status" >&5 + echo "$as_me:19042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -19045,7 +19049,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19048: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:19052: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && @@ -19053,13 +19057,13 @@ cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:19056: checking for pid_t" >&5 +echo "$as_me:19060: 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 19062 "configure" +#line 19066 "configure" #include "confdefs.h" $ac_includes_default int @@ -19074,16 +19078,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19077: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19081: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19080: \$? = $ac_status" >&5 + echo "$as_me:19084: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19083: \"$ac_try\"") >&5 + { (eval echo "$as_me:19087: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19086: \$? = $ac_status" >&5 + echo "$as_me:19090: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -19093,7 +19097,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19096: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:19100: 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 : @@ -19108,23 +19112,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:19111: checking for $ac_header" >&5 +echo "$as_me:19115: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19117 "configure" +#line 19121 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19121: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19125: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:19127: \$? = $ac_status" >&5 + echo "$as_me:19131: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19143,7 +19147,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19146: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19150: result: `eval echo '${'$as_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:19163: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19165 "configure" +#line 19169 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -19193,16 +19197,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19196: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19200: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19199: \$? = $ac_status" >&5 + echo "$as_me:19203: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19202: \"$ac_try\"") >&5 + { (eval echo "$as_me:19206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19205: \$? = $ac_status" >&5 + echo "$as_me:19209: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -19212,7 +19216,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19215: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:19219: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:19231: 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 @@ -19247,15 +19251,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19250: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19254: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19253: \$? = $ac_status" >&5 + echo "$as_me:19257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19255: \"$ac_try\"") >&5 + { (eval echo "$as_me:19259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19258: \$? = $ac_status" >&5 + echo "$as_me:19262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -19267,7 +19271,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19270: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:19274: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -19281,12 +19285,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:19284: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19288: 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:19289: checking for working vfork" >&5 + echo "$as_me:19293: 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 @@ -19295,7 +19299,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 19298 "configure" +#line 19302 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -19392,15 +19396,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19395: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19398: \$? = $ac_status" >&5 + echo "$as_me:19402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19400: \"$ac_try\"") >&5 + { (eval echo "$as_me:19404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19403: \$? = $ac_status" >&5 + echo "$as_me:19407: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -19412,13 +19416,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:19415: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:19419: 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:19421: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19425: 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 @@ -19445,7 +19449,7 @@ fi # special check for test/ditto.c -echo "$as_me:19448: checking for openpty in -lutil" >&5 +echo "$as_me:19452: 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 @@ -19453,7 +19457,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19456 "configure" +#line 19460 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19472,16 +19476,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19475: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19479: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19478: \$? = $ac_status" >&5 + echo "$as_me:19482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19481: \"$ac_try\"") >&5 + { (eval echo "$as_me:19485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19484: \$? = $ac_status" >&5 + echo "$as_me:19488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -19492,7 +19496,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19495: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19499: 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 @@ -19500,7 +19504,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19503: checking for openpty header" >&5 +echo "$as_me:19507: 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 @@ -19527,7 +19531,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 19530 "configure" +#line 19534 "configure" #include "confdefs.h" #include <$cf_header> @@ -19544,16 +19548,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19547: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19551: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19550: \$? = $ac_status" >&5 + echo "$as_me:19554: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19553: \"$ac_try\"") >&5 + { (eval echo "$as_me:19557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19556: \$? = $ac_status" >&5 + echo "$as_me:19560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -19571,7 +19575,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:19574: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19578: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19641,7 +19645,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 19644 "configure" +#line 19648 "configure" #include "confdefs.h" #include int @@ -19653,16 +19657,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19660: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19659: \$? = $ac_status" >&5 + echo "$as_me:19663: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19662: \"$ac_try\"") >&5 + { (eval echo "$as_me:19666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19665: \$? = $ac_status" >&5 + echo "$as_me:19669: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -19679,7 +19683,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}:19682: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19686: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19715,7 +19719,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}:19718: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19722: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19726,7 +19730,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:19729: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:19733: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -19795,7 +19799,7 @@ if test -n "$cf_item" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 19798 "configure" +#line 19802 "configure" #include "confdefs.h" #include int @@ -19807,16 +19811,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19810: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19814: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19813: \$? = $ac_status" >&5 + echo "$as_me:19817: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19816: \"$ac_try\"") >&5 + { (eval echo "$as_me:19820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19819: \$? = $ac_status" >&5 + echo "$as_me:19823: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -19833,7 +19837,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}:19836: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19840: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19913,7 +19917,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}:19916: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19920: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19930,23 +19934,23 @@ fi fi esac -echo "$as_me:19933: checking for db.h" >&5 +echo "$as_me:19937: 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 19939 "configure" +#line 19943 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:19943: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19947: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:19949: \$? = $ac_status" >&5 + echo "$as_me:19953: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19965,11 +19969,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19968: result: $ac_cv_header_db_h" >&5 +echo "$as_me:19972: 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:19972: checking for version of db" >&5 +echo "$as_me:19976: 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 @@ -19980,10 +19984,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:19983: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:19987: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 19986 "configure" +#line 19990 "configure" #include "confdefs.h" $ac_includes_default @@ -20013,16 +20017,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20016: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20020: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20019: \$? = $ac_status" >&5 + echo "$as_me:20023: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20022: \"$ac_try\"") >&5 + { (eval echo "$as_me:20026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20025: \$? = $ac_status" >&5 + echo "$as_me:20029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -20036,16 +20040,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:20039: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:20043: 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:20043: error: Cannot determine version of db" >&5 + { { echo "$as_me:20047: 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:20048: checking for db libraries" >&5 +echo "$as_me:20052: 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 @@ -20075,10 +20079,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:20078: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:20082: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 20081 "configure" +#line 20085 "configure" #include "confdefs.h" $ac_includes_default @@ -20133,16 +20137,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20136: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20140: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20139: \$? = $ac_status" >&5 + echo "$as_me:20143: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20142: \"$ac_try\"") >&5 + { (eval echo "$as_me:20146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20145: \$? = $ac_status" >&5 + echo "$as_me:20149: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -20162,11 +20166,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:20165: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:20169: 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:20169: error: Cannot determine library for db" >&5 + { { echo "$as_me:20173: 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 @@ -20192,7 +20196,7 @@ fi else - { { echo "$as_me:20195: error: Cannot find db.h" >&5 + { { echo "$as_me:20199: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -20207,7 +20211,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:20210: checking if we should include stdbool.h" >&5 +echo "$as_me:20214: 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 @@ -20215,7 +20219,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 20218 "configure" +#line 20222 "configure" #include "confdefs.h" int @@ -20227,23 +20231,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20230: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20233: \$? = $ac_status" >&5 + echo "$as_me:20237: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20236: \"$ac_try\"") >&5 + { (eval echo "$as_me:20240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20239: \$? = $ac_status" >&5 + echo "$as_me:20243: \$? = $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 20246 "configure" +#line 20250 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -20259,16 +20263,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20262: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20265: \$? = $ac_status" >&5 + echo "$as_me:20269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20268: \"$ac_try\"") >&5 + { (eval echo "$as_me:20272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20271: \$? = $ac_status" >&5 + echo "$as_me:20275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -20282,13 +20286,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:20285: result: yes" >&5 +then echo "$as_me:20289: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:20287: result: no" >&5 +else echo "$as_me:20291: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:20291: checking for builtin bool type" >&5 +echo "$as_me:20295: 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 @@ -20296,7 +20300,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 20299 "configure" +#line 20303 "configure" #include "confdefs.h" #include @@ -20311,16 +20315,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20314: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20318: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20317: \$? = $ac_status" >&5 + echo "$as_me:20321: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20320: \"$ac_try\"") >&5 + { (eval echo "$as_me:20324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20323: \$? = $ac_status" >&5 + echo "$as_me:20327: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -20333,9 +20337,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:20336: result: yes" >&5 +then echo "$as_me:20340: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:20338: result: no" >&5 +else echo "$as_me:20342: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20352,10 +20356,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:20355: checking if we already have C++ library" >&5 + echo "$as_me:20359: 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 20358 "configure" +#line 20362 "configure" #include "confdefs.h" #include @@ -20369,16 +20373,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20372: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20376: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20375: \$? = $ac_status" >&5 + echo "$as_me:20379: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20378: \"$ac_try\"") >&5 + { (eval echo "$as_me:20382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20381: \$? = $ac_status" >&5 + echo "$as_me:20385: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_libstdcpp=yes else @@ -20387,7 +20391,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:20390: result: $cf_have_libstdcpp" >&5 + echo "$as_me:20394: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -20406,7 +20410,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:20409: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:20413: 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 @@ -20432,7 +20436,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 20435 "configure" +#line 20439 "configure" #include "confdefs.h" #include @@ -20446,16 +20450,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20449: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20453: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20452: \$? = $ac_status" >&5 + echo "$as_me:20456: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20455: \"$ac_try\"") >&5 + { (eval echo "$as_me:20459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20458: \$? = $ac_status" >&5 + echo "$as_me:20462: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -20467,7 +20471,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:20470: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:20474: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="-l$cf_stdcpp_libname" @@ -20489,7 +20493,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:20492: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:20496: 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 @@ -20504,15 +20508,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:20507: \"$ac_try\"") >&5 +if { (eval echo "$as_me:20511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20510: \$? = $ac_status" >&5 + echo "$as_me:20514: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:20512: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:20516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20515: \$? = $ac_status" >&5 + echo "$as_me:20519: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -20523,10 +20527,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:20526: result: yes" >&5 + echo "$as_me:20530: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:20529: result: no" >&5 + echo "$as_me:20533: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20546,7 +20550,7 @@ case $cf_cv_system_name in ;; esac if test "$GXX" = yes; then - echo "$as_me:20549: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:20553: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -20567,7 +20571,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 20570 "configure" +#line 20574 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -20581,16 +20585,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20584: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20588: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20587: \$? = $ac_status" >&5 + echo "$as_me:20591: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20590: \"$ac_try\"") >&5 + { (eval echo "$as_me:20594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20593: \$? = $ac_status" >&5 + echo "$as_me:20597: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -20627,7 +20631,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 20630 "configure" +#line 20634 "configure" #include "confdefs.h" #include @@ -20641,16 +20645,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20648: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20647: \$? = $ac_status" >&5 + echo "$as_me:20651: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20650: \"$ac_try\"") >&5 + { (eval echo "$as_me:20654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20653: \$? = $ac_status" >&5 + echo "$as_me:20657: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -20683,7 +20687,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:20686: result: $cf_cxx_library" >&5 + echo "$as_me:20690: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -20699,7 +20703,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:20702: checking how to run the C++ preprocessor" >&5 +echo "$as_me:20706: 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 @@ -20716,18 +20720,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 20719 "configure" +#line 20723 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:20724: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20728: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20730: \$? = $ac_status" >&5 + echo "$as_me:20734: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20750,17 +20754,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 20753 "configure" +#line 20757 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20757: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20761: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20763: \$? = $ac_status" >&5 + echo "$as_me:20767: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20797,7 +20801,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:20800: result: $CXXCPP" >&5 +echo "$as_me:20804: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -20807,18 +20811,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 20810 "configure" +#line 20814 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:20815: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20819: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20821: \$? = $ac_status" >&5 + echo "$as_me:20825: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20841,17 +20845,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 20844 "configure" +#line 20848 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20848: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20852: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20854: \$? = $ac_status" >&5 + echo "$as_me:20858: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20879,7 +20883,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:20882: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:20886: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -20894,23 +20898,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:20897: checking for $ac_header" >&5 +echo "$as_me:20901: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20903 "configure" +#line 20907 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20907: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20911: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20913: \$? = $ac_status" >&5 + echo "$as_me:20917: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20929,7 +20933,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20932: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20936: result: `eval echo '${'$as_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:20949: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20951 "configure" +#line 20955 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20955: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20959: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20961: \$? = $ac_status" >&5 + echo "$as_me:20965: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -20977,7 +20981,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20980: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20984: result: `eval echo '${'$as_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:20995: 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 20994 "configure" +#line 20998 "configure" #include "confdefs.h" #include @@ -21008,16 +21012,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21015: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21014: \$? = $ac_status" >&5 + echo "$as_me:21018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21017: \"$ac_try\"") >&5 + { (eval echo "$as_me:21021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21020: \$? = $ac_status" >&5 + echo "$as_me:21024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -21026,7 +21030,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:21029: result: $cf_iostream_namespace" >&5 + echo "$as_me:21033: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -21037,7 +21041,7 @@ EOF fi fi -echo "$as_me:21040: checking if we should include stdbool.h" >&5 +echo "$as_me:21044: 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 @@ -21045,7 +21049,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 21048 "configure" +#line 21052 "configure" #include "confdefs.h" int @@ -21057,23 +21061,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21060: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21064: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21063: \$? = $ac_status" >&5 + echo "$as_me:21067: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21066: \"$ac_try\"") >&5 + { (eval echo "$as_me:21070: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21069: \$? = $ac_status" >&5 + echo "$as_me:21073: \$? = $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 21076 "configure" +#line 21080 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -21089,16 +21093,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21092: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21095: \$? = $ac_status" >&5 + echo "$as_me:21099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21098: \"$ac_try\"") >&5 + { (eval echo "$as_me:21102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21101: \$? = $ac_status" >&5 + echo "$as_me:21105: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -21112,13 +21116,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:21115: result: yes" >&5 +then echo "$as_me:21119: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:21117: result: no" >&5 +else echo "$as_me:21121: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:21121: checking for builtin bool type" >&5 +echo "$as_me:21125: 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 @@ -21126,7 +21130,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 21129 "configure" +#line 21133 "configure" #include "confdefs.h" #include @@ -21141,16 +21145,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21144: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21148: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21147: \$? = $ac_status" >&5 + echo "$as_me:21151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21150: \"$ac_try\"") >&5 + { (eval echo "$as_me:21154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21153: \$? = $ac_status" >&5 + echo "$as_me:21157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -21163,13 +21167,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:21166: result: yes" >&5 +then echo "$as_me:21170: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:21168: result: no" >&5 +else echo "$as_me:21172: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:21172: checking for size of bool" >&5 +echo "$as_me:21176: 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 @@ -21180,7 +21184,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21183 "configure" +#line 21187 "configure" #include "confdefs.h" #include @@ -21222,15 +21226,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21225: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21229: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21228: \$? = $ac_status" >&5 + echo "$as_me:21232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21230: \"$ac_try\"") >&5 + { (eval echo "$as_me:21234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21233: \$? = $ac_status" >&5 + echo "$as_me:21237: \$? = $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 @@ -21248,18 +21252,18 @@ fi fi rm -f cf_test.out -echo "$as_me:21251: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21255: 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:21257: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21261: 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:21262: checking for special defines needed for etip.h" >&5 +echo "$as_me:21266: 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" @@ -21277,7 +21281,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 21280 "configure" +#line 21284 "configure" #include "confdefs.h" #include @@ -21291,16 +21295,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21298: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21297: \$? = $ac_status" >&5 + echo "$as_me:21301: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21300: \"$ac_try\"") >&5 + { (eval echo "$as_me:21304: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21303: \$? = $ac_status" >&5 + echo "$as_me:21307: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:21328: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:21329: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:21333: 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 @@ -21343,7 +21347,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21346 "configure" +#line 21350 "configure" #include "confdefs.h" class TEST { @@ -21362,15 +21366,15 @@ int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21365: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21369: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21368: \$? = $ac_status" >&5 + echo "$as_me:21372: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21370: \"$ac_try\"") >&5 + { (eval echo "$as_me:21374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21373: \$? = $ac_status" >&5 + echo "$as_me:21377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -21389,7 +21393,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:21392: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:21396: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -21399,7 +21403,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:21402: checking if $CXX accepts static_cast" >&5 +echo "$as_me:21406: 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 @@ -21413,7 +21417,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 21416 "configure" +#line 21420 "configure" #include "confdefs.h" class NCursesPanel @@ -21457,16 +21461,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21460: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21464: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21463: \$? = $ac_status" >&5 + echo "$as_me:21467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21466: \"$ac_try\"") >&5 + { (eval echo "$as_me:21470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21469: \$? = $ac_status" >&5 + echo "$as_me:21473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -21484,7 +21488,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:21487: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:21491: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -21533,7 +21537,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:21536: checking for size of bool" >&5 +echo "$as_me:21540: 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 @@ -21544,7 +21548,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 21547 "configure" +#line 21551 "configure" #include "confdefs.h" #include @@ -21586,15 +21590,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21589: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21593: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21592: \$? = $ac_status" >&5 + echo "$as_me:21596: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21594: \"$ac_try\"") >&5 + { (eval echo "$as_me:21598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21597: \$? = $ac_status" >&5 + echo "$as_me:21601: \$? = $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 @@ -21612,25 +21616,25 @@ fi fi rm -f cf_test.out -echo "$as_me:21615: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21619: 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:21621: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21625: 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:21627: checking for fallback type of bool" >&5 + echo "$as_me:21631: 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:21633: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:21637: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -21659,7 +21663,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:21662: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:21666: 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 @@ -21670,7 +21674,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:21673: checking for $ac_word" >&5 +echo "$as_me:21677: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21685,7 +21689,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_gnat_exists="yes" -echo "$as_me:21688: found $ac_dir/$ac_word" >&5 +echo "$as_me:21692: found $ac_dir/$ac_word" >&5 break done @@ -21694,10 +21698,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:21697: result: $gnat_exists" >&5 + echo "$as_me:21701: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:21700: result: no" >&5 + echo "$as_me:21704: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21706,12 +21710,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:21709: checking for gnat version" >&5 +echo "$as_me:21713: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:21714: result: $cf_gnat_version" >&5 +echo "$as_me:21718: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -21719,7 +21723,7 @@ case $cf_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:21722: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:21726: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -21727,7 +21731,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:21730: checking for $ac_word" >&5 +echo "$as_me:21734: 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 @@ -21742,7 +21746,7 @@ 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:21745: found $ac_dir/$ac_word" >&5 +echo "$as_me:21749: found $ac_dir/$ac_word" >&5 break done @@ -21751,10 +21755,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:21754: result: $M4_exists" >&5 + echo "$as_me:21758: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:21757: result: no" >&5 + echo "$as_me:21761: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21763,7 +21767,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:21766: checking if GNAT works" >&5 + echo "$as_me:21770: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -21791,7 +21795,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:21794: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:21798: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -21800,7 +21804,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:21803: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:21807: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -21817,10 +21821,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:21820: result: $ADAFLAGS" >&5 + echo "$as_me:21824: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:21823: checking if GNATPREP supports -T option" >&5 +echo "$as_me:21827: 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 @@ -21830,11 +21834,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:21833: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:21837: 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:21837: checking if GNAT supports generics" >&5 +echo "$as_me:21841: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in (3.[1-9]*|[4-9].*) @@ -21844,7 +21848,7 @@ case $cf_gnat_version in cf_gnat_generics=no ;; esac -echo "$as_me:21847: result: $cf_gnat_generics" >&5 +echo "$as_me:21851: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -21856,7 +21860,7 @@ else cf_generic_objects= fi -echo "$as_me:21859: checking if GNAT supports SIGINT" >&5 +echo "$as_me:21863: 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 @@ -21904,7 +21908,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:21907: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:21911: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -21917,7 +21921,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:21920: checking if GNAT supports project files" >&5 +echo "$as_me:21924: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in (3.[0-9]*) @@ -21977,15 +21981,15 @@ CF_EOF esac ;; esac -echo "$as_me:21980: result: $cf_gnat_projects" >&5 +echo "$as_me:21984: 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:21986: checking if GNAT supports libraries" >&5 + echo "$as_me:21990: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:21988: result: $cf_gnat_libraries" >&5 + echo "$as_me:21992: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -22005,7 +22009,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:22008: checking for ada-compiler" >&5 +echo "$as_me:22012: 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. @@ -22016,12 +22020,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:22019: result: $cf_ada_compiler" >&5 +echo "$as_me:22023: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:22024: checking for ada-include" >&5 +echo "$as_me:22028: 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. @@ -22057,7 +22061,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:22060: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:22064: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -22066,10 +22070,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:22069: result: $ADA_INCLUDE" >&5 +echo "$as_me:22073: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:22072: checking for ada-objects" >&5 +echo "$as_me:22076: 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. @@ -22105,7 +22109,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:22108: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:22112: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -22114,10 +22118,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:22117: result: $ADA_OBJECTS" >&5 +echo "$as_me:22121: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:22120: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:22124: 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. @@ -22127,7 +22131,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:22130: result: $with_ada_sharedlib" >&5 +echo "$as_me:22134: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -22150,13 +22154,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:22153: checking for wchar_t" >&5 + echo "$as_me:22157: 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 22159 "configure" +#line 22163 "configure" #include "confdefs.h" $ac_includes_default int @@ -22171,16 +22175,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22174: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22178: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22177: \$? = $ac_status" >&5 + echo "$as_me:22181: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22180: \"$ac_try\"") >&5 + { (eval echo "$as_me:22184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22183: \$? = $ac_status" >&5 + echo "$as_me:22187: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -22190,10 +22194,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:22193: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:22197: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:22196: checking size of wchar_t" >&5 +echo "$as_me:22200: 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 @@ -22202,7 +22206,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 22205 "configure" +#line 22209 "configure" #include "confdefs.h" $ac_includes_default int @@ -22214,21 +22218,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22217: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22220: \$? = $ac_status" >&5 + echo "$as_me:22224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22223: \"$ac_try\"") >&5 + { (eval echo "$as_me:22227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22226: \$? = $ac_status" >&5 + echo "$as_me:22230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 22231 "configure" +#line 22235 "configure" #include "confdefs.h" $ac_includes_default int @@ -22240,16 +22244,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22243: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22246: \$? = $ac_status" >&5 + echo "$as_me:22250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22249: \"$ac_try\"") >&5 + { (eval echo "$as_me:22253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22252: \$? = $ac_status" >&5 + echo "$as_me:22256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -22265,7 +22269,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 22268 "configure" +#line 22272 "configure" #include "confdefs.h" $ac_includes_default int @@ -22277,16 +22281,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22280: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22283: \$? = $ac_status" >&5 + echo "$as_me:22287: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22286: \"$ac_try\"") >&5 + { (eval echo "$as_me:22290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22289: \$? = $ac_status" >&5 + echo "$as_me:22293: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -22302,7 +22306,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 22305 "configure" +#line 22309 "configure" #include "confdefs.h" $ac_includes_default int @@ -22314,16 +22318,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:22317: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22320: \$? = $ac_status" >&5 + echo "$as_me:22324: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22323: \"$ac_try\"") >&5 + { (eval echo "$as_me:22327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22326: \$? = $ac_status" >&5 + echo "$as_me:22330: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -22336,12 +22340,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:22339: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22343: 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 22344 "configure" +#line 22348 "configure" #include "confdefs.h" $ac_includes_default int @@ -22357,15 +22361,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:22360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22363: \$? = $ac_status" >&5 + echo "$as_me:22367: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22365: \"$ac_try\"") >&5 + { (eval echo "$as_me:22369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22368: \$? = $ac_status" >&5 + echo "$as_me:22372: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -22381,7 +22385,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:22384: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:22388: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&5 +echo "$as_me:22406: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -22441,7 +22445,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:22444: result: $LIB_SUBSETS" >&5 +echo "$as_me:22448: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -22472,7 +22476,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:22475: checking default library suffix" >&5 +echo "$as_me:22479: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -22483,10 +22487,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:22486: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:22490: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:22489: checking default library-dependency suffix" >&5 +echo "$as_me:22493: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -22544,10 +22548,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:22547: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:22551: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:22550: checking default object directory" >&5 +echo "$as_me:22554: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -22563,11 +22567,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:22566: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:22570: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:22570: checking c++ library-dependency suffix" >&5 +echo "$as_me:22574: 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++) @@ -22635,7 +22639,7 @@ else fi fi -echo "$as_me:22638: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:22642: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -22811,19 +22815,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:22814: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:22818: 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:22823: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22826: \$? = $ac_status" >&5 + echo "$as_me:22830: \$? = $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 @@ -22834,10 +22838,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22837 "configure" +#line 22841 "configure" #include "confdefs.h" -#line 22840 "configure" +#line 22844 "configure" #include int cf_ldflags_static(FILE *fp); @@ -22852,16 +22856,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22859: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22858: \$? = $ac_status" >&5 + echo "$as_me:22862: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22861: \"$ac_try\"") >&5 + { (eval echo "$as_me:22865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22864: \$? = $ac_status" >&5 + echo "$as_me:22868: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -22884,7 +22888,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:22887: result: $cf_ldflags_static" >&5 + echo "$as_me:22891: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -22900,7 +22904,7 @@ fi ;; esac -echo "$as_me:22903: checking where we will install curses.h" >&5 +echo "$as_me:22907: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -22910,7 +22914,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:22913: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:22917: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -22918,7 +22922,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:22921: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:22925: 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 @@ -22936,7 +22940,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:22939: checking for src modules" >&5 +echo "$as_me:22943: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -23001,7 +23005,7 @@ EOF fi fi done -echo "$as_me:23004: result: $cf_cv_src_modules" >&5 +echo "$as_me:23008: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -23238,7 +23242,7 @@ fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:23241: checking for $ac_word" >&5 +echo "$as_me:23245: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23255,7 +23259,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC_PATH="$ac_dir/$ac_word" - echo "$as_me:23258: found $ac_dir/$ac_word" >&5 + echo "$as_me:23262: found $ac_dir/$ac_word" >&5 break fi done @@ -23267,10 +23271,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:23270: result: $TIC_PATH" >&5 + echo "$as_me:23274: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:23273: result: no" >&5 + echo "$as_me:23277: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23278,7 +23282,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:23281: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:23285: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -23314,7 +23318,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}:23317: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:23321: 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//'` @@ -23325,7 +23329,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:23328: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:23332: 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 @@ -23341,7 +23345,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:23344: result: $PKG_CFLAGS" >&5 +echo "$as_me:23348: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -23398,7 +23402,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}:23401: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:23405: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -23502,7 +23506,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:23505: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23509: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -23678,7 +23682,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23681: error: ambiguous option: $1 + { { echo "$as_me:23685: 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;} @@ -23697,7 +23701,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23700: error: unrecognized option: $1 + -*) { { echo "$as_me:23704: 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;} @@ -23816,7 +23820,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:23819: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23823: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24295,7 +24299,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24298: creating $ac_file" >&5 + { echo "$as_me:24302: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24313,7 +24317,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:24316: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24320: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24326,7 +24330,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:24329: error: cannot find input file: $f" >&5 + { { echo "$as_me:24333: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24342,7 +24346,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:24345: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24349: 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;} @@ -24351,7 +24355,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:24354: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24358: 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;} @@ -24388,7 +24392,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:24391: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24395: 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;} @@ -24399,7 +24403,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:24402: WARNING: Some variables may not be substituted: + { echo "$as_me:24406: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24448,7 +24452,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:24451: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24455: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24459,7 +24463,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:24462: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24466: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24472,7 +24476,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:24475: error: cannot find input file: $f" >&5 + { { echo "$as_me:24479: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24530,7 +24534,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:24533: $ac_file is unchanged" >&5 + { echo "$as_me:24537: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -24875,7 +24879,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:24878: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:24882: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index 72d029d3..cc7257e1 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.636 2017/02/12 15:51:08 tom Exp $ +dnl $Id: configure.in,v 1.638 2017/03/10 02:01:39 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.636 $) +AC_REVISION($Revision: 1.638 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1109,6 +1109,7 @@ if test "x$with_ext_colors" = xyes ; then CF_NCURSES_ABI_6 NCURSES_EXT_COLORS=1 AC_DEFINE(NCURSES_EXT_COLORS,1,[Define to 1 to compile for 256-color support]) + AC_DEFINE(HAVE_ALLOC_PAIR,1,[Define to 1 to enable alloc_pair() function]) fi fi AC_SUBST(NCURSES_EXT_COLORS) diff --git a/dist.mk b/dist.mk index 7df027ab..64022e85 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1150 2017/02/26 16:41:23 tom Exp $ +# $Id: dist.mk,v 1.1151 2017/03/05 19:24:08 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 0 -NCURSES_PATCH = 20170304 +NCURSES_PATCH = 20170311 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/form/llib-lform b/form/llib-lform index edfdabb0..35941e97 100644 --- a/form/llib-lform +++ b/form/llib-lform @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2015 Free Software Foundation, Inc. * + * Copyright (c) 1998-2015,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -110,6 +110,11 @@ int set_current_field( FIELD *field) { return(*(int *)0); } +#undef unfocus_current_field +int unfocus_current_field( + FORM *const form) + { return(*(int *)0); } + #undef current_field FIELD *current_field( const FORM *form) @@ -458,6 +463,11 @@ int _nc_Synchronize_Options( Field_Options newopts) { return(*(int *)0); } +#undef _nc_Unset_Current_Field +void _nc_Unset_Current_Field( + FORM *form) + { /* void */ } + #undef _nc_Set_Current_Field int _nc_Set_Current_Field( FORM *form, diff --git a/form/llib-lformt b/form/llib-lformt index 55af2d04..6aab98dc 100644 --- a/form/llib-lformt +++ b/form/llib-lformt @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2010,2015 Free Software Foundation, Inc. * + * Copyright (c) 2010-2015,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -110,6 +110,11 @@ int set_current_field( FIELD *field) { return(*(int *)0); } +#undef unfocus_current_field +int unfocus_current_field( + FORM *const form) + { return(*(int *)0); } + #undef current_field FIELD *current_field( const FORM *form) @@ -458,6 +463,11 @@ int _nc_Synchronize_Options( Field_Options newopts) { return(*(int *)0); } +#undef _nc_Unset_Current_Field +void _nc_Unset_Current_Field( + FORM *form) + { /* void */ } + #undef _nc_Set_Current_Field int _nc_Set_Current_Field( FORM *form, diff --git a/form/llib-lformtw b/form/llib-lformtw index 0cc2edc9..5d853480 100644 --- a/form/llib-lformtw +++ b/form/llib-lformtw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2010-2013,2015 Free Software Foundation, Inc. * + * Copyright (c) 2010-2015,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -110,6 +110,11 @@ int set_current_field( FIELD *field) { return(*(int *)0); } +#undef unfocus_current_field +int unfocus_current_field( + FORM *const form) + { return(*(int *)0); } + #undef current_field FIELD *current_field( const FORM *form) @@ -458,6 +463,11 @@ int _nc_Synchronize_Options( Field_Options newopts) { return(*(int *)0); } +#undef _nc_Unset_Current_Field +void _nc_Unset_Current_Field( + FORM *form) + { /* void */ } + #undef _nc_Set_Current_Field int _nc_Set_Current_Field( FORM *form, diff --git a/form/llib-lformw b/form/llib-lformw index 224e122d..db5db9ed 100644 --- a/form/llib-lformw +++ b/form/llib-lformw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2002-2013,2015 Free Software Foundation, Inc. * + * Copyright (c) 2002-2015,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -110,6 +110,11 @@ int set_current_field( FIELD *field) { return(*(int *)0); } +#undef unfocus_current_field +int unfocus_current_field( + FORM *const form) + { return(*(int *)0); } + #undef current_field FIELD *current_field( const FORM *form) @@ -458,6 +463,11 @@ int _nc_Synchronize_Options( Field_Options newopts) { return(*(int *)0); } +#undef _nc_Unset_Current_Field +void _nc_Unset_Current_Field( + FORM *form) + { /* void */ } + #undef _nc_Set_Current_Field int _nc_Set_Current_Field( FORM *form, diff --git a/include/curses.h.in b/include/curses.h.in index 4c6e370a..0a6fa823 100644 --- a/include/curses.h.in +++ b/include/curses.h.in @@ -32,7 +32,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h.in,v 1.246 2017/02/11 16:00:56 tom Exp $ */ +/* $Id: curses.h.in,v 1.248 2017/03/09 09:43:50 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -913,8 +913,11 @@ typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); extern NCURSES_EXPORT(bool) is_term_resized (int, int); extern NCURSES_EXPORT(char *) keybound (int, int); extern NCURSES_EXPORT(const char *) curses_version (void); +extern NCURSES_EXPORT(int) alloc_pair (int, int); extern NCURSES_EXPORT(int) assume_default_colors (int, int); extern NCURSES_EXPORT(int) define_key (const char *, int); +extern NCURSES_EXPORT(int) find_pair (int, int); +extern NCURSES_EXPORT(int) free_pair (int); extern NCURSES_EXPORT(int) get_escdelay (void); extern NCURSES_EXPORT(int) key_defined (const char *); extern NCURSES_EXPORT(int) keyok (int, bool); @@ -1044,9 +1047,12 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype); /* implem extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */ #if @NCURSES_EXT_FUNCS@ extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */ +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(alloc_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int); /* implemented:EXT_SP_FUNC */ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*); /* implemented:EXT_SP_FUNC */ +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(find_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */ +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(free_pair) (SCREEN*, int); /* implemented:EXT_SP_FUNC */ extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined) (SCREEN*, const char *); /* implemented:EXT_SP_FUNC */ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool); /* implemented:EXT_SP_FUNC */ diff --git a/include/ncurses_defs b/include/ncurses_defs index 7c8e8160..2baa5e53 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.70 2016/09/04 18:32:17 tom Exp $ +# $Id: ncurses_defs,v 1.71 2017/03/06 09:51:33 tom Exp $ ############################################################################## -# Copyright (c) 2000-2015,2016 Free Software Foundation, Inc. # +# Copyright (c) 2000-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -41,6 +41,7 @@ DECL_ERRNO ETIP_NEEDS_MATH_H GCC_NORETURN /* nothing */ GCC_UNUSED /* nothing */ +HAVE_ALLOC_PAIR HAVE_ASSUME_DEFAULT_COLORS HAVE_BIG_CORE HAVE_BSD_CGETENT diff --git a/man/man_db.renames b/man/man_db.renames index 276d7ba8..c8319d5a 100644 --- a/man/man_db.renames +++ b/man/man_db.renames @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2010,2015 Free Software Foundation, Inc. # +# Copyright (c) 1998-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: man_db.renames,v 1.48 2015/04/18 16:47:55 tom Exp $ +# $Id: man_db.renames,v 1.49 2017/03/12 00:43:15 tom Exp $ # Manual-page renamings for the man_db program # # Files: @@ -148,6 +148,7 @@ mitem_opts.3x menu_opts.3menu mitem_userptr.3x menu_userptr.3menu mitem_value.3x menu_value.3menu mitem_visible.3x menu_visible.3menu +new_pair.3x new_pair.3ncurses ncurses.3x ncurses.3ncurses panel.3x panel.3curses printf.3s printf.3 diff --git a/man/ncurses.3x b/man/ncurses.3x index 902064e6..c45dafdf 100644 --- a/man/ncurses.3x +++ b/man/ncurses.3x @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: ncurses.3x,v 1.129 2017/02/18 16:50:46 tom Exp $ +.\" $Id: ncurses.3x,v 1.130 2017/03/09 10:21:11 tom Exp $ .hy 0 .TH ncurses 3X "" .ie \n(.g .ds `` \(lq @@ -339,6 +339,7 @@ addnstr/\fBcurs_addstr\fR(3X) addnwstr/\fBcurs_addwstr\fR(3X) addstr/\fBcurs_addstr\fR(3X) addwstr/\fBcurs_addwstr\fR(3X) +alloc_pair/\fBnew_pair\fR(3X)* assume_default_colors/\fBdefault_colors\fR(3X)* attr_get/\fBcurs_attr\fR(3X) attr_off/\fBcurs_attr\fR(3X) @@ -389,8 +390,10 @@ erase/\fBcurs_clear\fR(3X) erasechar/\fBcurs_termattrs\fR(3X) erasewchar/\fBcurs_termattrs\fR(3X) filter/\fBcurs_util\fR(3X) +find_pair/\fBnew_pair\fR(3X)* flash/\fBcurs_beep\fR(3X) flushinp/\fBcurs_util\fR(3X) +free_pair/\fBnew_pair\fR(3X)* get_wch/\fBcurs_get_wch\fR(3X) get_wstr/\fBcurs_get_wstr\fR(3X) getattrs/\fBcurs_attr\fR(3X) diff --git a/man/new_pair.3x b/man/new_pair.3x new file mode 100644 index 00000000..46c23b48 --- /dev/null +++ b/man/new_pair.3x @@ -0,0 +1,154 @@ +.\"*************************************************************************** +.\" Copyright (c) 2017 Free Software Foundation, Inc. * +.\" * +.\" Permission is hereby granted, free of charge, to any person obtaining a * +.\" copy of this software and associated documentation files (the * +.\" "Software"), to deal in the Software without restriction, including * +.\" without limitation the rights to use, copy, modify, merge, publish, * +.\" distribute, distribute with modifications, sublicense, and/or sell * +.\" copies of the Software, and to permit persons to whom the Software is * +.\" furnished to do so, subject to the following conditions: * +.\" * +.\" The above copyright notice and this permission notice shall be included * +.\" in all copies or substantial portions of the Software. * +.\" * +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * +.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * +.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * +.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * +.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +.\" * +.\" Except as contained in this notice, the name(s) of the above copyright * +.\" holders shall not be used in advertising or otherwise to promote the * +.\" sale, use or other dealings in this Software without prior written * +.\" authorization. * +.\"*************************************************************************** +.\" +.\" Author: Thomas E. Dickey +.\" +.\" $Id: new_pair.3x,v 1.8 2017/03/09 09:59:11 tom Exp $ +.TH new_pair 3X "" +.ie \n(.g .ds `` \(lq +.el .ds `` `` +.ie \n(.g .ds '' \(rq +.el .ds '' '' +.de bP +.IP \(bu 4 +.. +.de NS +.ie \n(.sp +.el .sp .5 +.ie \n(.in +4 +.el .in +2 +.nf +.ft C \" Courier +.. +.de NE +.fi +.ft R +.in -4 +.. +.SH NAME +\fBalloc_pair\fP, +\fBfree_pair\fP \- new curses color-pair functions +.SH SYNOPSIS +\fB#include \fP +.sp +\fBint alloc_pair(int fg, int bg);\fP +.br +\fBint free_pair(int pair);\fP +.SH DESCRIPTION +These functions are an extension to the curses library. +They permit an application to dynamically allocate a color pair using +the foreground/background colors rather than assign a fixed color pair number, +and return an unused pair to the pool. +.PP +The number of colors may be related to the number of possible color +pairs for a given terminal, or it may not: +.bP +While almost all terminals allow setting the color \fIattributes\fP +independently, +it is unlikely that your terminal allows you to modify the attributes +of a given character cell without rewriting it. +That is, the foreground and background colors are applied as a pair. +.bP +Color pairs are the curses library's way of managing a color palette +on a terminal. +If the library does not keep track of the \fIcombinations\fP of +colors which are displayed, it will be inefficient. +.bP +For simple terminal emulators +with only a few dozen color combinations, +it is convenient to use the maximum number of combinations +as the limit on color pairs: +.NS +\fBCOLORS\fP\fI * \fP\fBCOLORS\fP +.NE +.bP +Terminals which support \fIdefault colors\fP distinct from \*(``ANSI colors\*('' +add to the possible combinations, producing this total: +.NS +\fI( \fP\fBCOLORS\fP\fI + 1 ) * ( \fP\fBCOLORS\fP\fI + 1 )\fP +.NE +.bP +An application might use up to a few dozen color pairs to +implement a predefined color scheme. +.IP +Beyond that lies in the realm of programs using the foreground +and background colors for \*(``ASCII art\*('' +(or some other non-textual application). +.IP +Also beyond those few dozen pairs, the required size for a table +to represent the combinations grows rapidly with an increasing number of colors. +.IP +These functions allow a developer to let the screen library +manage color pairs. +.SS alloc_pair +The \fBalloc_pair\fP function accepts parameters for +foreground and background color, and +checks if that color combination is already associated with a color pair. +.bP +If the combination already exists, \fBalloc_pair\fP returns the existing pair. +.bP +If the combination does not exist, \fBalloc_pair\fP allocates a new color pair and returns that. +.bP +If the table fills up, \fBalloc_pair\fP discards the least-recently +allocated entry using \fBfree_pair\fP and allocates a new color pair. +.PP +All of the color pairs are allocated from a table of possible color pairs. +The size of the table is determined by the terminfo \fIpairs\fP capability. +The table is shared with \fBinit_pair\fP; +in fact \fBalloc_pair\fP calls \fBinit_pair\fP after +updating the ncurses library's fast index to the colors versus color pairs. +.SS find_pair +The \fBfind_pair\fP function accepts parameters for +foreground and background color, and +checks if that color combination is already associated with a color pair, +returning the pair number if it has been allocated. +Otherwise it returns \-1. +.SS free_pair +Marks the given color pair as unused, +i.e., like color pair 0. +.SH RETURN VALUE +.PP +The \fBalloc_pair\fP function returns a color pair number in the range +1 through \fBCOLOR_PAIRS\fP\-1, unless it encounters an error updating +its fast index to the color pair values, preventing it from allocating +a color pair. In that case, it returns \-1. +.PP +The \fBfind_pair\fP function returns a color pair number if the +given color combination has been associated with a color pair, +or \-1 if not. +.PP +Likewise, \fBfree_pair\fP returns \fBOK\fP unless it encounters an +error updating the fast index or if no such color pair is in use. +.SH PORTABILITY +These routines are specific to ncurses. They were not supported on +Version 7, BSD or System V implementations. It is recommended that +any code depending on them be conditioned using NCURSES_VERSION. +.SH SEE ALSO +\fBinit_pair\fR(3X). +.SH AUTHOR +Thomas Dickey. diff --git a/man/terminfo.head b/man/terminfo.head index a7ba4e3c..6b86252d 100644 --- a/man/terminfo.head +++ b/man/terminfo.head @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: terminfo.head,v 1.30 2017/03/05 00:24:35 tom Exp $ +.\" $Id: terminfo.head,v 1.31 2017/03/06 09:58:14 tom Exp $ .TH terminfo 5 "" "" "File Formats" .ds n 5 .ds d @TERMINFO@ @@ -72,7 +72,7 @@ Newlines and leading whitespace (spaces or tabs) may be used for formatting entries for readability. These are removed from parsed entries. .IP -The \fB@INFOCMP@\fP \fB\-f\fP and \fB\-W\fP options relies on this to +The \fB@INFOCMP@\fP \fB\-f\fP and \fB\-W\fP options rely on this to format if-then-else expressions, or to enforce maximum line-width. The resulting formatted terminal description can be read by \fB@TIC@\fP. diff --git a/misc/terminfo.src b/misc/terminfo.src index 81be0cd4..f6d1cf40 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.586 $ -# $Date: 2017/01/28 23:50:28 $ +# $Revision: 1.595 $ +# $Date: 2017/03/11 23:17:18 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -883,13 +883,13 @@ st52-old|Atari ST with VT52 emulation, # nsterm*|Apple_Terminal - AppKit Terminal.app # -# Terminal.app is a Terminal emulator bundled with NeXT's NeXTStep and +# Terminal.app is a Terminal emulator bundled with NeXT's NeXTSTEP and # OPENSTEP/Mach operating systems, and with Apple's Rhapsody, Mac OS X # Server and Mac OS X operating systems. There is also a -# "terminal.app" in GNUStep, but I believe it to be an unrelated +# "terminal.app" in GNUstep, but I believe it to be an unrelated # codebase and I have not attempted to describe it here. # -# For NeXTStep, OPENSTEP/Mach, Rhapsody and Mac OS X Server 1.0, you +# For NeXTSTEP, OPENSTEP/Mach, Rhapsody and Mac OS X Server 1.0, you # are pretty much on your own. Use "nsterm-7-m" and hope for the best. # You might also try "nsterm-7" and "nsterm-old" if you suspect your # version supports color. @@ -942,19 +942,19 @@ st52-old|Atari ST with VT52 emulation, # # The Mythology* of AppKit Terminal.app: # -# In the days of NeXTSTep 0.x and 1.x there were two incompatible +# In the days of NeXTSTEP 0.x and 1.x there were two incompatible # bundled terminal emulators, Shell and Terminal. Scott Hess wrote a # shareware replacement for Terminal called "Stuart" which NeXT bought -# and used as the basis for the Terminal.app in NeXTstep 2+, +# and used as the basis for the Terminal.app in NeXTSTEP 2+, # OPENSTEP/Mach, Apple Rhapsody, Mac OS X Server 1.0, and Mac OS X. I # don't know the TERM_PROGRAM and TERM_PROGRAM_VERSION settings or # capabilities for the early versions, but I believe that the # TERM_PROGRAM_VERSION may have been reset at some point. # # The early versions were tailored to the NeXT character set. Sometime -# after the Apple aquisition the encoding was swiched to MacRoman -# (initally with serious altcharset bugs due to incomplete conversion -# of the old NeXT code,) and then later to UTF-8. Alos sometime during +# after the Apple acquisition the encoding was switched to MacRoman +# (initially with serious altcharset bugs due to incomplete conversion +# of the old NeXT code,) and then later to UTF-8. Also sometime during # or just prior to the early days of Mac OS X, the Terminal grew ANSI # 8-color support (initially buggy when combined with attributes, but # that was later fixed.) More recently, around Mac OS X version 10.3 @@ -984,7 +984,7 @@ st52-old|Atari ST with VT52 emulation, # "nsterm" to comply with the name length and case conventions and # limitations of various software packages [notably Solaris terminfo # and UNIX.] A single Apple_Terminal alias is retained for -# backwards-compatbility. +# backwards-compatibility. # # * Added function key support (F1-F4). These only work in Terminal.app # version 51, hopefully the capabilities won't cause problems for people @@ -1825,6 +1825,31 @@ kon|kon2|jfbterm|Kanji ON Linux console, initp@, kcbt@, oc@, op=\E[37;40m, rs1=\Ec, tsl=\E[?T, use=linux, +# FbTerm +# Another variant. There are two parts (src, src/lib) with the latter +# comprising the escape-sequence parsing. The copyright notice on that +# says it is based on GTerm by Timothy Miller. +# +# The original developer "dragchan" has left, but as of March 2017 there is +# (still dead) code from May 2015 here: +# https://github.com/izmntuk/fbterm +# +# The acsc string may be incorrect. +# +# Not used here, the program recognizes escapes for italic, underline and +# dim, rendering those as green, cyan and gray respectively. +fbterm|FbTerm for Linux with framebuffer, + colors#256, pairs#32767, + acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i + \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u + \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, + initc=\E[3;%p1%d;%p2%d;%p3%d;%p4%d}, rmacs=\E[10m, + setab=\E[2;%p1%d}, setaf=\E[1;%p1%d}, setb=\E[2;%p1%d}, + setf=\E[1;%p1%d}, + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 + %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, + sgr0=\E[0;10m, smacs=\E[11m, use=linux, + # 16-color linux console entry; this works with a 256-character # console font but bright background colors turn into dim ones when # you use a 512-character console font. This uses bold for bright @@ -2477,7 +2502,7 @@ arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768), cols#132, lines#50, use=arm100, # NetBSD/x68k console vt200 emulator. This port runs on a 68K machine -# manufactured by Sharp for the Japenese market. +# manufactured by Sharp for the Japanese market. # From Minoura Makoto , 12 May 1996 x68k|x68k-ite|NetBSD/x68k ITE, cols#96, lines#32, @@ -3040,7 +3065,7 @@ vt102+enq|ncurses extension for vt102-style ENQ, # | | | | | | | | # | | | Auto XON/XOFF 0-Off | | | Power 0-60 Hz # | | | 1-On | | | 1-50 Hz -# | | Ansi/VT52 0-VT52 | | Bits Per Char. 0-7 Bits +# | | ANSI/VT52 0-VT52 | | Bits Per Char. 0-7 Bits # | | 1-ANSI | | 1-8 Bits # | Keyclick 0-Off | Parity 0-Off # | 1-On | 1-On @@ -3059,26 +3084,34 @@ vt102+enq|ncurses extension for vt102-style ENQ, # # (vt100: I added / based on the init string, also . -- esr) vt100|vt100-am|dec vt100 (w/advanced video), - OTbs, am, mc5i, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, + OTbs, mc5i, xenl, xon, + vt#3, + csr=\E[%i%p1%d;%p2%dr, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, + mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rmam=\E[?7l, + rmkx=\E[?1l\E>, rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r, + sc=\E7, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 + %;m%?%p9%t\016%e\017%;$<2>, + smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m$<2>, + use=vt100+4bsd, use=vt100+fnkeys, +vt100+4bsd|dec vt100 from 4.0BSD, + am, msgr, + cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, - cuf=\E[%p1%dC, cuf1=\E[C$<2>, + clear=\E[H\E[J$<50>, cr=^M, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=^J, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, - lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, - rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l, - rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmso=\E[m$<2>, + rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 - %;m%?%p9%t\016%e\017%;$<2>, - sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, - use=vt100+fnkeys, + %;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017$<2>, smacs=^N, smso=\E[1;7m$<2>, + smul=\E[4m$<2>, tbc=\E[3g, vt100nam|vt100-nam|vt100 no automargins, am@, xenl@, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am, @@ -5004,7 +5037,7 @@ gnome-2012|GNOME Terminal 3.6.0, # GNOME terminal may automatically use the contents of the "xterm" terminfo to # supply key information which is not built into the program. With 2.22.3, -# this list is built into the program (which addresses the inadvertant use of +# this list is built into the program (which addresses the inadvertent use of # random terminfo data, though using a set of values which does not correspond # to any that xterm produces - still not solving the problem that GNOME # terminal hardcodes the $TERM variable as "xterm"). @@ -7192,7 +7225,7 @@ cygwinB19|ansi emulation for cygwin32, # kPRV [shifted prev key] not implemented # khome [home key] really is \E[1~ NOT \E[H # tbc [clear tab stops] not implemented -# xenl [newline ignnored after 80 cols] messes up last line? Ehud Karni +# xenl [newline ignored after 80 cols] messes up last line? Ehud Karni # smpch [Start PC charset] is \E[11m, same as smacs # rmpch [End PC charset] is \E[10m, same as rmacs # mir [move in insert mode] fails in tack? @@ -7534,7 +7567,7 @@ pcmw|PC running Microsoft Works, # From: Federico Bianchi # This is the entry for the OpenNT terminal. -# The ntconsole name is for backward compatability. +# The ntconsole name is for backward compatibility. # This is for OpenNT 2.0 and later. # Later OpenNT was renamed to Interix. # @@ -8196,7 +8229,7 @@ hpsub|hp terminals -- capability subset, # # (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:", # moved here from hpsub -- esr) -hpex|hp extended capabilites, +hpex|hp extended capabilities, cr=^M, cud1=^J, cup=\E&a%p1%dy%p2%dC, ht=^I, ind=^J, kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD, vpa=\E&a%p1%dY, use=hpsub, @@ -8599,7 +8632,7 @@ adm22|lsi adm22, # on off off Busy active on J5-19, CD disabled - Factory Set. # on off on Busy active on J5-19, CD enabled # -# sw4 Used in conjuction with S4 for comm interface control - Fact 0 +# sw4 Used in conjunction with S4 for comm interface control - Fact 0 # # sw5 Secondary Channel Control (Hardware implementation only) - Fact 0 # @@ -8701,7 +8734,7 @@ adm36|LSI ADM36, OTbs, OTpt, OTkn#4, if=/usr/share/tabset/vt100, - is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l, use=vt100, + is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l, use=vt100+4bsd, # (adm42: removed obsolete ":ma=^K^P:" -- esr) adm42|lsi adm42, OTbs, am, @@ -9074,7 +9107,7 @@ tvi912cc|tvi912 at cowell college, # (including some with magic cookies), fancy half-duplex mode, and # different bugs. # -# Some operations reqire truly incredible amounts of padding. The +# Some operations require truly incredible amounts of padding. The # insert_line () and delete_line () operations in particular # are so slow as to be nearly unusable. # @@ -10120,7 +10153,7 @@ vi603|visual603|visual 603, ind=\ED, is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=\EP2~, - use=vt100, + use=vt100+4bsd, #### Wyse (wy) # @@ -10865,8 +10898,8 @@ wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns, # terminfo. At one point, I found some reference indicating that this # terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just # me), but I can't find that and the server under my bookmark to "Wyse -# Technical" isn't responding. So there's the question of wether the wy85 -# terminfo should reflect the manufactuer's intended behaviour of the terminal +# Technical" isn't responding. So there's the question of whether the wy85 +# terminfo should reflect the manufacturer's intended behaviour of the terminal # or the actual." wy85-8bit|wyse85-8bit|wyse 85 in 8-bit mode, am, hs, mc5i, mir, msgr, xenl, xon, @@ -11588,7 +11621,7 @@ vt320-k311|dec vt320 series as defined by kermit 3.11, # These entries attempt to describe Avatar, a terminal emulation used with # MS-DOS bulletin-board systems. It was designed to give ANSI-like # capabilities, but with cheaper (shorter) control sequences. Messy design, -# excessively dependent on PC idiosyncracies, but apparently rather popular +# excessively dependent on PC idiosyncrasies, but apparently rather popular # in the BBS world. # # No color support. Avatar doesn't fit either of the Tektronix or HP color @@ -11630,7 +11663,7 @@ vt320-k311|dec vt320 series as defined by kermit 3.11, # ^V^Q%c -- query the driver # ^V^R -- driver reset # ^V^S -- Sound tone (PC-specific) -# ^V^T -- change highlight at current cursor poition to %c +# ^V^T -- change highlight at current cursor position to %c # ^V^U%p1%c%p2%c -- highlight window with attribute # ^V^V%p1%c%p2%c%p3%c%p4%c%p5%c # -- define window @@ -13117,7 +13150,7 @@ ampex232w|Ampex Model 232 / 132 columns, # Briefly, the settings are for the following modes: # (values are for bit set/clear with * indicating our preference # and the value used to test these termcaps) -# Note that many of these settings are irrelevent to the terminfo +# Note that many of these settings are irrelevant to the terminfo # and are just set to the default mode of the terminal as shipped # by the factory. # @@ -13546,7 +13579,7 @@ screwpoint|adds viewpoint with ^O bug, # Cursor forward FF # Cursor home RS # Cursor up VT -# Cursor supress ETB +# Cursor suppress ETB # Cursor enable CAN # Erase to end of line ESC,T # Erase to end of page ESC,Y @@ -13686,8 +13719,8 @@ cit101e|C. Itoh CIT-101e, # tset or setterm etc.) provided that the terminal has been manually set # up (and the setup saved with ^S) to be compatible with this termcap. To be # compatible it should be in ANSI mode (not VT52). A set-up that -# works is to set all the manually setable stuff to factory defaults -# by pressing ^D in set-up mode. Then increse the brighness with the +# works is to set all the manually settable stuff to factory defaults +# by pressing ^D in set-up mode. Then increase the brightness with the # up-arrow key since the factory default will likely be dim on an old # terminal. Then change any options you want (provided that they are # compatible with the termcap). For my terminal I set: Screen @@ -13809,7 +13842,7 @@ cdc721|CDC Viking, clear=^L, cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, cuu1=^W, el=^K, home=^Y, kcub1=^H, kcud1=^J, kcuf1=^I, kcuu1=^W, khome=^Y, -cdc721ll|CDC Vikingll, +cdc721ll|CDC Viking with long lines, OTbs, am, cols#132, lines#24, clear=^L, cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, @@ -14193,7 +14226,7 @@ oc100|oconcept|c100-1p|old 1 page concept 100, # there is no way of knowing what it is that the program wants turned # off. # smul: The "underline" attribute is reconfigurable to an overline or -# strikethru, or (as done with \E[;3+} in is2=), to a line at the true +# strike-through, or (as done with \E[;3+} in is2=), to a line at the true # bottom of the character cell. This was done to allow for more readable # underlined characters, and to be able to distinguish between an # underlined space, an underscore, and an underlined underscore. @@ -14297,7 +14330,7 @@ oc100|oconcept|c100-1p|old 1 page concept 100, # It's not made clear in the manuals, but based on other ansi/vt type # terminals, it's a good guess that this terminal is capable of both # "transparent print" (which doesn't copy data to the screen, and -# therefore needs mc5i: specified to say so) and "auxilliary print" +# therefore needs mc5i: specified to say so) and "auxiliary print" # (which does duplicate printed data on the screen, in which case mc4= # and mc5= should use the \E[?4i and \E[?5i strings instead). @@ -15288,7 +15321,7 @@ dm3045|datamedia 3045a, # # 2 Margin Bell 0=off 1=on # Keyclick 0=off 1=on -# Ansi/VT52 0=VT52 1=Ansi +# ANSI/VT52 0=VT52 1=ANSI # Xon/Xoff 0=Off 1=On # # 3 Shift3 0=Hash 1=UK Pound @@ -15316,7 +15349,7 @@ dm80|dmdt80|dt80|datamedia dt80/1, cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, - use=vt100, + use=vt100+4bsd, # except in 132 column mode, where it needs a little padding. # This is still less padding than the vt100, and you can always turn on # the ^S/^Q handshaking, so you can use vt100 flavors for things like @@ -16303,7 +16336,7 @@ infoton, #ctrl-A set SOM position at cursor position #ctrl-G Bell #ctrl-H Backspace -#ctrl-I Horiz tab +#ctrl-I Horizontal tab #ctrl-J Linefeed #ctrl-K Cursor up #ctrl-L Cursor right @@ -17210,7 +17243,7 @@ ncr260intpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard, colors#8, pairs#64, op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ncr260vt300pp, -# The Intecolor emulation of the NCR 2900/260C color terminal is basicly a +# The Intecolor emulation of the NCR 2900/260C color terminal is basically a # DEC vt200/300 with color capabilities added. ncr260intwpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard in 132 column mode, colors#8, pairs#64, @@ -17451,7 +17484,7 @@ NCR260VT300WPP|ncr260vt300wpp|NCR 2900_260 vt300 wide mode pc+ kybd, # 'setf' definition. The escape sequence to set color attributes is # ESC d y 1 # In addition, the background color can be changed through the desk accessories. -# The capablitiy 'op' sets colors to green on black (default combination). +# The capability 'op' sets colors to green on black (default combination). # # NOTE: The NCR Unix System Administrator's Shell will not function properly # if the 'pairs' capability is defined. Un-Comment the 'pairs' @@ -18471,7 +18504,7 @@ tek4125|tektronix 4125, is2=\E%\E!0\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2 \ELM0\ELS1\ELX00\ELV1\E%\E!1\E>\E[?3l\E[?4l\E[?5l\E[?7h \E[?8h, - rc@, sc@, smkx=\E=, use=vt100, + rc@, sc@, smkx=\E=, use=vt100+4bsd, # From: # (tek4207: This was the termcap file's entry for the 4107/4207, but SCO @@ -18694,7 +18727,7 @@ vc415|volker-craig 415, # Steve Jacobson 8/85 pcplot|pc-plot terminal emulation program, xenl@, - csr@, dl@, dl1@, il@, il1@, rc@, sc@, use=vt100, + csr@, dl@, dl1@, il@, il1@, rc@, sc@, use=vt100+4bsd, # KayPro II from Richard G Turner # I've found that my KayPro II, running MDM730, continues to emulate an # ADM-3A terminal, just like I was running TERM.COM. On our 4.2 UNIX @@ -18960,7 +18993,7 @@ mac|macintosh|Macintosh with MacTerminal, OTdN#30, blink@, dch1=\E[P$<7/>, ich1=\E[@$<9/>, ip=$<7/>, use=lisa, # Lisaterm in 132 column ("wide") mode. -mac-w|macterminal-w|Apple Macintosh with Macterminal in 132 column mode, +mac-w|macterminal-w|Apple Macintosh with MacTerminal in 132 column mode, cols#132, use=mac, #### Radio Shack/Tandy @@ -19684,10 +19717,10 @@ linux-m1|Linux Minitel 1 "like" Couleurs, # 1. Using double-shapes for vt100 graphical chars (eg: mc). # 2. Native brown color corrected to good yellow color. # 3. Adding "Insert" and "Delete Line" keys as ESC Up and ESC Down arrow keys. -# 4. Suppressed inexistant underlined mode (normally as bright). +# 4. Suppressed nonexistent underlined mode (normally as bright). # 5. ich/ich1 not filled because of non-curses programs. #-- -# 6. Suppressed inexistant invisible mode. +# 6. Suppressed nonexistent invisible mode. #(7.)Adding forgotten "cub/cud/cuf/cuu" sequences deplacement. linux-m1b|Linux Minitel 1B "like" Monochrome (Gris/Blanc/Noir+Dim), @@ -19792,7 +19825,7 @@ screen.putty-m2|Putty m2 specific for screen, # From: Alexandre Montaron, 19 Nov 2015, updated 19 Sep 2016 # # He comments: -# viewdata lacks a true cup capabilitie, +# viewdata lacks a true cup capability, # so I achieved it with home and cud1/cuf1 sequences only ! viewdata|prestel/viewdata terminals, am, bw, eslok, hz, @@ -20736,7 +20769,7 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator, # Approximate date of release was 1982 (early 80s, anyway), and it had several # evolutions including (limited) color versions such as the PS330C. PS300s # were effectively obsolete by the late 80s, replaced by raster graphics -# systems, although specialized applications like molecular modelling +# systems, although specialized applications like molecular modeling # hung onto them for a while longer. AFAIK all E&S vector graphics systems # are out of production, though of course E&S is very much alive (in 1996). # (ps300: changed ":pt@:" to "it@" -- esr) @@ -20744,7 +20777,7 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator, ps300|Picture System 300, xt, it@, - rmso@, rmul@, smso@, smul@, use=vt100, + rmso@, rmul@, smso@, smul@, use=vt100+4bsd, #### General Electric (ge) # @@ -20904,7 +20937,7 @@ z29|zenith29|z29b|zenith z29b, # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore # cursor, bc -> block cursor. # From: Mike Meyers -# (z29a: replaced nonexistent befause +# (z29a: replaced nonexistent because # looks vt100-compatible -- esr) z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith 29 in ansi mode, OTbs, OTpt, am, eslok, hs, mir, msgr, @@ -20926,7 +20959,7 @@ z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith 29 in ansi mode, \E[11m, sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m, tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, -z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyckick and underscore cursor, +z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyclick and underscore cursor, rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11 m, use=z29a, @@ -21125,7 +21158,7 @@ modgraph|mod24|modgraph terminal emulating vt100, is2=\E\^9;0s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11 ;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s \E\^11;81s\E\^11;89s, - rf@, ri=\EM\E[K$<5/>, use=vt100, + rf@, ri=\EM\E[K$<5/>, use=vt100+4bsd, # The GX-1000 manual is dated 1984. This looks rather like a VT-52. modgraph2|modgraph gx-1000 80x24 with keypad not enabled, am, da, db, @@ -21226,7 +21259,7 @@ omron|Omron 8025AG, #### Ramtek # # Ramtek was a vendor of high-end graphics terminals around 1979-1983; they -# were competition for things like the Tektronics 4025. +# were competition for things like the Tektronix 4025. # # Ramtek 6221 from BRL, probably by Doug Gwyn @@ -21444,7 +21477,8 @@ tab132|tab|tab132-15|tab 132/15, OTdN@, cols#80, lines#24, lm#96, cud1=^J, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, il1=\E[L, is2=\E[?7h\E[?3l\E[?5l, kcub1=\E[D, kcud1=\E[B, - kcuu1=\E[A, rmir=\E[4l, rmkx@, smir=\E[4h, smkx@, use=vt100, + kcuu1=\E[A, rmir=\E[4l, rmkx@, smir=\E[4h, smkx@, + use=vt100+4bsd, tab132-w|tab132 in wide mode, cols#132, is2=\E[?7h\E[?3h\E[?5l, use=tab132, @@ -22177,7 +22211,7 @@ h19k|h19kermit|heathkit emulation provided by Kermit (no auto margin), # Software (formerly Peripherals Computers & Supplies, Inc) of # 2457 Perkiomen Ave., Reading, PA 19606, 1-800-876-8376. They can # also be reached at support@synergy.com. -versaterm|versaterm vt100 emulator for the macintosh, +versaterm|versaterm vt100 emulator for the Macintosh, am, xenl, cols#80, it#8, lines#24, bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, @@ -22384,7 +22418,7 @@ env230|envision230|envision 230 graphics terminal, enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@, sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t; 1%;m$<2>, - sgr0=\E[0m$<2>, smacs@, use=vt100, + sgr0=\E[0m$<2>, smacs@, use=vt100+4bsd, # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic # coupler attached, the whole rig fitting in a suitcase and more or less # portable. Hot stuff for c.1977 :-) -- esr @@ -22517,7 +22551,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # You can obtain ECMA-48 for free by sending email to helpdesk@ecma.ch # requesting the standard(s) you want (i.e. ECMA-48, "Control Functions for # Coded Character Sets"), include your snail-mail address, and you should -# receive the document in due course. Don't expect an email acknowledgement. +# receive the document in due course. Don't expect an email acknowledgment. # # Related standards include "X3.4-1977: American National Standard Code for # Information Interchange" (the ASCII standard) and "X3.41.1974: @@ -22542,8 +22576,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, # sequences. In the main table, \E stands for an escape (\033) character, # SPC for space. Pn stands for a single numeric parameter to be inserted # in decimal ASCII. Ps stands for a list of such parameters separated by -# semicolons. Parameter meanings for most parametrized sequences are -# decribed in the notes. +# semicolons. Parameter meanings for most parameterized sequences are +# described in the notes. # # Sequence Sequence Parameter or # Mnemonic Name Sequence Value Mode terminfo @@ -22551,7 +22585,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # APC Applicatn Program Command \E _ - Delim - # BEL Bell * ^G - - bel # BPH Break Permitted Here * \E B - * - -# BS Backpace * ^H - EF - +# BS BackSpace * ^H - EF - # CAN Cancel * ^X - - - (A) # CBT Cursor Backward Tab \E [ Pn Z 1 eF cbt # CCH Cancel Previous Character \E T - - - @@ -22729,9 +22763,14 @@ v3220|LANPAR Vision II model 3220/3221/3222, # (E) ECMA-48 calls this "Active Position Report" but preserves the CPR # abbreviation. # -# (F) CTC parameter values: 0 = set char tab, 1 = set line tab, 2 = clear -# char tab, 3 = clear line tab, 4 = clear all char tabs on current line, -# 5 = clear all char tabs, 6 = clear all line tabs. +# (F) CTC parameter values: +# 0 = set char tab, +# 1 = set line tab, +# 2 = clear char tab, +# 3 = clear line tab, +# 4 = clear all char tabs on current line, +# 5 = clear all char tabs, +# 6 = clear all line tabs. # # (G) CUP and HVP are identical in effect. Some ANSI.SYS versions accept # HVP, but always allow CUP as an alternate. ECMA-48 calls HVP "Character @@ -22740,12 +22779,19 @@ v3220|LANPAR Vision II model 3220/3221/3222, # (H) ECMA calls this "Cursor Line Tabulation" but preserves the CVT # abbreviation. # -# (I) DSR parameter values: 0 = ready, 1 = busy, 2 = busy, will send DSR -# later, 3 = malfunction, 4 = malfunction, will send DSR later, 5 = request -# DSR, 6 = request CPR response. +# (I) DSR parameter values: +# 0 = ready, +# 1 = busy, +# 2 = busy, will send DSR later, +# 3 = malfunction, +# 4 = malfunction, will send DSR later, +# 5 = request DSR, +# 6 = request CPR response. # -# (J) ECMA calls ED "Erase In Page". EA/ED/EL parameters: 0 = clear to end, -# 1 = clear from beginning, 2 = clear. +# (J) ECMA calls ED "Erase In Page". EA/ED/EL parameters: +# 0 = clear to end, +# 1 = clear from beginning, +# 2 = clear. # # (K) ECMA calls this "End of Guarded Area" but preserves the EPA abbreviation. # @@ -22758,20 +22804,57 @@ v3220|LANPAR Vision II model 3220/3221/3222, # (N) ECMA-48 calls this "Character Tabulation" but retains the HT # abbreviation. # -# (O) SGR parameter values: 0 = default mode (attributes off), 1 = bold, -# 2 = dim, 3 = italicized, 4 = underlined, 5 = slow blink, 6 = fast blink, -# 7 = reverse video, 8 = invisible, 9 = crossed-out (marked for deletion), -# 10 = primary font, 10 + n (n in 1..9) = nth alternative font, 20 = Fraktur, -# 21 = double underline, 22 = turn off 2, 23 = turn off 3, 24 = turn off 4, -# 25 = turn off 5, 26 = proportional spacing, 27 = turn off 7, 28 = turn off -# 8, 29 = turn off 9, 30 = black fg, 31 = red fg, 32 = green fg, 33 = yellow -# fg, 34 = blue fg, 35 = magenta fg, 36 = cyan fg, 37 = white fg, 38 = set -# fg color as in CCIT T.416, 39 = set default fg color, 40 = black bg -# 41 = red bg, 42 = green bg, 43 = yellow bg, 44 = blue bg, 45 = magenta bg, -# 46 = cyan bg, 47 = white bg, 48 = set bg color as in CCIT T.416, 39 = set -# default bg color, 50 = turn off 26, 51 = framed, 52 = encircled, 53 = -# overlined, 54 = turn off 51 & 52, 55 = not overlined, 56-59 = reserved, -# 61-65 = variable highlights for ideograms. +# (O) SGR parameter values: +# 0 = default mode (attributes off), +# 1 = bold, +# 2 = dim, +# 3 = italicized, +# 4 = underlined, +# 5 = slow blink, +# 6 = fast blink, +# 7 = reverse video, +# 8 = invisible, +# 9 = crossed-out (marked for deletion), +# 10 = primary font, +# 10 + n (n in 1..9) = nth alternative font, +# 20 = Fraktur, +# 21 = double underline, +# 22 = turn off 2, +# 23 = turn off 3, +# 24 = turn off 4, +# 25 = turn off 5, +# 26 = proportional spacing, +# 27 = turn off 7, +# 28 = turn off 8, +# 29 = turn off 9, +# 30 = black fg, +# 31 = red fg, +# 32 = green fg, +# 33 = yellow fg, +# 34 = blue fg, +# 35 = magenta fg, +# 36 = cyan fg, +# 37 = white fg, +# 38 = set fg color as in CCITT T.416, +# 39 = set default fg color, +# 40 = black bg +# 41 = red bg, +# 42 = green bg, +# 43 = yellow bg, +# 44 = blue bg, +# 45 = magenta bg, +# 46 = cyan bg, +# 47 = white bg, +# 48 = set bg color as in CCITT T.416, +# 49 = set default bg color, +# 50 = turn off 26, +# 51 = framed, +# 52 = encircled, +# 53 = overlined, +# 54 = turn off 51 & 52, +# 55 = not overlined, +# 56-59 = reserved, +# 61-65 = variable highlights for ideograms. # # (P) SI is also called LSO, Locking Shift Zero. # @@ -22781,11 +22864,15 @@ v3220|LANPAR Vision II model 3220/3221/3222, # use CUD for this function and ignore VPR. ECMA calls it `Line Position # Absolute' but retains the VPA abbreviation. # -# (S) MC parameters: 0 = start xfer to primary aux device, 1 = start xfer from -# primary aux device, 2 = start xfer to secondary aux device, 3 = start xfer -# from secondary aux device, 4 = stop relay to primary aux device, 5 = -# start relay to primary aux device, 6 = stop relay to secondary aux device, -# 7 = start relay to secondary aux device. +# (S) MC parameters: +# 0 = start xfer to primary aux device, +# 1 = start xfer from primary aux device, +# 2 = start xfer to secondary aux device, +# 3 = start xfer from secondary aux device, +# 4 = stop relay to primary aux device, +# 5 = start relay to primary aux device, +# 6 = stop relay to secondary aux device, +# 7 = start relay to secondary aux device. # # (T) ECMA-48 calls this "Partial Line Forward" but retains the PLD # abbreviation. @@ -22795,19 +22882,32 @@ v3220|LANPAR Vision II model 3220/3221/3222, # # (V) ECMA-48 calls this "Reverse Line Feed" but retains the RI abbreviation. # -# (W) RM/SM modes are as follows: 1 = Guarded Area Transfer Mode (GATM), -# 2 = Keyboard Action Mode (KAM), 3 = Control Representation Mode (CRM), -# 4 = Insertion Replacement Mode, 5 = Status Report Transfer Mode (SRTM), -# 6 = Erasure Mode (ERM), 7 = Line Editing Mode (LEM), 8 = Bi-Directional -# Support Mode (BDSM), 9 = Device Component Select Mode (DCSM), -# 10 = Character Editing Mode (HEM), 11 = Positioning Unit Mode (PUM), -# 12 = Send/Receive Mode, 13 = Format Effector Action Mode (FEAM), -# 14 = Format Effector Transfer Mode (FETM), 15 = Multiple Area Transfer -# Mode (MATM), 16 = Transfer Termination Mode, 17 = Selected Area Transfer -# Mode, 18 = Tabulation Stop Mode, 19 = Editing Boundary Mode, 20 = Line Feed -# New Line Mode (LF/NL), Graphic Rendition Combination Mode (GRCM), 22 = -# Zero Default Mode (ZDM). The EBM and LF/NL modes have actually been removed -# from ECMA-48's 5th edition but are listed here for reference. +# (W) RM/SM modes are as follows: +# 1 = Guarded Area Transfer Mode (GATM), +# 2 = Keyboard Action Mode (KAM), +# 3 = Control Representation Mode (CRM), +# 4 = Insertion Replacement Mode (IRM), +# 5 = Status Report Transfer Mode (SRTM), +# 6 = Erasure Mode (ERM), +# 7 = Line Editing Mode (LEM), +# 8 = Bi-Directional Support Mode (BDSM), +# 9 = Device Component Select Mode (DCSM), +# 10 = Character Editing Mode (HEM), +# 11 = Positioning Unit Mode (PUM), +# 12 = Send/Receive Mode (SRM), +# 13 = Format Effector Action Mode (FEAM), +# 14 = Format Effector Transfer Mode (FETM), +# 15 = Multiple Area Transfer Mode (MATM), +# 16 = Transfer Termination Mode (TTM), +# 17 = Selected Area Transfer Mode (SATM), +# 18 = Tabulation Stop Mode (TSM), +# 19 = Editing Boundary Mode (EBM), +# 20 = Line Feed New Line Mode (LF/NL), +# 21 = Graphic Rendition Combination Mode (GRCM), +# 22 = Zero Default Mode (ZDM). +# +# The EBM and LF/NL modes have actually been removed from ECMA-48's 5th edition +# but are listed here for reference. # # (X) Select Alternate Presentation Variants is used only for non-Latin # alphabets. @@ -23140,7 +23240,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # # There is a set of nonstandard terminfos used by IBM's AIX operating system. # The AIX terminfo library diverged from SVr1 terminfo, and replaces all -# capabilities following prtr_non with the following special capabilties: +# capabilities following prtr_non with the following special capabilities: # box[12], batt[12], colb[0123456789], colf[0123456789], f[01234567], kbtab, # kdo, kcmd, kcpn, kend, khlp, knl, knpn, kppn, kppn, kquit, ksel, kscl, kscr, # ktab, kmpf[123456789], apstr, ksf1..ksf10, kf11...kf63, kact, topl, btml, @@ -23365,7 +23465,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # 9.4.2 (Thu Mar 9 01:45:44 EST 1995): # * Merged in DEC's official entries for its terminals. The only old # entry I kept was Doug Gwyn's alternate vt100 (as vt100-avo). -# * Replaced the translated BBN Bitgraph entries with purpose-built +# * Replaced the translated BBN BitGraph entries with purpose-built # ones from AT&T's SVr3. # * Replaced the AT&T entries with AT&T's official terminfos. # * Added teleray 16, vc415, cops10. @@ -23551,7 +23651,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * Corrected hpa/vpa in linux entry. They still fail the worm test. # * We can handle the HP meml/memu capability now. # * Added smacs to klone entries, just as documentation. -# * Carrected ansi.sys and cit-500 entries. +# * Corrected ansi.sys and cit-500 entries. # * Added z39, vt320-k311, v220c, and avatar entries. # * Make pcansi use the ansi.sys invis capability. # * Added DIP switch descriptions for vt100, adm31, tvi910, tvi920c, @@ -23971,7 +24071,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * resolve ambiguity of kend/kll/kslt and khome/kfnd/kich1 strings in # xterm and ncsa entries by removing the unneeded ones. Note that # some entries will return kend & khome versus kslt and kfnd, for -# PC-style keyboards versus strict vt220 compatiblity - TD +# PC-style keyboards versus strict vt220 compatibility - TD # # 1999/3/13 # * adjust xterm-xfree86 khome/kend to match default PC-style keyboard @@ -24564,7 +24664,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # # 2009-12-19 # * add bw (auto-left-margin) to nsterm* entries (Benjamin Sittler) -# * rename minix to minix-1.7, add minix entry for Minux3 -TD +# * rename minix to minix-1.7, add minix entry for Minix3 -TD # # 2009-12-26 # * add bterm (bogl 0.1.18) -TD @@ -24991,4 +25091,15 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + uncancel Ms in tmux entry (Harry Gindi, Nicholas Marriott). # + add dumb-emacs-ansi -TD # +# 2017-03-05 +# + correct a few spelling errors in comments -TD +# + add fbterm -TD +# +# 2017-03-11 +# + add vt100+4bsd building block, use that for older terminals rather +# than "vt100" which is now mostly used as a building block for +# terminal emulators -TD +# + modify vt100 rs2 string to reset vt52 mode and scrolling regions +# (report/analysis by Robert King) -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c index 9b4d2b8f..ed0c6427 100644 --- a/ncurses/base/lib_color.c +++ b/ncurses/base/lib_color.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -38,14 +38,17 @@ * Handles color emulation of SYS V curses */ +#define NEW_PAIR_INTERNAL 1 + #include +#include #include #ifndef CUR #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_color.c,v 1.113 2016/05/07 23:50:54 tom Exp $") +MODULE_ID("$Id: lib_color.c,v 1.115 2017/03/09 00:35:14 tom Exp $") #ifdef USE_TERM_DRIVER #define CanChange InfoOf(SP_PARM).canchange @@ -137,13 +140,6 @@ NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette = hls_palette; /* *INDENT-ON* */ -/* - * Ensure that we use color pairs only when colors have been started, and also - * that the index is within the limits of the table which we allocated. - */ -#define ValidPair(pair) \ - ((SP_PARM != 0) && (pair >= 0) && (pair < SP_PARM->_pair_limit) && SP_PARM->_coloron) - #if NCURSES_EXT_FUNCS /* * These are called from _nc_do_color(), which in turn is called from @@ -346,6 +342,8 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) * allow for default-color as a component of a color-pair. */ SP_PARM->_pair_limit += (1 + (2 * maxcolors)); + if ((NCURSES_PAIRS_T) SP_PARM->_pair_limit < 0) + SP_PARM->_pair_limit = MAX_XCURSES_PAIR; #endif SP_PARM->_pair_count = maxpairs; SP_PARM->_color_count = maxcolors; @@ -358,8 +356,9 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) if (SP_PARM->_color_pairs != 0) { SP_PARM->_color_table = TYPE_CALLOC(color_t, maxcolors); if (SP_PARM->_color_table != 0) { - SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(NCURSES_SP_ARG), - default_bg(NCURSES_SP_ARG)); + MakeColorPair(SP_PARM->_color_pairs[0], + default_fg(NCURSES_SP_ARG), + default_bg(NCURSES_SP_ARG)); init_color_table(NCURSES_SP_ARG); T(("started color: COLORS = %d, COLOR_PAIRS = %d", @@ -424,6 +423,31 @@ rgb2hls(int r, int g, int b, NCURSES_COLOR_T *h, NCURSES_COLOR_T *l, NCURSES_COL *h = (NCURSES_COLOR_T) (t % 360); } +/* + * Change all cells which use(d) a given color pair to force a repaint. + */ +NCURSES_EXPORT(void) +_nc_change_pair(SCREEN *sp, int pair) +{ + int y, x; + + for (y = 0; y <= CurScreen(sp)->_maxy; y++) { + struct ldat *ptr = &(CurScreen(sp)->_line[y]); + bool changed = FALSE; + for (x = 0; x <= CurScreen(sp)->_maxx; x++) { + if (GetPair(ptr->text[x]) == pair) { + /* Set the old cell to zero to ensure it will be + updated on the next doupdate() */ + SetChar(ptr->text[x], 0, 0); + CHANGED_CELL(ptr, x); + changed = TRUE; + } + } + if (changed) + NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_ARGx y); + } +} + /* * Extension (1997/1/18) - Allow negative f/b values to set default color * values. @@ -434,7 +458,8 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx NCURSES_COLOR_T f, NCURSES_COLOR_T b) { - colorpair_t result; + static colorpair_t null_pair; + colorpair_t result = null_pair; colorpair_t previous; int maxcolors; @@ -444,7 +469,7 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx (int) f, (int) b)); - if (!ValidPair(pair)) + if (!ValidPair(SP_PARM, pair)) returnCode(ERR); maxcolors = MaxColors; @@ -479,8 +504,8 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx * Check if the table entry that we are going to init/update used * default colors. */ - if ((FORE_OF(previous) == COLOR_DEFAULT) - || (BACK_OF(previous) == COLOR_DEFAULT)) + if (isDefaultColor(FORE_OF(previous)) + || isDefaultColor(BACK_OF(previous))) wasDefault = TRUE; /* @@ -520,29 +545,17 @@ NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx * initialized before a screen update is performed replacing original * pair colors with the new ones). */ - result = PAIR_OF(f, b); - if (previous != 0 - && previous != result) { - int y, x; - - for (y = 0; y <= CurScreen(SP_PARM)->_maxy; y++) { - struct ldat *ptr = &(CurScreen(SP_PARM)->_line[y]); - bool changed = FALSE; - for (x = 0; x <= CurScreen(SP_PARM)->_maxx; x++) { - if (GetPair(ptr->text[x]) == pair) { - /* Set the old cell to zero to ensure it will be - updated on the next doupdate() */ - SetChar(ptr->text[x], 0, 0); - CHANGED_CELL(ptr, x); - changed = TRUE; - } - } - if (changed) - NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_ARGx y); - } + MakeColorPair(result, f, b); + if (FORE_OF(previous) != 0 + && BACK_OF(previous) != 0 + && !isSamePair(previous, result)) { + _nc_change_pair(SP_PARM, pair); } + _nc_reset_color_pair(SP_PARM, pair, &result); SP_PARM->_color_pairs[pair] = result; + _nc_set_color_pair(SP_PARM, pair, cpINIT); + if (GET_SCREEN_PAIR(SP_PARM) == pair) SET_SCREEN_PAIR(SP_PARM, (int) (~0)); /* force attribute update */ @@ -768,16 +781,16 @@ NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx (void *) f, (void *) b)); - if (!ValidPair(pair)) { + if (!ValidPair(SP_PARM, pair)) { result = ERR; } else { NCURSES_COLOR_T fg = (NCURSES_COLOR_T) FORE_OF(SP_PARM->_color_pairs[pair]); NCURSES_COLOR_T bg = (NCURSES_COLOR_T) BACK_OF(SP_PARM->_color_pairs[pair]); #if NCURSES_EXT_FUNCS - if (fg == COLOR_DEFAULT) + if (isDefaultColor(fg)) fg = -1; - if (bg == COLOR_DEFAULT) + if (isDefaultColor(bg)) bg = -1; #endif @@ -818,7 +831,7 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx NCURSES_COLOR_T old_fg = -1; NCURSES_COLOR_T old_bg = -1; - if (!ValidPair(pair)) { + if (!ValidPair(SP_PARM, pair)) { return; } else if (pair != 0) { if (set_color_pair) { diff --git a/ncurses/base/lib_dft_fgbg.c b/ncurses/base/lib_dft_fgbg.c index 4d7fdd0f..0e6f9417 100644 --- a/ncurses/base/lib_dft_fgbg.c +++ b/ncurses/base/lib_dft_fgbg.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2011,2014 Free Software Foundation, Inc. * + * Copyright (c) 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -37,7 +37,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_dft_fgbg.c,v 1.27 2014/03/08 20:32:59 tom Exp $") +MODULE_ID("$Id: lib_dft_fgbg.c,v 1.28 2017/03/01 00:09:42 tom Exp $") /* * Modify the behavior of color-pair 0 so that the library doesn't assume that @@ -76,8 +76,8 @@ NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg) SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg); SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE); - SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); - SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); + SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg; + SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg; if (SP_PARM->_color_pairs != 0) { bool save = SP_PARM->_default_color; SP_PARM->_assumed_color = TRUE; diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c index 6d56029a..8a13b407 100644 --- a/ncurses/base/lib_freeall.c +++ b/ncurses/base/lib_freeall.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -39,7 +39,7 @@ extern int malloc_errfd; /* FIXME */ #endif -MODULE_ID("$Id: lib_freeall.c,v 1.64 2016/05/28 23:11:26 tom Exp $") +MODULE_ID("$Id: lib_freeall.c,v 1.65 2017/03/04 00:12:23 tom Exp $") /* * Free all ncurses data. This is used for testing only (there's no practical @@ -59,6 +59,9 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0) if (SP_PARM->_panelHook.destroy != 0) { SP_PARM->_panelHook.destroy(SP_PARM->_panelHook.stdscr_pseudo_panel); } +#if USE_NEW_PAIR + _nc_new_pair_leaks(SP_PARM); +#endif } #endif if (SP_PARM != 0) { diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c index 3a7476d4..864968c1 100644 --- a/ncurses/base/lib_set_term.c +++ b/ncurses/base/lib_set_term.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -47,7 +47,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_set_term.c,v 1.155 2016/05/28 21:33:38 tom Exp $") +MODULE_ID("$Id: lib_set_term.c,v 1.156 2017/03/01 00:10:41 tom Exp $") #ifdef USE_TERM_DRIVER #define MaxColors InfoOf(sp).maxcolors @@ -420,8 +420,8 @@ NCURSES_SP_NAME(_nc_setupscreen) ( sp->_default_fg = COLOR_WHITE; sp->_default_bg = COLOR_BLACK; #else - sp->_default_fg = C_MASK; - sp->_default_bg = C_MASK; + sp->_default_fg = COLOR_DEFAULT; + sp->_default_bg = COLOR_DEFAULT; #endif /* @@ -433,9 +433,9 @@ NCURSES_SP_NAME(_nc_setupscreen) ( char sep1, sep2; int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2); if (count >= 1) { - sp->_default_fg = ((fg >= 0 && fg < MaxColors) ? fg : C_MASK); + sp->_default_fg = ((fg >= 0 && fg < MaxColors) ? fg : COLOR_DEFAULT); if (count >= 3) { - sp->_default_bg = ((bg >= 0 && bg < MaxColors) ? bg : C_MASK); + sp->_default_bg = ((bg >= 0 && bg < MaxColors) ? bg : COLOR_DEFAULT); } TR(TRACE_CHARPUT | TRACE_MOVE, ("from environment assumed fg=%d, bg=%d", diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c new file mode 100644 index 00000000..271d494d --- /dev/null +++ b/ncurses/base/new_pair.c @@ -0,0 +1,340 @@ +/**************************************************************************** + * Copyright (c) 2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Thomas E. Dickey * + ****************************************************************************/ + +/* new_pair.c + * + * New color-pair functions, alloc_pair and free_pair + */ + +#define NEW_PAIR_INTERNAL 1 +#include + +#ifndef CUR +#define CUR SP_TERMTYPE +#endif + +#ifdef USE_TERM_DRIVER +#define MaxColors InfoOf(SP_PARM).maxcolors +#else +#define MaxColors max_colors +#endif + +#if USE_NEW_PAIR + +/* fix redefinition versys tic.h */ +#undef entry +#define entry my_entry +#undef ENTRY +#define ENTRY my_ENTRY + +#include + +#endif + +MODULE_ID("$Id: new_pair.c,v 1.8 2017/03/10 09:22:50 tom Exp $") + +#if USE_NEW_PAIR + +#ifdef NEW_PAIR_DEBUG + +static int +prev_len(SCREEN *sp, int pair) +{ + int result = 1; + int base = pair; + colorpair_t *list = sp->_color_pairs; + while (list[pair].prev != base) { + result++; + pair = list[pair].prev; + } + return result; +} + +static int +next_len(SCREEN *sp, int pair) +{ + int result = 1; + int base = pair; + colorpair_t *list = sp->_color_pairs; + while (list[pair].next != base) { + result++; + pair = list[pair].next; + } + return result; +} + +/* + * Trace the contents of LRU color-pairs. + */ +static void +dumpit(SCREEN *sp, int pair, const char *tag) +{ + colorpair_t *list = sp->_color_pairs; + char bigbuf[256 * 20]; + char *p = bigbuf; + int n; + sprintf(p, "%s", tag); + p += strlen(p); + for (n = 0; n < sp->_pair_limit; ++n) { + if (list[n].mode != cpFREE) { + sprintf(p, " %d%c(%d,%d)", + n, n == pair ? '@' : ':', list[n].next, list[n].prev); + p += strlen(p); + } + } + T(("(%d/%d) %ld - %s", + next_len(sp, 0), + prev_len(sp, 0), + strlen(bigbuf), bigbuf)); + + if (next_len(sp, 0) != prev_len(sp, 0)) { + endwin(); + exit(1); + } +} +#else +#define dumpit(sp, pair, tag) /* nothing */ +#endif + +static int +compare_data(const void *a, const void *b) +{ + const colorpair_t *p = (const colorpair_t *) a; + const colorpair_t *q = (const colorpair_t *) b; + return ((p->fg == q->fg) + ? (p->bg - q->bg) + : (p->fg - q->fg)); +} + +static int +_nc_find_color_pair(SCREEN *sp, int fg, int bg) +{ + colorpair_t find; + int result; + void *pp; + + find.fg = fg; + find.bg = bg; + if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) { + colorpair_t *temp = *(colorpair_t **) pp; + result = (int) (temp - sp->_color_pairs); + } else { + result = -1; + } + return result; +} + +static void +delink_color_pair(SCREEN *sp, int pair) +{ + colorpair_t *list = sp->_color_pairs; + int prev = list[pair].prev; + int next = list[pair].next; + + /* delink this from its current location */ + if (list[prev].next == pair && + list[next].prev == pair) { + list[prev].next = next; + list[next].prev = prev; + dumpit(sp, pair, "delinked"); + } +} + +/* + * Use this call to update the fast-index when modifying an entry in the color + * pair table. + */ +NCURSES_EXPORT(void) +_nc_reset_color_pair(SCREEN *sp, int pair, colorpair_t * next) +{ + if (ValidPair(sp, pair)) { + colorpair_t *last = &(sp->_color_pairs[pair]); + delink_color_pair(sp, pair); + if (last->mode > cpFREE && + (last->fg != next->fg || last->bg != next->bg)) { + /* remove the old entry from fast index */ + tdelete(last, &sp->_ordered_pairs, compare_data); + /* create a new entry in fast index */ + *last = *next; + tsearch(last, &sp->_ordered_pairs, compare_data); + } + } +} + +/* + * Use this call to relink the newest pair to the front of the list, keeping + * "0" first. + */ +NCURSES_EXPORT(void) +_nc_set_color_pair(SCREEN *sp, int pair, int mode) +{ + if (ValidPair(sp, pair)) { + colorpair_t *list = sp->_color_pairs; + dumpit(sp, pair, "SET_PAIR"); + list[0].mode = cpKEEP; + if (list[pair].mode <= cpFREE) + sp->_pairs_used++; + list[pair].mode = mode; + if (list[0].next != pair) { + /* link it at the front of the list */ + list[pair].next = list[0].next; + list[list[pair].next].prev = pair; + list[pair].prev = 0; + list[0].next = pair; + } + dumpit(sp, pair, "...after"); + } +} + +NCURSES_EXPORT(int) +NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg) +{ + int pair; + + T((T_CALLED("alloc_pair(%d,%d)"), fg, bg)); + if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) { + /* + * Check if all of the slots have been used. If not, find one and + * use that. + */ + if (SP_PARM->_pairs_used + 1 < SP_PARM->_pair_limit) { + bool found = FALSE; + int hint = SP_PARM->_recent_pair; + + /* + * The linear search is done to allow mixing calls to init_pair() + * and alloc_pair(). The former can make gaps... + */ + for (pair = hint + 1; pair < SP_PARM->_pair_limit; pair++) { + if (SP_PARM->_color_pairs[pair].mode == cpFREE) { + T(("found gap %d", pair)); + found = TRUE; + break; + } + } + if (!found) { + for (pair = 1; pair <= hint; pair++) { + if (SP_PARM->_color_pairs[pair].mode == cpFREE) { + T(("found gap %d", pair)); + found = TRUE; + break; + } + } + } + if (found) { + SP_PARM->_recent_pair = pair; + } else { + pair = ERR; + } + } else { + /* reuse the oldest one */ + pair = SP_PARM->_color_pairs[0].prev; + T(("reusing %d", pair)); + } + + if (pair > 0 && pair <= MAX_XCURSES_PAIR) { + IGNORE_RC(init_pair((short)pair, (short)fg, (short)bg)); + } else { + pair = ERR; + } + } + returnCode(pair); +} + +NCURSES_EXPORT(int) +NCURSES_SP_NAME(find_pair) (NCURSES_SP_DCLx int fg, int bg) +{ + int pair; + + T((T_CALLED("find_pair(%d,%d)"), fg, bg)); + pair = _nc_find_color_pair(SP_PARM, fg, bg); + returnCode(pair); +} + +NCURSES_EXPORT(int) +NCURSES_SP_NAME(free_pair) (NCURSES_SP_DCLx int pair) +{ + int result = ERR; + T((T_CALLED("free_pair(%d)"), pair)); + if (ValidPair(SP_PARM, pair)) { + colorpair_t *cp = &(SP_PARM->_color_pairs[pair]); + if (pair != 0) { + _nc_change_pair(SP_PARM, pair); + delink_color_pair(SP_PARM, pair); + tdelete(cp, &SP_PARM->_ordered_pairs, compare_data); + cp->mode = cpFREE; + result = OK; + SP_PARM->_pairs_used--; + } + } + returnCode(result); +} + +#if NCURSES_SP_FUNCS +NCURSES_EXPORT(int) +alloc_pair(int f, int b) +{ + return NCURSES_SP_NAME(alloc_pair) (CURRENT_SCREEN, f, b); +} + +NCURSES_EXPORT(int) +find_pair(int f, int b) +{ + return NCURSES_SP_NAME(find_pair) (CURRENT_SCREEN, f, b); +} + +NCURSES_EXPORT(int) +free_pair(int pair) +{ + return NCURSES_SP_NAME(free_pair) (CURRENT_SCREEN, pair); +} +#endif + +#if NO_LEAKS +NCURSES_EXPORT(void) +_nc_new_pair_leaks(SCREEN *sp) +{ + if (sp->_color_pairs) { + while (sp->_color_pairs[0].next) { + free_pair(sp->_color_pairs[0].next); + } + } +} +#endif + +#else +void _nc_new_pair(void); +void +_nc_new_pair(void) +{ +}; +#endif /* USE_NEW_PAIR */ diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index d7e16707..0285c539 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.560 2017/02/04 23:21:09 tom Exp $ + * $Id: curses.priv.h,v 1.563 2017/03/10 09:21:46 tom Exp $ * * curses.priv.h * @@ -416,6 +416,9 @@ color_t; #define unColor(n) unColor2(AttrOf(n)) #define unColor2(a) ((a) & ALL_BUT_COLOR) +#define XCURSES_PAIR_T short +#define MAX_XCURSES_PAIR (int) ((1U << 15) - 1) + /* * Extended-colors stores the color pair in a separate struct-member than the * attributes. But for compatibility, we handle most cases where a program @@ -434,7 +437,7 @@ color_t; #define SET_WINDOW_PAIR(w,p) (w)->_color = (p) #define SameAttrOf(a,b) (AttrOf(a) == AttrOf(b) && GetPair(a) == GetPair(b)) -#define VIDATTR(sp,attr,pair) NCURSES_SP_NAME(vid_puts)(NCURSES_SP_ARGx attr, (short) pair, 0, NCURSES_OUTC_FUNC) +#define VIDATTR(sp,attr,pair) NCURSES_SP_NAME(vid_puts)(NCURSES_SP_ARGx attr, (NCURSES_PAIRS_T) pair, 0, NCURSES_OUTC_FUNC) #else /* !NCURSES_EXT_COLORS */ @@ -635,15 +638,10 @@ extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *); /* * Definitions for color pairs */ -typedef unsigned colorpair_t; /* type big enough to store PAIR_OF() */ -#define C_SHIFT 9 /* we need more bits than there are colors */ -#define C_MASK ((1 << C_SHIFT) - 1) -#define PAIR_OF(fg, bg) (colorpair_t) ((((fg) & C_MASK) << C_SHIFT) | ((bg) & C_MASK)) -#define FORE_OF(c) (((c) >> C_SHIFT) & C_MASK) -#define BACK_OF(c) ((c) & C_MASK) -#define isDefaultColor(c) ((c) >= COLOR_DEFAULT || (c) < 0) +#include -#define COLOR_DEFAULT C_MASK +#define isDefaultColor(c) ((c) < 0) +#define COLOR_DEFAULT -1 #if defined(USE_BUILD_CC) || (defined(USE_TERMLIB) && !defined(NEED_NCURSES_CH_T)) @@ -1103,9 +1101,14 @@ struct screen { color_t *_color_table; /* screen's color palette */ int _color_count; /* count of colors in palette */ colorpair_t *_color_pairs; /* screen's color pair list */ - int _pair_count; /* count of color pairs */ + int _pair_count; /* same as COLOR_PAIRS */ int _pair_limit; /* actual limit of color-pairs */ #if NCURSES_EXT_FUNCS +#if USE_NEW_PAIR + void *_ordered_pairs; /* index used by alloc_pair() */ + int _pairs_used; /* actual number of color-pairs used */ + int _recent_pair; /* number for most recent free-pair */ +#endif bool _assumed_color; /* use assumed colors */ bool _default_color; /* use default colors */ bool _has_sgr_39_49; /* has ECMA default color support */ @@ -1924,6 +1927,7 @@ extern NCURSES_EXPORT(int) _nc_wchstrlen(const cchar_t *); /* lib_color.c */ extern NCURSES_EXPORT(bool) _nc_reset_colors(void); +extern NCURSES_EXPORT(void) _nc_change_pair(SCREEN *, int); /* lib_getch.c */ extern NCURSES_EXPORT(int) _nc_wgetch(WINDOW *, int *, int EVENTLIST_2nd(_nc_eventlist *)); diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses index 3b801934..e6d98628 100644 --- a/ncurses/llib-lncurses +++ b/ncurses/llib-lncurses @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -240,6 +240,12 @@ int start_color_sp( int start_color(void) { return(*(int *)0); } +#undef _nc_change_pair +void _nc_change_pair( + SCREEN *sp, + int pair) + { /* void */ } + #undef init_pair_sp int init_pair_sp( SCREEN *sp, @@ -2639,6 +2645,45 @@ int mcprint( int len) { return(*(int *)0); } +/* ./base/new_pair.c */ + +#undef alloc_pair_sp +int alloc_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef find_pair_sp +int find_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef free_pair_sp +int free_pair_sp( + SCREEN *sp, + int pair) + { return(*(int *)0); } + +#undef alloc_pair +int alloc_pair( + int f, + int b) + { return(*(int *)0); } + +#undef find_pair +int find_pair( + int f, + int b) + { return(*(int *)0); } + +#undef free_pair +int free_pair( + int pair) + { return(*(int *)0); } + /* ./base/resizeterm.c */ #undef is_term_resized_sp diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest index ee4a5f29..4a60f72f 100644 --- a/ncurses/llib-lncursest +++ b/ncurses/llib-lncursest @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2008-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -243,6 +243,12 @@ int start_color_sp( int start_color(void) { return(*(int *)0); } +#undef _nc_change_pair +void _nc_change_pair( + SCREEN *sp, + int pair) + { /* void */ } + #undef init_pair_sp int init_pair_sp( SCREEN *sp, @@ -2648,6 +2654,45 @@ int mcprint( int len) { return(*(int *)0); } +/* ./base/new_pair.c */ + +#undef alloc_pair_sp +int alloc_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef find_pair_sp +int find_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef free_pair_sp +int free_pair_sp( + SCREEN *sp, + int pair) + { return(*(int *)0); } + +#undef alloc_pair +int alloc_pair( + int f, + int b) + { return(*(int *)0); } + +#undef find_pair +int find_pair( + int f, + int b) + { return(*(int *)0); } + +#undef free_pair +int free_pair( + int pair) + { return(*(int *)0); } + /* ./base/resizeterm.c */ #undef is_term_resized_sp diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw index e9e9f727..80d191ae 100644 --- a/ncurses/llib-lncursestw +++ b/ncurses/llib-lncursestw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2009-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -280,6 +280,12 @@ int start_color_sp( int start_color(void) { return(*(int *)0); } +#undef _nc_change_pair +void _nc_change_pair( + SCREEN *sp, + int pair) + { /* void */ } + #undef init_pair_sp int init_pair_sp( SCREEN *sp, @@ -3431,6 +3437,59 @@ int mcprint( int len) { return(*(int *)0); } +/* ./base/new_pair.c */ + +#undef _nc_reset_color_pair +void _nc_reset_color_pair( + SCREEN *sp, + int pair, + colorpair_t *next) + { /* void */ } + +#undef _nc_set_color_pair +void _nc_set_color_pair( + SCREEN *sp, + int pair, + int mode) + { /* void */ } + +#undef alloc_pair_sp +int alloc_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef find_pair_sp +int find_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef free_pair_sp +int free_pair_sp( + SCREEN *sp, + int pair) + { return(*(int *)0); } + +#undef alloc_pair +int alloc_pair( + int f, + int b) + { return(*(int *)0); } + +#undef find_pair +int find_pair( + int f, + int b) + { return(*(int *)0); } + +#undef free_pair +int free_pair( + int pair) + { return(*(int *)0); } + /* ./base/resizeterm.c */ #undef is_term_resized_sp diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw index 04729a1a..c9ce866f 100644 --- a/ncurses/llib-lncursesw +++ b/ncurses/llib-lncursesw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 2001-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -277,6 +277,12 @@ int start_color_sp( int start_color(void) { return(*(int *)0); } +#undef _nc_change_pair +void _nc_change_pair( + SCREEN *sp, + int pair) + { /* void */ } + #undef init_pair_sp int init_pair_sp( SCREEN *sp, @@ -3422,6 +3428,59 @@ int mcprint( int len) { return(*(int *)0); } +/* ./base/new_pair.c */ + +#undef _nc_reset_color_pair +void _nc_reset_color_pair( + SCREEN *sp, + int pair, + colorpair_t *next) + { /* void */ } + +#undef _nc_set_color_pair +void _nc_set_color_pair( + SCREEN *sp, + int pair, + int mode) + { /* void */ } + +#undef alloc_pair_sp +int alloc_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef find_pair_sp +int find_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef free_pair_sp +int free_pair_sp( + SCREEN *sp, + int pair) + { return(*(int *)0); } + +#undef alloc_pair +int alloc_pair( + int f, + int b) + { return(*(int *)0); } + +#undef find_pair +int find_pair( + int f, + int b) + { return(*(int *)0); } + +#undef free_pair +int free_pair( + int pair) + { return(*(int *)0); } + /* ./base/resizeterm.c */ #undef is_term_resized_sp diff --git a/ncurses/modules b/ncurses/modules index b3b97321..117aed98 100644 --- a/ncurses/modules +++ b/ncurses/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.120 2013/01/26 22:17:55 tom Exp $ +# $Id: modules,v 1.121 2017/03/01 01:58:12 tom Exp $ ############################################################################## -# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. # +# Copyright (c) 1998-2013,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -44,7 +44,7 @@ lib_clear lib $(base) $(HEADER_DEPS) lib_clearok lib $(base) $(HEADER_DEPS) lib_clrbot lib $(base) $(HEADER_DEPS) lib_clreol lib $(base) $(HEADER_DEPS) -lib_color lib $(base) $(HEADER_DEPS) $(INCDIR)/tic.h +lib_color lib $(base) $(HEADER_DEPS) $(INCDIR)/tic.h $(srcdir)/new_pair.h lib_colorset lib $(base) $(HEADER_DEPS) lib_delch lib $(base) $(HEADER_DEPS) lib_delwin lib $(base) $(HEADER_DEPS) @@ -149,6 +149,7 @@ expanded lib . $(HEADER_DEPS) legacy_coding lib $(base) $(HEADER_DEPS) lib_dft_fgbg lib $(base) $(HEADER_DEPS) lib_print lib $(tinfo) $(HEADER_DEPS) +new_pair lib $(base) $(HEADER_DEPS) $(srcdir)/new_pair.h resizeterm lib $(base) $(HEADER_DEPS) trace_xnames lib $(trace) $(HEADER_DEPS) use_screen lib $(tinfo) $(HEADER_DEPS) diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h new file mode 100644 index 00000000..8c344dab --- /dev/null +++ b/ncurses/new_pair.h @@ -0,0 +1,98 @@ +/**************************************************************************** + * Copyright (c) 2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Thomas E. Dickey * + ****************************************************************************/ + +/* + * Common type definitions and macros for new_pair.c, lib_color.c + * + * $Id: new_pair.h,v 1.2 2017/03/10 09:20:43 tom Exp $ + */ + +#ifndef NEW_PAIR_H +#define NEW_PAIR_H 1 +/* *INDENT-OFF* */ + +#define USE_NEW_PAIR NCURSES_EXT_COLORS + +#ifdef NEW_PAIR_INTERNAL + +typedef enum { + cpKEEP = -1, /* color pair 0 */ + cpFREE = 0, /* free for use */ + cpINIT = 1, /* init_pair() */ + cpAUTO = 1 /* alloc_pair() */ +} CPMODE; + +typedef struct _color_pairs +{ + int fg; + int bg; +#if USE_NEW_PAIR + int mode; /* FIXME - needed? */ + int prev; /* index of previous item */ + int next; /* index of next item */ +#endif +} +colorpair_t; + +#define MakeColorPair(target,f,b) target.fg = f, target.bg = b +#define isSamePair(a,b) ((a).fg == (b).fg && (a).bg == (b).bg) +#define FORE_OF(c) (c).fg +#define BACK_OF(c) (c).bg + +/* + * Ensure that we use color pairs only when colors have been started, and also + * that the index is within the limits of the table which we allocated. + */ +#define ValidPair(sp,pair) \ + ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron) + +#if USE_NEW_PAIR +extern NCURSES_EXPORT(void) _nc_set_color_pair(SCREEN*, int, int); +extern NCURSES_EXPORT(void) _nc_reset_color_pair(SCREEN*, int, colorpair_t*); +#else +#define _nc_set_color_pair(sp, pair, mode) /* nothing */ +#define _nc_reset_color_pair(sp, pair, data) /* nothing */ +#endif + +#else + +typedef struct _color_pairs colorpair_t; + +#endif /* NEW_PAIR_INTERNAL */ + +#if NO_LEAKS +extern NCURSES_EXPORT(void) _nc_new_pair_leaks(SCREEN*); +#endif + +/* *INDENT-ON* */ + +#endif /* NEW_PAIR_H */ diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c index 6d75648f..18c7e2fd 100644 --- a/ncurses/tinfo/tinfo_driver.c +++ b/ncurses/tinfo/tinfo_driver.c @@ -51,7 +51,7 @@ # endif #endif -MODULE_ID("$Id: tinfo_driver.c,v 1.44 2017/01/07 16:34:52 tom Exp $") +MODULE_ID("$Id: tinfo_driver.c,v 1.45 2017/02/28 22:10:05 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -300,8 +300,8 @@ drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg) sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx "AX") == TRUE); - sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); - sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); + sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg; + sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg; if (sp->_color_pairs != 0) { bool save = sp->_default_color; sp->_default_color = TRUE; diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c index f62a8a73..1476b845 100644 --- a/ncurses/trace/lib_traceatr.c +++ b/ncurses/trace/lib_traceatr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -43,7 +43,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_traceatr.c,v 1.87 2016/09/05 00:44:51 tom Exp $") +MODULE_ID("$Id: lib_traceatr.c,v 1.88 2017/03/01 00:04:04 tom Exp $") #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) @@ -67,7 +67,7 @@ color_of(int c) if (c != my_cached) { my_cached = c; my_select = !my_select; - if (c == COLOR_DEFAULT) + if (isDefaultColor(c)) _nc_STRCPY(my_buffer[my_select], "default", COLOR_BUF_SIZE(my_select)); else diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c index 16811f5e..4e43e2b0 100644 --- a/ncurses/tty/tty_update.c +++ b/ncurses/tty/tty_update.c @@ -43,6 +43,8 @@ * *-----------------------------------------------------------------*/ +#define NEW_PAIR_INTERNAL 1 + #include #ifndef CUR @@ -82,7 +84,7 @@ #include -MODULE_ID("$Id: tty_update.c,v 1.286 2017/02/12 17:15:15 tom Exp $") +MODULE_ID("$Id: tty_update.c,v 1.287 2017/02/28 22:13:45 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a @@ -578,14 +580,15 @@ can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch) if (!SP_PARM->_default_color) return FALSE; - if (SP_PARM->_default_fg != C_MASK || SP_PARM->_default_bg != C_MASK) + if (!(isDefaultColor(SP_PARM->_default_fg) && + isDefaultColor(SP_PARM->_default_bg))) return FALSE; if ((pair = GetPair(CHDEREF(ch))) != 0) { NCURSES_COLOR_T fg, bg; if (NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx (short) pair, &fg, &bg) == ERR - || (fg != C_MASK || bg != C_MASK)) { + || !(isDefaultColor(fg) && isDefaultColor(bg))) { return FALSE; } } @@ -1345,8 +1348,8 @@ TransformLine(NCURSES_SP_DCLx int const lineno) && unColor(oldLine[n]) == unColor(newLine[n])) { if (oldPair < SP_PARM->_pair_limit && newPair < SP_PARM->_pair_limit - && (SP_PARM->_color_pairs[oldPair] == - SP_PARM->_color_pairs[newPair])) { + && (isSamePair(SP_PARM->_color_pairs[oldPair], + SP_PARM->_color_pairs[newPair]))) { SetPair(oldLine[n], GetPair(newLine[n])); } } diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 1547e1cf..441101ac 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.0+20170304) unstable; urgency=low +ncurses6 (6.0+20170311) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 26 Feb 2017 11:41:23 -0500 + -- Thomas E. Dickey Sun, 05 Mar 2017 14:24:08 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 1547e1cf..441101ac 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.0+20170304) unstable; urgency=low +ncurses6 (6.0+20170311) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 26 Feb 2017 11:41:23 -0500 + -- Thomas E. Dickey Sun, 05 Mar 2017 14:24:08 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 434ba685..d7043175 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.0+20170304) unstable; urgency=low +ncurses6 (6.0+20170311) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 26 Feb 2017 11:41:23 -0500 + -- Thomas E. Dickey Sun, 05 Mar 2017 14:24:08 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index a126a3eb..8dde281c 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.201 2017/02/26 16:41:23 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.202 2017/03/05 19:24:08 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "0" !define VERSION_YYYY "2017" -!define VERSION_MMDD "0304" +!define VERSION_MMDD "0311" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 4dd7b116..f8249875 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.0 -Release: 20170304 +Release: 20170311 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.map b/package/ncurses.map index 433b4afe..ca44a09b 100644 --- a/package/ncurses.map +++ b/package/ncurses.map @@ -1,4 +1,4 @@ -# $Id: ncurses.map,v 1.36 2016/10/30 01:06:37 tom Exp $ +# $Id: ncurses.map,v 1.38 2017/03/09 09:48:41 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -747,6 +747,12 @@ NCURSES_5.9.20150530 { NCURSES_6.0.current { global: + alloc_pair; + alloc_pair_sp; + find_pair; + find_pair_sp; + free_pair; + free_pair_sp; unfocus_current_field; local: _*; diff --git a/package/ncurses.spec b/package/ncurses.spec index a4897f18..67fd9f30 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.0 -Release: 20170304 +Release: 20170311 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.sym b/package/ncurses.sym index 33ddc4eb..d7ac75e3 100644 --- a/package/ncurses.sym +++ b/package/ncurses.sym @@ -1,4 +1,4 @@ -# $Id: ncurses.sym,v 1.25 2016/10/30 00:45:38 tom Exp $ +# $Id: ncurses.sym,v 1.27 2017/03/09 09:47:40 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -244,6 +244,8 @@ addchnstr addchstr addnstr addstr +alloc_pair +alloc_pair_sp assume_default_colors assume_default_colors_sp attr_get @@ -336,6 +338,8 @@ field_type field_userptr filter filter_sp +find_pair +find_pair_sp flash flash_sp flushinp @@ -358,6 +362,8 @@ free_fieldtype free_form free_item free_menu +free_pair +free_pair_sp get_escdelay get_escdelay_sp getattrs diff --git a/package/ncursest.map b/package/ncursest.map index 9afd72c7..771c07ae 100644 --- a/package/ncursest.map +++ b/package/ncursest.map @@ -1,4 +1,4 @@ -# $Id: ncursest.map,v 1.32 2016/10/30 01:08:04 tom Exp $ +# $Id: ncursest.map,v 1.34 2017/03/09 09:48:41 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -1118,6 +1118,12 @@ NCURSEST_5.9.20150530 { NCURSEST_6.0.current { global: + alloc_pair; + alloc_pair_sp; + find_pair; + find_pair_sp; + free_pair; + free_pair_sp; unfocus_current_field; local: _*; diff --git a/package/ncursest.sym b/package/ncursest.sym index efcf76ad..14ab6c2d 100644 --- a/package/ncursest.sym +++ b/package/ncursest.sym @@ -1,4 +1,4 @@ -# $Id: ncursest.sym,v 1.27 2016/10/30 00:55:06 tom Exp $ +# $Id: ncursest.sym,v 1.29 2017/03/09 09:47:40 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -244,6 +244,8 @@ addchnstr addchstr addnstr addstr +alloc_pair +alloc_pair_sp assume_default_colors assume_default_colors_sp attr_get @@ -331,6 +333,8 @@ field_type field_userptr filter filter_sp +find_pair +find_pair_sp flash flash_sp flushinp @@ -353,6 +357,8 @@ free_fieldtype free_form free_item free_menu +free_pair +free_pair_sp get_escdelay get_escdelay_sp getattrs diff --git a/package/ncursestw.map b/package/ncursestw.map index de61385b..c4a408ad 100644 --- a/package/ncursestw.map +++ b/package/ncursestw.map @@ -1,4 +1,4 @@ -# $Id: ncursestw.map,v 1.33 2016/10/30 01:09:53 tom Exp $ +# $Id: ncursestw.map,v 1.35 2017/03/09 09:48:41 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -1237,6 +1237,12 @@ NCURSESTW_5.9.20150530 { NCURSESTW_6.0.current { global: + alloc_pair; + alloc_pair_sp; + find_pair; + find_pair_sp; + free_pair; + free_pair_sp; unfocus_current_field; local: _*; diff --git a/package/ncursestw.sym b/package/ncursestw.sym index c8d483dc..e056f947 100644 --- a/package/ncursestw.sym +++ b/package/ncursestw.sym @@ -1,4 +1,4 @@ -# $Id: ncursestw.sym,v 1.25 2016/10/30 01:00:08 tom Exp $ +# $Id: ncursestw.sym,v 1.27 2017/03/09 09:47:40 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -256,6 +256,8 @@ addnstr addnwstr addstr addwstr +alloc_pair +alloc_pair_sp assume_default_colors assume_default_colors_sp attr_get @@ -349,6 +351,8 @@ field_type field_userptr filter filter_sp +find_pair +find_pair_sp flash flash_sp flushinp @@ -372,6 +376,8 @@ free_fieldtype free_form free_item free_menu +free_pair +free_pair_sp get_escdelay get_escdelay_sp get_wch diff --git a/package/ncursesw.map b/package/ncursesw.map index 8435b4a0..78812499 100644 --- a/package/ncursesw.map +++ b/package/ncursesw.map @@ -1,4 +1,4 @@ -# $Id: ncursesw.map,v 1.38 2016/10/30 01:11:09 tom Exp $ +# $Id: ncursesw.map,v 1.40 2017/03/09 09:48:41 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -1262,6 +1262,12 @@ NCURSESW_5.9.20150530 { NCURSESW_6.0.current { global: + alloc_pair; + alloc_pair_sp; + find_pair; + find_pair_sp; + free_pair; + free_pair_sp; unfocus_current_field; local: _*; diff --git a/package/ncursesw.sym b/package/ncursesw.sym index 1550cb58..addeaf82 100644 --- a/package/ncursesw.sym +++ b/package/ncursesw.sym @@ -1,4 +1,4 @@ -# $Id: ncursesw.sym,v 1.26 2016/10/30 00:50:36 tom Exp $ +# $Id: ncursesw.sym,v 1.28 2017/03/09 09:47:40 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -253,6 +253,8 @@ addnstr addnwstr addstr addwstr +alloc_pair +alloc_pair_sp assume_default_colors assume_default_colors_sp attr_get @@ -351,6 +353,8 @@ field_type field_userptr filter filter_sp +find_pair +find_pair_sp flash flash_sp flushinp @@ -374,6 +378,8 @@ free_fieldtype free_form free_item free_menu +free_pair +free_pair_sp get_escdelay get_escdelay_sp get_wch diff --git a/test/README b/test/README index a6c31ec4..24dd4262 100644 --- a/test/README +++ b/test/README @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README,v 1.56 2016/12/04 01:16:34 tom Exp $ +-- $Id: README,v 1.57 2017/03/10 00:54:31 tom Exp $ ------------------------------------------------------------------------------- The programs in this directory are used to test and demonstrate ncurses. @@ -231,19 +231,19 @@ unpost_menu test: demo_menus ncurses libncurses: ---------- BC test: demo_termcap -COLORS test: dots_curses echochar ncurses savescreen xmas +COLORS test: demo_new_pair dots_curses echochar ncurses savescreen xmas COLOR_PAIR test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas -COLOR_PAIRS test: dots_curses echochar ncurses newdemo savescreen -COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_curses echochar edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm +COLOR_PAIRS test: demo_new_pair dots_curses echochar ncurses newdemo savescreen +COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses echochar edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm ESCDELAY test: test_opaque -LINES test: cardfile demo_defkey demo_keyok demo_menus demo_panels ditto dots_curses echochar edit_field firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas +LINES test: cardfile demo_defkey demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses echochar edit_field firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas PAIR_NUMBER test: ncurses PC test: demo_termcap SP lib: form TABSIZE test: test_opaque UP test: demo_termcap acs_map test: background gdc ins_wide inserts knight movewindow ncurses newdemo savescreen test_add_wchstr test_addchstr test_addstr test_addwstr testcurs -add_wch test: demo_panels ncurses test_add_wchstr test_addwstr +add_wch test: demo_new_pair demo_panels ncurses test_add_wchstr test_addwstr add_wchnstr test: test_add_wchstr add_wchstr test: test_add_wchstr view addch test: background blue bs dots_curses echochar hashtest ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_opaque testaddch view worm @@ -253,6 +253,8 @@ addnstr test: test_addstr addnwstr test: ncurses test_addwstr addstr test: blue bs cardfile filter gdc hanoi lrtest ncurses test_addstr addwstr test: blue test_addwstr +alloc_pair test: demo_new_pair +alloc_pair_sp - assume_default_colors test: background ncurses assume_default_colors_sp - attr_get - @@ -264,7 +266,7 @@ attron test: blue bs dots_curses echochar filter gdc ncurses attrset test: bs filter firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs baudrate test: ncurses baudrate_sp lib: ncurses -beep test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas +beep test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_new_pair demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas beep_sp lib: ncurses bkgd test: background cardfile demo_forms ncurses savescreen tclock view bkgdset test: background ncurses testaddch @@ -275,11 +277,11 @@ boolfnames test: demo_terminfo test_arrays progs: dump_entry boolnames test: demo_termcap demo_terminfo test_arrays progs: dump_entry infocmp border - border_set - -box test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs +box test: cardfile chgat clip_printw demo_forms demo_menus demo_new_pair demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs box_set test: ncurses can_change_color test: ncurses can_change_color_sp - -cbreak test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas +cbreak test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas cbreak_sp lib: ncurses chgat test: chgat clear test: blue bs filter gdc ncurses testcurs xmas @@ -291,7 +293,7 @@ color_content_sp - color_set test: color_set ncurses copywin test: ncurses testcurs cur_term test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrtest test_sgr test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tput tset -curs_set test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas +curs_set test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas curs_set_sp lib: ncurses curscr test: demo_panels edit_field knight lrtest ncurses savescreen tclock view curses_version test: ncurses progs: infocmp tabs tic toe tput tset @@ -308,7 +310,7 @@ delay_output_sp - delch - deleteln test: insdelln delscreen test: ditto dots_mvcur -delwin test: cardfile chgat clip_printw demo_forms demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs +delwin test: cardfile chgat clip_printw demo_forms demo_new_pair demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs derwin test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque doupdate test: cardfile demo_menus demo_panels ditto edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr doupdate_sp lib: ncurses @@ -317,7 +319,7 @@ echo test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw echo_sp lib: ncurses echo_wchar test: ncurses echochar test: echochar ncurses -endwin test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_curses dots_mvcur echochar filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas +endwin test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses dots_mvcur echochar filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas endwin_sp lib: ncurses erase test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs erasechar test: ncurses @@ -325,10 +327,14 @@ erasechar_sp lib: ncurses erasewchar test: ncurses filter test: filter filter_sp - +find_pair test: demo_new_pair +find_pair_sp - flash test: cardfile filter lrtest movewindow ncurses tclock testcurs flash_sp - flushinp test: ncurses newdemo testcurs flushinp_sp lib: ncurses +free_pair test: demo_new_pair +free_pair_sp - get_escdelay - get_escdelay_sp - get_wch test: form_driver_w @@ -339,7 +345,7 @@ getbegy test: chgat clip_printw demo_menus demo_panels insdelln movewindow nc getbkgd test: ncurses getbkgrnd test: ncurses getcchar test: ncurses view -getch test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas +getch test: background blue bs chgat color_set demo_altkeys demo_new_pair filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas getcurx test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs getcury test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs getmaxx test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs @@ -355,7 +361,7 @@ getwin test: ncurses getwin_sp - halfdelay test: view halfdelay_sp - -has_colors test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas +has_colors test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas has_colors_sp lib: ncurses has_ic test: lrtest ncurses has_ic_sp lib: ncurses @@ -378,7 +384,7 @@ inchnstr test: inchs inchstr test: inchs init_color test: ncurses init_color_sp lib: ncurses -init_pair test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas +init_pair test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas init_pair_sp - initscr test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels dots_curses echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas innstr test: test_instr @@ -422,7 +428,7 @@ keyname test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldk keyname_sp lib: ncurses keyok test: demo_keyok foldkeys keyok_sp lib: ncurses -keypad test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view +keypad test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto edit_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view killchar test: ncurses killchar_sp lib: ncurses killwchar test: ncurses @@ -437,7 +443,7 @@ mouseinterval - mouseinterval_sp - mousemask test: bs demo_forms demo_menus knight movewindow ncurses testcurs mousemask_sp - -move test: blue bs cardfile chgat demo_altkeys demo_menus dots_curses echochar filter foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas +move test: blue bs cardfile chgat demo_altkeys demo_menus demo_new_pair dots_curses echochar filter foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas mvadd_wch test: ncurses test_add_wchstr test_addwstr mvadd_wchnstr test: test_add_wchstr mvadd_wchstr test: test_add_wchstr @@ -528,16 +534,16 @@ new_prescr lib: ncurses newpad test: edit_field ncurses testcurs newpad_sp lib: ncurses newscr lib: ncurses -newterm test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames +newterm test: demo_altkeys demo_new_pair ditto dots_mvcur filter foldkeys gdc key_names keynames newterm_sp - -newwin test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas +newwin test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas newwin_sp lib: ncurses nl test: demo_forms ncurses rain testcurs nl_sp lib: ncurses nocbreak test: testcurs nocbreak_sp lib: ncurses -nodelay test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas -noecho test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas +nodelay test: demo_new_pair ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas +noecho test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas noecho_sp lib: ncurses nofilter - nofilter_sp - @@ -569,7 +575,7 @@ qiflush_sp - raw test: demo_forms ncurses redraw testcurs raw_sp lib: ncurses redrawwin test: redraw view -refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels dots_curses echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas +refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels dots_curses echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas reset_prog_mode test: filter ncurses reset_prog_mode_sp lib: ncurses reset_shell_mode test: bs filter savescreen @@ -596,7 +602,7 @@ scr_set test: savescreen scr_set_sp - scrl test: view scroll test: testcurs -scrollok test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view +scrollok test: clip_printw demo_altkeys demo_defkey demo_keyok demo_new_pair demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view set_curterm test: list_keys set_curterm_sp - set_escdelay test: test_opaque @@ -604,7 +610,7 @@ set_escdelay_sp lib: ncurses set_tabsize test: test_opaque set_tabsize_sp - set_term lib: ncurses -setcchar test: demo_panels ins_wide ncurses test_add_wchstr test_addwstr view +setcchar test: demo_new_pair demo_panels ins_wide ncurses test_add_wchstr test_addwstr view setscrreg test: view setupterm test: demo_terminfo dots list_keys test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset slk_attr - @@ -640,9 +646,9 @@ slk_touch_sp lib: ncurses slk_wset test: ncurses standend test: blue gdc ncurses standout test: blue ncurses -start_color test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas +start_color test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas start_color_sp - -stdscr test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas +stdscr test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas strcodes test: demo_termcap test_arrays progs: dump_entry strfnames test: demo_terminfo list_keys test_arrays progs: dump_entry strnames test: demo_termcap demo_terminfo foldkeys list_keys test_arrays progs: dump_entry infocmp tic @@ -668,12 +674,12 @@ tigetflag test: demo_terminfo progs: tic tput tigetflag_sp - tigetnum test: demo_terminfo ncurses progs: tput tigetnum_sp - -tigetstr test: blue demo_defkey demo_terminfo foldkeys list_keys test_sgr testcurs progs: clear_cmd tput +tigetstr test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys test_sgr testcurs progs: clear_cmd tput tigetstr_sp - timeout test: filter rain savescreen tiparm - touchline test: chgat clip_printw insdelln -touchwin test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas +touchwin test: chgat clip_printw demo_menus demo_new_pair edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas tparm test: dots dots_mvcur test_sgr progs: reset_cmd tabs tic tput tputs test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tputs_sp lib: ncurses @@ -753,7 +759,7 @@ werase test: cardfile demo_forms demo_menus demo_panels edit_field firstlast wget_wch test: ins_wide ncurses test_add_wchstr test_addwstr wget_wstr test: test_get_wstr wgetbkgrnd lib: ncurses -wgetch test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc insdelln inserts knight movewindow ncurses newdemo rain redraw savescreen test_addchstr test_addstr test_opaque testcurs worm +wgetch test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_new_pair demo_panels ditto edit_field gdc insdelln inserts knight movewindow ncurses newdemo rain redraw savescreen test_addchstr test_addstr test_opaque testcurs worm wgetdelay - wgetn_wstr test: ncurses test_get_wstr wgetnstr test: ncurses test_getstr @@ -781,9 +787,9 @@ winsstr test: inserts winstr test: test_instr winwstr test: test_inwstr wmouse_trafo test: ncurses -wmove test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm +wmove test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_new_pair demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm wnoutrefresh test: demo_menus ditto edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque -wprintw test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs +wprintw test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs wredrawln test: redraw wrefresh test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels edit_field firstlast ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas wresize test: cardfile demo_menus ncurses @@ -821,3 +827,5 @@ show_panel test: demo_panels ncurses top_panel test: cardfile demo_panels ncurses update_panels test: cardfile demo_panels ncurses update_panels_sp - + +-- vile:txtmode diff --git a/test/configure b/test/configure index ea01dedb..f4a596be 100755 --- a/test/configure +++ b/test/configure @@ -15250,6 +15250,7 @@ EOF esac for cf_func in \ +alloc_pair \ assume_default_colors \ chgat \ color_set \ @@ -15295,10 +15296,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:15298: checking for ${cf_func}" >&5 + echo "$as_me:15299: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:15301: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:15302: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15307,7 +15308,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 15310 "configure" +#line 15311 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15340,16 +15341,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15343: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15344: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15346: \$? = $ac_status" >&5 + echo "$as_me:15347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15349: \"$ac_try\"") >&5 + { (eval echo "$as_me:15350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15352: \$? = $ac_status" >&5 + echo "$as_me:15353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15365,7 +15366,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:15368: result: $cf_result" >&5 + echo "$as_me:15369: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <&5 + echo "$as_me:15384: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:15386: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:15387: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15392,7 +15393,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 15395 "configure" +#line 15396 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15425,16 +15426,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15428: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15429: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15431: \$? = $ac_status" >&5 + echo "$as_me:15432: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15434: \"$ac_try\"") >&5 + { (eval echo "$as_me:15435: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15437: \$? = $ac_status" >&5 + echo "$as_me:15438: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15450,7 +15451,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:15453: result: $cf_result" >&5 + echo "$as_me:15454: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 15477 "configure" +#line 15478 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15494,21 +15495,21 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15497: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15498: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15500: \$? = $ac_status" >&5 + echo "$as_me:15501: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15503: \"$ac_try\"") >&5 + { (eval echo "$as_me:15504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15506: \$? = $ac_status" >&5 + echo "$as_me:15507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:15511: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:15512: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:15532: 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 15538 "configure" +#line 15539 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15550,16 +15551,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15553: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15554: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15556: \$? = $ac_status" >&5 + echo "$as_me:15557: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15559: \"$ac_try\"") >&5 + { (eval echo "$as_me:15560: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15562: \$? = $ac_status" >&5 + echo "$as_me:15563: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -15567,7 +15568,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15570 "configure" +#line 15571 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15592,16 +15593,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15595: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15596: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15598: \$? = $ac_status" >&5 + echo "$as_me:15599: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15601: \"$ac_try\"") >&5 + { (eval echo "$as_me:15602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15604: \$? = $ac_status" >&5 + echo "$as_me:15605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -15615,7 +15616,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15618: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:15619: 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 @@ -15629,11 +15630,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:15632: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:15633: 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 15636 "configure" +#line 15637 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15646,16 +15647,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15649: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15652: \$? = $ac_status" >&5 + echo "$as_me:15653: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15655: \"$ac_try\"") >&5 + { (eval echo "$as_me:15656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15658: \$? = $ac_status" >&5 + echo "$as_me:15659: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15664,7 +15665,7 @@ cat conftest.$ac_ext >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >conftest.$ac_ext <<_ACEOF -#line 15667 "configure" +#line 15668 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15677,16 +15678,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15680: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15681: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15683: \$? = $ac_status" >&5 + echo "$as_me:15684: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15686: \"$ac_try\"") >&5 + { (eval echo "$as_me:15687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15689: \$? = $ac_status" >&5 + echo "$as_me:15690: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_define_xpg5=yes else @@ -15697,7 +15698,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:15700: result: $cf_define_xpg5" >&5 + echo "$as_me:15701: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -15706,14 +15707,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:15709: checking for wide-character functions" >&5 + echo "$as_me:15710: 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 15716 "configure" +#line 15717 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15730,16 +15731,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15736: \$? = $ac_status" >&5 + echo "$as_me:15737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15739: \"$ac_try\"") >&5 + { (eval echo "$as_me:15740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15742: \$? = $ac_status" >&5 + echo "$as_me:15743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widechar_funcs=yes else @@ -15750,7 +15751,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15753: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:15754: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -15771,14 +15772,14 @@ EOF fi -echo "$as_me:15774: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:15775: 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 15781 "configure" +#line 15782 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15796,16 +15797,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15799: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15800: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15802: \$? = $ac_status" >&5 + echo "$as_me:15803: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15805: \"$ac_try\"") >&5 + { (eval echo "$as_me:15806: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15808: \$? = $ac_status" >&5 + echo "$as_me:15809: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_use_pthreads=yes else @@ -15816,20 +15817,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15819: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:15820: 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:15825: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:15826: 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 15832 "configure" +#line 15833 "configure" #include "confdefs.h" #include @@ -15849,16 +15850,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15852: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15853: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15855: \$? = $ac_status" >&5 + echo "$as_me:15856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15858: \"$ac_try\"") >&5 + { (eval echo "$as_me:15859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15861: \$? = $ac_status" >&5 + echo "$as_me:15862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -15870,7 +15871,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15873: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:15874: 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 @@ -15879,7 +15880,7 @@ EOF # special check for test/ditto.c -echo "$as_me:15882: checking for openpty in -lutil" >&5 +echo "$as_me:15883: 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 @@ -15887,7 +15888,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15890 "configure" +#line 15891 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15906,16 +15907,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15909: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15910: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:15913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15915: \"$ac_try\"") >&5 + { (eval echo "$as_me:15916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15918: \$? = $ac_status" >&5 + echo "$as_me:15919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -15926,7 +15927,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15929: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:15930: 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 @@ -15934,7 +15935,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:15937: checking for openpty header" >&5 +echo "$as_me:15938: 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 @@ -15961,7 +15962,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 15964 "configure" +#line 15965 "configure" #include "confdefs.h" #include <$cf_header> @@ -15978,16 +15979,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15981: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15982: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15984: \$? = $ac_status" >&5 + echo "$as_me:15985: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15987: \"$ac_try\"") >&5 + { (eval echo "$as_me:15988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15990: \$? = $ac_status" >&5 + echo "$as_me:15991: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -16005,7 +16006,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:16008: result: $cf_cv_func_openpty" >&5 +echo "$as_me:16009: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -16039,7 +16040,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:16042: checking for function curses_version" >&5 +echo "$as_me:16043: 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 @@ -16049,7 +16050,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16052 "configure" +#line 16053 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16062,15 +16063,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16065: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16066: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16068: \$? = $ac_status" >&5 + echo "$as_me:16069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16070: \"$ac_try\"") >&5 + { (eval echo "$as_me:16071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16073: \$? = $ac_status" >&5 + echo "$as_me:16074: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_curses_version=yes @@ -16085,14 +16086,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core fi -echo "$as_me:16088: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:16089: 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:16095: checking for alternate character set array" >&5 +echo "$as_me:16096: 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 @@ -16102,7 +16103,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 16105 "configure" +#line 16106 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16118,16 +16119,16 @@ $name['k'] = ACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16121: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16122: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16124: \$? = $ac_status" >&5 + echo "$as_me:16125: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16127: \"$ac_try\"") >&5 + { (eval echo "$as_me:16128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16130: \$? = $ac_status" >&5 + echo "$as_me:16131: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_acs_map=$name; break else @@ -16138,7 +16139,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:16141: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:16142: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -16148,7 +16149,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:16151: checking for wide alternate character set array" >&5 +echo "$as_me:16152: 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 @@ -16158,7 +16159,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 16161 "configure" +#line 16162 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16174,16 +16175,16 @@ void *foo = &($name['k']) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16177: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16178: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16180: \$? = $ac_status" >&5 + echo "$as_me:16181: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16183: \"$ac_try\"") >&5 + { (eval echo "$as_me:16184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16186: \$? = $ac_status" >&5 + echo "$as_me:16187: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -16194,7 +16195,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:16197: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:16198: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -16202,7 +16203,7 @@ cat >>confdefs.h <&5 +echo "$as_me:16206: 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 @@ -16212,7 +16213,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 16215 "configure" +#line 16216 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16229,16 +16230,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16232: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16233: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16235: \$? = $ac_status" >&5 + echo "$as_me:16236: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16238: \"$ac_try\"") >&5 + { (eval echo "$as_me:16239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16241: \$? = $ac_status" >&5 + echo "$as_me:16242: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -16248,7 +16249,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 16251 "configure" +#line 16252 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16264,16 +16265,16 @@ cchar_t *foo = WACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16267: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16268: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16270: \$? = $ac_status" >&5 + echo "$as_me:16271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16273: \"$ac_try\"") >&5 + { (eval echo "$as_me:16274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16276: \$? = $ac_status" >&5 + echo "$as_me:16277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -16284,7 +16285,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:16287: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:16288: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -16294,10 +16295,10 @@ EOF fi -echo "$as_me:16297: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16298: 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 16300 "configure" +#line 16301 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16315,16 +16316,16 @@ attr_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16318: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16319: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16321: \$? = $ac_status" >&5 + echo "$as_me:16322: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16324: \"$ac_try\"") >&5 + { (eval echo "$as_me:16325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16327: \$? = $ac_status" >&5 + echo "$as_me:16328: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16333,7 +16334,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16336: result: $cf_result" >&5 +echo "$as_me:16337: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16354,14 +16355,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:16357: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:16358: 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 16364 "configure" +#line 16365 "configure" #include "confdefs.h" #include @@ -16379,23 +16380,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16382: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16383: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16385: \$? = $ac_status" >&5 + echo "$as_me:16386: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16388: \"$ac_try\"") >&5 + { (eval echo "$as_me:16389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16391: \$? = $ac_status" >&5 + echo "$as_me:16392: \$? = $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 16398 "configure" +#line 16399 "configure" #include "confdefs.h" #include @@ -16414,16 +16415,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16417: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16420: \$? = $ac_status" >&5 + echo "$as_me:16421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16423: \"$ac_try\"") >&5 + { (eval echo "$as_me:16424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16426: \$? = $ac_status" >&5 + echo "$as_me:16427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -16435,7 +16436,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16438: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:16439: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -16458,14 +16459,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:16461: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:16462: 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 16468 "configure" +#line 16469 "configure" #include "confdefs.h" #include @@ -16483,23 +16484,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16489: \$? = $ac_status" >&5 + echo "$as_me:16490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16492: \"$ac_try\"") >&5 + { (eval echo "$as_me:16493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16495: \$? = $ac_status" >&5 + echo "$as_me:16496: \$? = $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 16502 "configure" +#line 16503 "configure" #include "confdefs.h" #include @@ -16518,16 +16519,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16521: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16524: \$? = $ac_status" >&5 + echo "$as_me:16525: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16527: \"$ac_try\"") >&5 + { (eval echo "$as_me:16528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16530: \$? = $ac_status" >&5 + echo "$as_me:16531: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -16539,7 +16540,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16542: result: $cf_cv_wchar_t" >&5 +echo "$as_me:16543: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -16562,14 +16563,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:16565: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:16566: 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 16572 "configure" +#line 16573 "configure" #include "confdefs.h" #include @@ -16587,23 +16588,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16590: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16591: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16593: \$? = $ac_status" >&5 + echo "$as_me:16594: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16596: \"$ac_try\"") >&5 + { (eval echo "$as_me:16597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16599: \$? = $ac_status" >&5 + echo "$as_me:16600: \$? = $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 16606 "configure" +#line 16607 "configure" #include "confdefs.h" #include @@ -16622,16 +16623,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16626: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16628: \$? = $ac_status" >&5 + echo "$as_me:16629: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16631: \"$ac_try\"") >&5 + { (eval echo "$as_me:16632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16634: \$? = $ac_status" >&5 + echo "$as_me:16635: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -16643,7 +16644,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16646: result: $cf_cv_wint_t" >&5 +echo "$as_me:16647: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -16667,10 +16668,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:16670: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16671: 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 16673 "configure" +#line 16674 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16688,16 +16689,16 @@ mbstate_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16691: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16692: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16694: \$? = $ac_status" >&5 + echo "$as_me:16695: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16697: \"$ac_try\"") >&5 + { (eval echo "$as_me:16698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16700: \$? = $ac_status" >&5 + echo "$as_me:16701: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16706,7 +16707,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16709: result: $cf_result" >&5 +echo "$as_me:16710: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16728,10 +16729,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:16731: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16732: 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 16734 "configure" +#line 16735 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16749,16 +16750,16 @@ wchar_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16753: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16755: \$? = $ac_status" >&5 + echo "$as_me:16756: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16758: \"$ac_try\"") >&5 + { (eval echo "$as_me:16759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16761: \$? = $ac_status" >&5 + echo "$as_me:16762: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16767,7 +16768,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16770: result: $cf_result" >&5 +echo "$as_me:16771: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16789,10 +16790,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:16792: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16793: 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 16795 "configure" +#line 16796 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -16810,16 +16811,16 @@ wint_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16813: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16814: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16816: \$? = $ac_status" >&5 + echo "$as_me:16817: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16819: \"$ac_try\"") >&5 + { (eval echo "$as_me:16820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16822: \$? = $ac_status" >&5 + echo "$as_me:16823: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16828,7 +16829,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16831: result: $cf_result" >&5 +echo "$as_me:16832: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16849,11 +16850,11 @@ fi fi fi -echo "$as_me:16852: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:16853: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 16856 "configure" +#line 16857 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -16881,16 +16882,16 @@ void *foo = &(ospeed) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16887: \$? = $ac_status" >&5 + echo "$as_me:16888: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16890: \"$ac_try\"") >&5 + { (eval echo "$as_me:16891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16893: \$? = $ac_status" >&5 + echo "$as_me:16894: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16899,7 +16900,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16902: result: $cf_result" >&5 +echo "$as_me:16903: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -16911,14 +16912,14 @@ cf_result=`echo "have_curses_data_ospeed" | sed y%abcdefghijklmnopqrstuvwxyz./-% EOF else - echo "$as_me:16914: checking for data ospeed in library" >&5 + echo "$as_me:16915: checking for data ospeed in library" >&5 echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 16921 "configure" +#line 16922 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -16951,16 +16952,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16954: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16957: \$? = $ac_status" >&5 + echo "$as_me:16958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16960: \"$ac_try\"") >&5 + { (eval echo "$as_me:16961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16963: \$? = $ac_status" >&5 + echo "$as_me:16964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16972,7 +16973,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 16975 "configure" +#line 16976 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -16998,15 +16999,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17002: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17004: \$? = $ac_status" >&5 + echo "$as_me:17005: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17006: \"$ac_try\"") >&5 + { (eval echo "$as_me:17007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17009: \$? = $ac_status" >&5 + echo "$as_me:17010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17017,7 +17018,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17020: result: $cf_result" >&5 + echo "$as_me:17021: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17030,11 +17031,11 @@ EOF fi fi -echo "$as_me:17033: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17034: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17037 "configure" +#line 17038 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17062,16 +17063,16 @@ void *foo = &(boolnames) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17065: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17066: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17068: \$? = $ac_status" >&5 + echo "$as_me:17069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17071: \"$ac_try\"") >&5 + { (eval echo "$as_me:17072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17074: \$? = $ac_status" >&5 + echo "$as_me:17075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17080,7 +17081,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17083: result: $cf_result" >&5 +echo "$as_me:17084: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17092,14 +17093,14 @@ cf_result=`echo "have_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz. EOF else - echo "$as_me:17095: checking for data boolnames in library" >&5 + echo "$as_me:17096: checking for data boolnames in library" >&5 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 17102 "configure" +#line 17103 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17132,16 +17133,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17135: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17136: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17138: \$? = $ac_status" >&5 + echo "$as_me:17139: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17141: \"$ac_try\"") >&5 + { (eval echo "$as_me:17142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17144: \$? = $ac_status" >&5 + echo "$as_me:17145: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17153,7 +17154,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17156 "configure" +#line 17157 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17179,15 +17180,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17182: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17183: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17185: \$? = $ac_status" >&5 + echo "$as_me:17186: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17187: \"$ac_try\"") >&5 + { (eval echo "$as_me:17188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17190: \$? = $ac_status" >&5 + echo "$as_me:17191: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17198,7 +17199,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17201: result: $cf_result" >&5 + echo "$as_me:17202: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17211,11 +17212,11 @@ EOF fi fi -echo "$as_me:17214: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17215: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17218 "configure" +#line 17219 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17243,16 +17244,16 @@ void *foo = &(boolfnames) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17249: \$? = $ac_status" >&5 + echo "$as_me:17250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17252: \"$ac_try\"") >&5 + { (eval echo "$as_me:17253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17255: \$? = $ac_status" >&5 + echo "$as_me:17256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17261,7 +17262,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17264: result: $cf_result" >&5 +echo "$as_me:17265: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17273,14 +17274,14 @@ cf_result=`echo "have_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz EOF else - echo "$as_me:17276: checking for data boolfnames in library" >&5 + echo "$as_me:17277: checking for data boolfnames in library" >&5 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 17283 "configure" +#line 17284 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17313,16 +17314,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17316: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17317: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17319: \$? = $ac_status" >&5 + echo "$as_me:17320: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17322: \"$ac_try\"") >&5 + { (eval echo "$as_me:17323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17325: \$? = $ac_status" >&5 + echo "$as_me:17326: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17334,7 +17335,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17337 "configure" +#line 17338 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17360,15 +17361,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17363: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17366: \$? = $ac_status" >&5 + echo "$as_me:17367: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17368: \"$ac_try\"") >&5 + { (eval echo "$as_me:17369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17371: \$? = $ac_status" >&5 + echo "$as_me:17372: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17379,7 +17380,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17382: result: $cf_result" >&5 + echo "$as_me:17383: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17392,11 +17393,11 @@ EOF fi fi -echo "$as_me:17395: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:17396: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17399 "configure" +#line 17400 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17424,16 +17425,16 @@ void *foo = &(ttytype) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17427: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17430: \$? = $ac_status" >&5 + echo "$as_me:17431: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17433: \"$ac_try\"") >&5 + { (eval echo "$as_me:17434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17436: \$? = $ac_status" >&5 + echo "$as_me:17437: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17442,7 +17443,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17445: result: $cf_result" >&5 +echo "$as_me:17446: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17454,14 +17455,14 @@ cf_result=`echo "have_curses_data_ttytype" | sed y%abcdefghijklmnopqrstuvwxyz./- EOF else - echo "$as_me:17457: checking for data ttytype in library" >&5 + echo "$as_me:17458: checking for data ttytype in library" >&5 echo $ECHO_N "checking for data ttytype in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 17464 "configure" +#line 17465 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17494,16 +17495,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17497: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17498: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17500: \$? = $ac_status" >&5 + echo "$as_me:17501: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17503: \"$ac_try\"") >&5 + { (eval echo "$as_me:17504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17506: \$? = $ac_status" >&5 + echo "$as_me:17507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17515,7 +17516,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17518 "configure" +#line 17519 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17541,15 +17542,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17545: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17547: \$? = $ac_status" >&5 + echo "$as_me:17548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17549: \"$ac_try\"") >&5 + { (eval echo "$as_me:17550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17552: \$? = $ac_status" >&5 + echo "$as_me:17553: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17560,7 +17561,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:17563: result: $cf_result" >&5 + echo "$as_me:17564: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17575,7 +17576,7 @@ fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:17578: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:17579: 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. @@ -17592,7 +17593,7 @@ else with_warnings=no fi; -echo "$as_me:17595: result: $with_warnings" >&5 +echo "$as_me:17596: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -17615,10 +17616,10 @@ cat > conftest.i <&5 + { echo "$as_me:17619: 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:17671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17673: \$? = $ac_status" >&5 + echo "$as_me:17674: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:17675: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:17676: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -17736,12 +17737,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:17739: checking if this is really Intel C compiler" >&5 + echo "$as_me:17740: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 17744 "configure" +#line 17745 "configure" #include "confdefs.h" int @@ -17758,16 +17759,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17761: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17764: \$? = $ac_status" >&5 + echo "$as_me:17765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17767: \"$ac_try\"") >&5 + { (eval echo "$as_me:17768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17770: \$? = $ac_status" >&5 + echo "$as_me:17771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -17778,7 +17779,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:17781: result: $INTEL_COMPILER" >&5 + echo "$as_me:17782: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -17787,12 +17788,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:17790: checking if this is really Clang C compiler" >&5 + echo "$as_me:17791: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 17795 "configure" +#line 17796 "configure" #include "confdefs.h" int @@ -17809,16 +17810,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17812: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17813: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17815: \$? = $ac_status" >&5 + echo "$as_me:17816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17818: \"$ac_try\"") >&5 + { (eval echo "$as_me:17819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17821: \$? = $ac_status" >&5 + echo "$as_me:17822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -17829,12 +17830,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:17832: result: $CLANG_COMPILER" >&5 + echo "$as_me:17833: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:17855: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -17867,12 +17868,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:17870: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17871: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17873: \$? = $ac_status" >&5 + echo "$as_me:17874: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:17875: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17876: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -17881,7 +17882,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:17884: checking for $CC warning options..." >&5 + { echo "$as_me:17885: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -17905,12 +17906,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17908: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17911: \$? = $ac_status" >&5 + echo "$as_me:17912: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:17913: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17914: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -17921,7 +17922,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}:17924: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17925: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17931,7 +17932,7 @@ echo "${as_me:-configure}:17924: 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}:17934: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17935: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17947,7 +17948,7 @@ rm -rf conftest* fi fi -echo "$as_me:17950: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:17951: 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. @@ -17964,7 +17965,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:17967: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:17968: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -18078,23 +18079,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:18081: checking for dmalloc.h" >&5 + echo "$as_me:18082: 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 18087 "configure" +#line 18088 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18091: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18092: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18097: \$? = $ac_status" >&5 + echo "$as_me:18098: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18113,11 +18114,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18116: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:18117: 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:18120: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:18121: 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 @@ -18125,7 +18126,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18128 "configure" +#line 18129 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18144,16 +18145,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18147: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18150: \$? = $ac_status" >&5 + echo "$as_me:18151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18153: \"$ac_try\"") >&5 + { (eval echo "$as_me:18154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18156: \$? = $ac_status" >&5 + echo "$as_me:18157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -18164,7 +18165,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18167: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:18168: 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:18183: 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. @@ -18196,7 +18197,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:18199: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:18200: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -18310,23 +18311,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:18313: checking for dbmalloc.h" >&5 + echo "$as_me:18314: 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 18319 "configure" +#line 18320 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18323: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18324: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18329: \$? = $ac_status" >&5 + echo "$as_me:18330: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18345,11 +18346,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18348: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:18349: 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:18352: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:18353: 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 @@ -18357,7 +18358,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18360 "configure" +#line 18361 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18376,16 +18377,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18380: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18382: \$? = $ac_status" >&5 + echo "$as_me:18383: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18385: \"$ac_try\"") >&5 + { (eval echo "$as_me:18386: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18388: \$? = $ac_status" >&5 + echo "$as_me:18389: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -18396,7 +18397,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18399: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:18400: 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:18415: 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. @@ -18428,7 +18429,7 @@ EOF else with_valgrind= fi; -echo "$as_me:18431: result: ${with_valgrind:-no}" >&5 +echo "$as_me:18432: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -18541,7 +18542,7 @@ fi ;; esac -echo "$as_me:18544: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:18545: 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. @@ -18551,7 +18552,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:18554: result: $with_no_leaks" >&5 +echo "$as_me:18555: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -18567,7 +18568,7 @@ EOF fi LD_RPATH_OPT= -echo "$as_me:18570: checking for an rpath option" >&5 +echo "$as_me:18571: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in (irix*) @@ -18598,12 +18599,12 @@ case $cf_cv_system_name in (*) ;; esac -echo "$as_me:18601: result: $LD_RPATH_OPT" >&5 +echo "$as_me:18602: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:18606: checking if we need a space after rpath option" >&5 + echo "$as_me:18607: 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" @@ -18624,7 +18625,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 18627 "configure" +#line 18628 "configure" #include "confdefs.h" int @@ -18636,16 +18637,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18640: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18642: \$? = $ac_status" >&5 + echo "$as_me:18643: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18645: \"$ac_try\"") >&5 + { (eval echo "$as_me:18646: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18648: \$? = $ac_status" >&5 + echo "$as_me:18649: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -18655,13 +18656,13 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:18658: result: $cf_rpath_space" >&5 + echo "$as_me:18659: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac -echo "$as_me:18664: checking if rpath-hack should be disabled" >&5 +echo "$as_me:18665: 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. @@ -18678,21 +18679,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:18681: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:18682: 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:18685: checking for updated LDFLAGS" >&5 +echo "$as_me:18686: 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:18688: result: maybe" >&5 + echo "$as_me:18689: 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:18695: checking for $ac_word" >&5 +echo "$as_me:18696: 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 @@ -18707,7 +18708,7 @@ 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:18710: found $ac_dir/$ac_word" >&5 +echo "$as_me:18711: found $ac_dir/$ac_word" >&5 break done @@ -18715,10 +18716,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:18718: result: $cf_ldd_prog" >&5 + echo "$as_me:18719: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:18721: result: no" >&5 + echo "$as_me:18722: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18732,7 +18733,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 18735 "configure" +#line 18736 "configure" #include "confdefs.h" #include int @@ -18744,16 +18745,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18748: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18750: \$? = $ac_status" >&5 + echo "$as_me:18751: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18753: \"$ac_try\"") >&5 + { (eval echo "$as_me:18754: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18756: \$? = $ac_status" >&5 + echo "$as_me:18757: \$? = $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` @@ -18781,7 +18782,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}:18784: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:18785: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -18793,11 +18794,11 @@ echo "${as_me:-configure}:18784: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:18796: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18797: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:18800: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18801: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -18834,7 +18835,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:18837: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:18838: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -18847,11 +18848,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:18850: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18851: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:18854: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:18855: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -18888,7 +18889,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:18891: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:18892: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -18901,14 +18902,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:18904: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:18905: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:18908: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18909: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:18911: result: no" >&5 + echo "$as_me:18912: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18998,7 +18999,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:19001: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:19002: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -19174,7 +19175,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:19177: error: ambiguous option: $1 + { { echo "$as_me:19178: 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;} @@ -19193,7 +19194,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:19196: error: unrecognized option: $1 + -*) { { echo "$as_me:19197: 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;} @@ -19243,7 +19244,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:19246: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:19247: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -19534,7 +19535,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:19537: creating $ac_file" >&5 + { echo "$as_me:19538: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -19552,7 +19553,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:19555: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19556: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19565,7 +19566,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:19568: error: cannot find input file: $f" >&5 + { { echo "$as_me:19569: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19581,7 +19582,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:19584: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19585: 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;} @@ -19590,7 +19591,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:19593: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19594: 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;} @@ -19627,7 +19628,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:19630: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:19631: 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;} @@ -19638,7 +19639,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:19641: WARNING: Some variables may not be substituted: + { echo "$as_me:19642: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -19687,7 +19688,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:19690: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19691: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -19698,7 +19699,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:19701: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19702: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19711,7 +19712,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:19714: error: cannot find input file: $f" >&5 + { { echo "$as_me:19715: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19769,7 +19770,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:19772: $ac_file is unchanged" >&5 + { echo "$as_me:19773: $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 113f08c2..b9fad5be 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -26,9 +26,9 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl Author: Thomas E. Dickey 1996, etc. +dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.128 2016/09/10 22:06:22 tom Exp $ +dnl $Id: configure.in,v 1.129 2017/03/06 09:48:09 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) @@ -36,7 +36,9 @@ dnl dnl If you're configuring ncurses, you shouldn't need to use this script. dnl It's only for testing purposes. dnl -dnl See http://invisible-island.net/autoconf/ for additional information. +dnl For additional information, see +dnl http://invisible-island.net/autoconf/ +dnl http://invisible-island.net/ncurses/ncurses-examples.html dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) AC_INIT(ncurses.c) @@ -203,6 +205,7 @@ wcstombs \ fi CF_CURSES_FUNCS( \ +alloc_pair \ assume_default_colors \ chgat \ color_set \ diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c new file mode 100644 index 00000000..aef725a0 --- /dev/null +++ b/test/demo_new_pair.c @@ -0,0 +1,353 @@ +/**************************************************************************** + * Copyright (c) 2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ +/* + * $Id: demo_new_pair.c,v 1.10 2017/03/10 09:47:15 tom Exp $ + * + * Demonstrate the alloc_pair() function. + */ + +#include +#include + +#if HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT + +#define MAX_BITS 8 /* all but A_ALTCHARSET */ +#define MAX_ATTR ((1< 0) { + if (now < COLOR_PAIRS) { + int fg, bg; + our_content(now, &fg, &bg); + if (init_pair((short) now, (short) fg, (short) bg) != OK) + now = ERR; + } else { + now %= COLOR_PAIRS; + } + result = now; + } + return result; +} + +static void +show_help(const char **help) +{ + WINDOW *mywin = newwin(LINES, COLS, 0, 0); + int n; + + wmove(mywin, 1, 1); + for (n = 0; help[n] != 0; ++n) { + wmove(mywin, 1 + n, 2); + wprintw(mywin, "%.*s\n", COLS - 4, help[n]); + } + box(mywin, 0, 0); + wgetch(mywin); + delwin(mywin); + touchwin(stdscr); + refresh(); +} + +static time_t +now(void) +{ + return time((time_t *) 0); +} + +static void +usage(void) +{ + static const char *msg[] = + { + "Usage: demo_new_pair [options]", + "", + "Repeatedly print using all possible color combinations.", + "", + "Options:", + " -i use init_pair rather than alloc_pair", + " -p start in paged-mode", + " -s start in single-step mode", + " -w print a wide-character cell", + }; + unsigned n; + for (n = 0; n < SIZEOF(msg); ++n) { + fprintf(stderr, "%s\n", msg[n]); + } + ExitProgram(EXIT_FAILURE); +} + +#define use_pages() \ + paged_mode = TRUE, single_mode = TRUE + +#define use_single() \ + paged_mode = FALSE, single_mode = TRUE + +#define update_modes() \ + scrollok(stdscr, !paged_mode); \ + nodelay(stdscr, !single_mode || paged_mode) + +int +main(int argc, char *argv[]) +{ + static const char *help[] = + { + "This program iterates over the possible color combinations,", + "allocating or initializing color pairs. For best results,", + "choose screen-width dividing evenly into the number of colors,", + "e.g.,", + "", + " 32x64,32x128 256 colors", + " 24x44,24x88 88 colors", + " 32x64,24x128 16 colors", + "", + "Keys:", + " c toggle between coloring and de-coloring cells", + " p show one page at a time", + " s show one character at a time", + " display char/page without pausing", + " v/V cycle through video attributes", + " w toggle between \"#\" and a double-width equivalent", + " ? print this screen (exit on any character).", + "", + "To exit this program, press ^Q, ^[ or \"q\".", + 0 + }; + + bool done = FALSE; + bool clobber = FALSE; + bool hascolor = FALSE; + bool use_init = FALSE; + bool use_wide = FALSE; + bool paged_mode = FALSE; + bool single_mode = FALSE; + int video_mode = 0; + int current; + int ch; + wchar_t wch[2]; + time_t start = now(); + long total_cells = 0; + + setlocale(LC_ALL, ""); + + while ((ch = getopt(argc, argv, "ipsw")) != -1) { + switch (ch) { + case 'i': + use_init = TRUE; + break; + case 'p': + use_pages(); + break; + case 's': + use_single(); + break; + case 'w': + use_wide = TRUE; + break; + default: + usage(); + break; + } + } + + if (newterm(NULL, stderr, stdin) == 0) + usage(); + (void) cbreak(); /* read chars without wait for \n */ + (void) noecho(); /* don't echo input */ + update_modes(); + curs_set(0); + + keypad(stdscr, TRUE); + + if ((hascolor = has_colors())) { + start_color(); + current = 1; + } else { + current = 0; + } + + /* + * Repeatedly cycle through all colors, initializing pairs as needed. + * Provide for single-stepping, or page-at-a-time, as well as quitting. + */ + while (!done) { + cchar_t temp; + attr_t my_attrs; + int my_pair; + + switch (getch()) { + case '?': + show_help(help); + break; + case 'p': + /* step-by-page */ + use_pages(); + update_modes(); + break; + case 's': + /* step-by-char */ + use_single(); + update_modes(); + break; + case ' ': + single_mode = FALSE; + update_modes(); + break; + case QUIT: + case ESCAPE: + case 'q': + done = TRUE; + continue; + case 'c': + clobber = !clobber; + continue; + case 'v': + if (--video_mode < 0) + video_mode = MAX_ATTR; + continue; + case 'V': + if (video_mode > MAX_ATTR) + video_mode = 0; + continue; + case 'w': + use_wide = !use_wide; + continue; + case ERR: + break; + default: + beep(); + break; + } + if (hascolor) { + my_attrs = next_attr(video_mode); + if (clobber) { + int fg, bg; + our_content(current, &fg, &bg); + my_pair = find_pair(fg, bg); + if (my_pair > 0) { + free_pair(my_pair); + } + my_pair = 0; + } else { + my_pair = (use_init + ? next_color(current) + : make_color(current)); + } + } else { + my_attrs = next_attr(current); + my_pair = 0; + } + if (my_pair < 0) + break; + wch[0] = use_wide ? 0xff03 : '#'; + wch[1] = 0; + setcchar(&temp, wch, my_attrs, (short) my_pair, NULL); + /* + * At the end of a page, move the cursor to the home position. + */ + if ((add_wch(&temp) == ERR) && paged_mode) { + nodelay(stdscr, !single_mode); + move(0, 0); + } + total_cells += 1 + (use_wide ? 1 : 0); + ++current; + } + endwin(); + + printf("%.1f cells/second\n", + (double) (total_cells) / (double) (now() - start)); + + ExitProgram(EXIT_SUCCESS); +} + +#else +int +main(void) +{ + printf("This program requires the ncurses alloc_pair function\n"); + ExitProgram(EXIT_FAILURE); +} +#endif diff --git a/test/modules b/test/modules index 3423e061..c55d3a84 100644 --- a/test/modules +++ b/test/modules @@ -1,4 +1,4 @@ -# $Id: modules,v 1.54 2016/06/04 17:47:08 tom Exp $ +# $Id: modules,v 1.55 2017/02/27 01:28:28 tom Exp $ ############################################################################## # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. # # # @@ -44,6 +44,7 @@ demo_defkey progs $(srcdir) $(HEADER_DEPS) demo_forms progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h demo_keyok progs $(srcdir) $(HEADER_DEPS) demo_menus progs $(srcdir) $(HEADER_DEPS) ../include/menu.h +demo_new_pair progs $(srcdir) $(HEADER_DEPS) demo_panels progs $(srcdir) $(HEADER_DEPS) ../include/panel.h demo_termcap progs $(srcdir) $(HEADER_DEPS) demo_terminfo progs $(srcdir) $(HEADER_DEPS) diff --git a/test/ncurses.c b/test/ncurses.c index ddd054e4..21305727 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -40,7 +40,7 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.446 2016/09/17 21:12:04 tom Exp $ +$Id: ncurses.c,v 1.447 2017/03/11 23:20:12 Petr.Vanek Exp $ ***************************************************************************/ @@ -1312,7 +1312,7 @@ attr_legend(WINDOW *helpwin) "Toggles:"); if (use_colors) { MvWPrintw(helpwin, row++, col, - " f/F/b/F toggle foreground/background background color"); + " f/F/b/B toggle foreground/background background color"); MvWPrintw(helpwin, row++, col, " t/T toggle text/background color attribute"); } diff --git a/test/programs b/test/programs index e3267fe8..db973039 100644 --- a/test/programs +++ b/test/programs @@ -1,6 +1,6 @@ -# $Id: programs,v 1.28 2016/06/04 17:47:41 tom Exp $ +# $Id: programs,v 1.29 2017/02/27 01:28:01 tom Exp $ ############################################################################## -# Copyright (c) 2006-2015,2016 Free Software Foundation, Inc. # +# Copyright (c) 2006-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -42,6 +42,7 @@ demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field demo_keyok $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_keyok demo_menus $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_menus +demo_new_pair $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_new_pair demo_panels $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_panels demo_termcap $(LDFLAGS_TINFO) $(LOCAL_LIBS) demo_termcap demo_terminfo $(LDFLAGS_TINFO) $(LOCAL_LIBS) demo_terminfo diff --git a/test/test.priv.h b/test/test.priv.h index 329d6a2f..a30ae551 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.139 2017/02/11 16:33:09 tom Exp $ */ +/* $Id: test.priv.h,v 1.140 2017/03/06 09:43:51 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -58,6 +58,10 @@ /* * Fallback definitions to accommodate broken compilers. */ +#ifndef HAVE_ALLOC_PAIR +#define HAVE_ALLOC_PAIR 0 +#endif + #ifndef HAVE_ASSUME_DEFAULT_COLORS #define HAVE_ASSUME_DEFAULT_COLORS 0 #endif