From: Thomas E. Dickey Date: Sun, 18 Dec 2011 00:13:30 +0000 (+0000) Subject: ncurses 5.9 - patch 20111217 X-Git-Tag: v6.0~176 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=5e36f11feab6f790e0cc6f2c882a67b7b65e3b6b ncurses 5.9 - patch 20111217 + review/fix places in manpages where --program-prefix configure option was not being used. + add -D option to infocmp, to show the database locations that it could use. + fix build for the special case where term-driver, ticlib and termlib are all enabled. The terminal driver depends on a few features in the base ncurses library, so tic's dependencies include both ncurses and termlib. + fix build work for term-driver when --enable-wgetch-events option is enabled. + use types to fix some questionable casts to void*. --- diff --git a/NEWS b/NEWS index 431ec8cc..22df742e 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.1829 2011/12/10 20:04:44 tom Exp $ +-- $Id: NEWS,v 1.1833 2011/12/17 23:30:24 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,19 @@ 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. +20111217 + + review/fix places in manpages where --program-prefix configure option + was not being used. + + add -D option to infocmp, to show the database locations that it + could use. + + fix build for the special case where term-driver, ticlib and termlib + are all enabled. The terminal driver depends on a few features in + the base ncurses library, so tic's dependencies include both ncurses + and termlib. + + fix build work for term-driver when --enable-wgetch-events option is + enabled. + + use types to fix some questionable casts to void*. + 20111210 + modify configure script to check if thread library provides pthread_mutexattr_settype(), e.g., not provided by Solaris 2.6 diff --git a/aclocal.m4 b/aclocal.m4 index 2522d102..bfd3cee7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.594 2011/12/11 00:03:00 tom Exp $ +dnl $Id: aclocal.m4,v 1.596 2011/12/17 21:19:09 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -2973,7 +2973,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30 +dnl CF_LIB_RULES version: 62 updated: 2011/12/17 16:17:33 dnl ------------ dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the @@ -3210,6 +3210,7 @@ do prefix=$cf_prefix \ suffix=$cf_suffix \ subset=$cf_subset \ + driver=$cf_cv_term_driver \ SymLink="$LN_S" \ TermlibRoot=$TINFO_NAME \ TermlibSuffix=$TINFO_SUFFIX \ diff --git a/configure b/configure index 09df6d1a..dc0fd84f 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.531 . +# From configure.in Revision: 1.534 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20101002. # @@ -16286,14 +16286,66 @@ cat >>confdefs.h <&5 +echo "$as_me:16289: 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 16295 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((intptr_t *) 0) + return 0; +if (sizeof (intptr_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:16313: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:16316: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16319: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_intptr_t=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_intptr_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:16329: 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 + : +else + +cat >>confdefs.h <&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 16296 "configure" +#line 16348 "configure" #include "confdefs.h" #include @@ -16306,16 +16358,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16361: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16312: \$? = $ac_status" >&5 + echo "$as_me:16364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16315: \"$ac_try\"") >&5 + { (eval echo "$as_me:16367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16318: \$? = $ac_status" >&5 + echo "$as_me:16370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -16326,13 +16378,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16329: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:16381: 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:16335: checking declaration of size-change" >&5 +echo "$as_me:16387: 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 @@ -16347,7 +16399,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 16350 "configure" +#line 16402 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -16391,16 +16443,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16394: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16397: \$? = $ac_status" >&5 + echo "$as_me:16449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16400: \"$ac_try\"") >&5 + { (eval echo "$as_me:16452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16403: \$? = $ac_status" >&5 + echo "$as_me:16455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -16419,7 +16471,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16422: result: $cf_cv_sizechange" >&5 +echo "$as_me:16474: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then cat >>confdefs.h <<\EOF @@ -16436,13 +16488,13 @@ EOF esac fi -echo "$as_me:16439: checking for memmove" >&5 +echo "$as_me:16491: 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 16445 "configure" +#line 16497 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -16473,16 +16525,16 @@ f = memmove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16476: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16528: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16479: \$? = $ac_status" >&5 + echo "$as_me:16531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16482: \"$ac_try\"") >&5 + { (eval echo "$as_me:16534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16485: \$? = $ac_status" >&5 + echo "$as_me:16537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -16492,19 +16544,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16495: result: $ac_cv_func_memmove" >&5 +echo "$as_me:16547: 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:16501: checking for bcopy" >&5 +echo "$as_me:16553: 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 16507 "configure" +#line 16559 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -16535,16 +16587,16 @@ f = bcopy; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16538: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16590: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16541: \$? = $ac_status" >&5 + echo "$as_me:16593: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16544: \"$ac_try\"") >&5 + { (eval echo "$as_me:16596: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16547: \$? = $ac_status" >&5 + echo "$as_me:16599: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -16554,11 +16606,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16557: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:16609: 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:16561: checking if bcopy does overlapping moves" >&5 + echo "$as_me:16613: 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 @@ -16568,7 +16620,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16571 "configure" +#line 16623 "configure" #include "confdefs.h" int main() { @@ -16582,15 +16634,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16585: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16637: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16588: \$? = $ac_status" >&5 + echo "$as_me:16640: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16590: \"$ac_try\"") >&5 + { (eval echo "$as_me:16642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16593: \$? = $ac_status" >&5 + echo "$as_me:16645: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -16603,7 +16655,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16606: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:16658: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -16624,7 +16676,7 @@ EOF fi -echo "$as_me:16627: checking if poll really works" >&5 +echo "$as_me:16679: 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 @@ -16634,7 +16686,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16637 "configure" +#line 16689 "configure" #include "confdefs.h" #include @@ -16655,15 +16707,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16658: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16710: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16661: \$? = $ac_status" >&5 + echo "$as_me:16713: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16663: \"$ac_try\"") >&5 + { (eval echo "$as_me:16715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16666: \$? = $ac_status" >&5 + echo "$as_me:16718: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -16675,20 +16727,20 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16678: result: $cf_cv_working_poll" >&5 +echo "$as_me:16730: 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:16684: checking for va_copy" >&5 +echo "$as_me:16736: 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 16691 "configure" +#line 16743 "configure" #include "confdefs.h" #include @@ -16705,16 +16757,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16708: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16760: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16711: \$? = $ac_status" >&5 + echo "$as_me:16763: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16714: \"$ac_try\"") >&5 + { (eval echo "$as_me:16766: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16717: \$? = $ac_status" >&5 + echo "$as_me:16769: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -16724,21 +16776,21 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16727: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:16779: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:16734: checking for __va_copy" >&5 +echo "$as_me:16786: 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 16741 "configure" +#line 16793 "configure" #include "confdefs.h" #include @@ -16755,16 +16807,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16758: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16810: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16761: \$? = $ac_status" >&5 + echo "$as_me:16813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16764: \"$ac_try\"") >&5 + { (eval echo "$as_me:16816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16767: \$? = $ac_status" >&5 + echo "$as_me:16819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -16774,20 +16826,20 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16777: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:16829: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:16784: checking for pid_t" >&5 +echo "$as_me:16836: 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 16790 "configure" +#line 16842 "configure" #include "confdefs.h" $ac_includes_default int @@ -16802,16 +16854,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16857: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16808: \$? = $ac_status" >&5 + echo "$as_me:16860: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16811: \"$ac_try\"") >&5 + { (eval echo "$as_me:16863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16814: \$? = $ac_status" >&5 + echo "$as_me:16866: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -16821,7 +16873,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16824: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:16876: 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 : @@ -16836,23 +16888,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:16839: checking for $ac_header" >&5 +echo "$as_me:16891: 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 16845 "configure" +#line 16897 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16849: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16901: \"$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:16855: \$? = $ac_status" >&5 + echo "$as_me:16907: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16871,7 +16923,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16874: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16926: 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:16939: 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 16893 "configure" +#line 16945 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -16921,16 +16973,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16976: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16927: \$? = $ac_status" >&5 + echo "$as_me:16979: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16930: \"$ac_try\"") >&5 + { (eval echo "$as_me:16982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16933: \$? = $ac_status" >&5 + echo "$as_me:16985: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -16940,7 +16992,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16943: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:16995: 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:17007: 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 @@ -16975,15 +17027,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16978: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17030: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16981: \$? = $ac_status" >&5 + echo "$as_me:17033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16983: \"$ac_try\"") >&5 + { (eval echo "$as_me:17035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16986: \$? = $ac_status" >&5 + echo "$as_me:17038: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -16995,7 +17047,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16998: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:17050: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -17009,12 +17061,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:17012: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:17064: 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:17017: checking for working vfork" >&5 + echo "$as_me:17069: 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 @@ -17023,7 +17075,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 17026 "configure" +#line 17078 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -17120,15 +17172,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17175: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17126: \$? = $ac_status" >&5 + echo "$as_me:17178: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17128: \"$ac_try\"") >&5 + { (eval echo "$as_me:17180: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17131: \$? = $ac_status" >&5 + echo "$as_me:17183: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -17140,13 +17192,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17143: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:17195: 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:17149: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:17201: 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 @@ -17173,7 +17225,7 @@ fi # special check for test/ditto.c -echo "$as_me:17176: checking for openpty in -lutil" >&5 +echo "$as_me:17228: 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 @@ -17181,7 +17233,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17184 "configure" +#line 17236 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17200,16 +17252,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17203: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17206: \$? = $ac_status" >&5 + echo "$as_me:17258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17209: \"$ac_try\"") >&5 + { (eval echo "$as_me:17261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17212: \$? = $ac_status" >&5 + echo "$as_me:17264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -17220,7 +17272,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17223: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:17275: 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 @@ -17228,7 +17280,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:17231: checking for openpty header" >&5 +echo "$as_me:17283: 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 @@ -17239,7 +17291,7 @@ else for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 17242 "configure" +#line 17294 "configure" #include "confdefs.h" #include <$cf_header> @@ -17256,16 +17308,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17259: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17262: \$? = $ac_status" >&5 + echo "$as_me:17314: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17265: \"$ac_try\"") >&5 + { (eval echo "$as_me:17317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17268: \$? = $ac_status" >&5 + echo "$as_me:17320: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -17283,7 +17335,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:17286: result: $cf_cv_func_openpty" >&5 +echo "$as_me:17338: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -17335,7 +17387,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 17338 "configure" +#line 17390 "configure" #include "confdefs.h" #include int @@ -17347,16 +17399,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17350: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17402: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17353: \$? = $ac_status" >&5 + echo "$as_me:17405: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17356: \"$ac_try\"") >&5 + { (eval echo "$as_me:17408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17359: \$? = $ac_status" >&5 + echo "$as_me:17411: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -17373,7 +17425,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}:17376: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:17428: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -17407,7 +17459,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}:17410: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:17462: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -17418,23 +17470,23 @@ fi fi esac -echo "$as_me:17421: checking for db.h" >&5 +echo "$as_me:17473: 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 17427 "configure" +#line 17479 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17431: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17483: \"$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:17437: \$? = $ac_status" >&5 + echo "$as_me:17489: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17453,11 +17505,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17456: result: $ac_cv_header_db_h" >&5 +echo "$as_me:17508: 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:17460: checking for version of db" >&5 +echo "$as_me:17512: 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 @@ -17468,10 +17520,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 do -echo "${as_me:-configure}:17471: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:17523: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17474 "configure" +#line 17526 "configure" #include "confdefs.h" $ac_includes_default @@ -17501,16 +17553,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17504: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17556: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17507: \$? = $ac_status" >&5 + echo "$as_me:17559: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17510: \"$ac_try\"") >&5 + { (eval echo "$as_me:17562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17513: \$? = $ac_status" >&5 + echo "$as_me:17565: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -17524,16 +17576,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:17527: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:17579: 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:17531: error: Cannot determine version of db" >&5 + { { echo "$as_me:17583: 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:17536: checking for db libraries" >&5 +echo "$as_me:17588: 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 @@ -17547,10 +17599,10 @@ do LIBS="-l$cf_db_libs $LIBS" fi -echo "${as_me:-configure}:17550: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:17602: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17553 "configure" +#line 17605 "configure" #include "confdefs.h" $ac_includes_default @@ -17605,16 +17657,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17608: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17660: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17611: \$? = $ac_status" >&5 + echo "$as_me:17663: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17614: \"$ac_try\"") >&5 + { (eval echo "$as_me:17666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17617: \$? = $ac_status" >&5 + echo "$as_me:17669: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -17634,11 +17686,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:17637: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:17689: 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:17641: error: Cannot determine library for db" >&5 + { { echo "$as_me:17693: 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 @@ -17648,7 +17700,7 @@ fi else - { { echo "$as_me:17651: error: Cannot find db.h" >&5 + { { echo "$as_me:17703: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -17663,7 +17715,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:17666: checking if we should include stdbool.h" >&5 +echo "$as_me:17718: 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 @@ -17671,7 +17723,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17674 "configure" +#line 17726 "configure" #include "confdefs.h" int @@ -17683,23 +17735,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17686: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17738: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17689: \$? = $ac_status" >&5 + echo "$as_me:17741: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17692: \"$ac_try\"") >&5 + { (eval echo "$as_me:17744: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17695: \$? = $ac_status" >&5 + echo "$as_me:17747: \$? = $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 17702 "configure" +#line 17754 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -17715,16 +17767,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17718: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17770: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17721: \$? = $ac_status" >&5 + echo "$as_me:17773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17724: \"$ac_try\"") >&5 + { (eval echo "$as_me:17776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17727: \$? = $ac_status" >&5 + echo "$as_me:17779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -17738,13 +17790,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:17741: result: yes" >&5 +then echo "$as_me:17793: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:17743: result: no" >&5 +else echo "$as_me:17795: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:17747: checking for builtin bool type" >&5 +echo "$as_me:17799: 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 @@ -17752,7 +17804,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17755 "configure" +#line 17807 "configure" #include "confdefs.h" #include @@ -17767,16 +17819,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17770: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17822: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17773: \$? = $ac_status" >&5 + echo "$as_me:17825: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17776: \"$ac_try\"") >&5 + { (eval echo "$as_me:17828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17779: \$? = $ac_status" >&5 + echo "$as_me:17831: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -17789,9 +17841,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:17792: result: yes" >&5 +then echo "$as_me:17844: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:17794: result: no" >&5 +else echo "$as_me:17846: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17813,7 +17865,7 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:17816: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:17868: 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 @@ -17822,7 +17874,7 @@ else cf_save="$LIBS" LIBS="-l$cf_stdcpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17825 "configure" +#line 17877 "configure" #include "confdefs.h" #include @@ -17838,16 +17890,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17841: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17844: \$? = $ac_status" >&5 + echo "$as_me:17896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17847: \"$ac_try\"") >&5 + { (eval echo "$as_me:17899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17850: \$? = $ac_status" >&5 + echo "$as_me:17902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -17859,12 +17911,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:17862: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:17914: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS" fi - echo "$as_me:17867: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:17919: 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 @@ -17880,15 +17932,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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:17883: \"$ac_try\"") >&5 +if { (eval echo "$as_me:17935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17886: \$? = $ac_status" >&5 + echo "$as_me:17938: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:17888: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:17940: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17891: \$? = $ac_status" >&5 + echo "$as_me:17943: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -17899,10 +17951,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:17902: result: yes" >&5 + echo "$as_me:17954: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:17905: result: no" >&5 + echo "$as_me:17957: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17922,12 +17974,12 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:17925: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:17977: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" LIBS="-l$cf_gpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17930 "configure" +#line 17982 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -17941,16 +17993,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17944: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17996: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17947: \$? = $ac_status" >&5 + echo "$as_me:17999: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17950: \"$ac_try\"") >&5 + { (eval echo "$as_me:18002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17953: \$? = $ac_status" >&5 + echo "$as_me:18005: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="-l$cf_gpp_libname $CXXLIBS" @@ -17969,7 +18021,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17972 "configure" +#line 18024 "configure" #include "confdefs.h" #include @@ -17983,16 +18035,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17986: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18038: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17989: \$? = $ac_status" >&5 + echo "$as_me:18041: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17992: \"$ac_try\"") >&5 + { (eval echo "$as_me:18044: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17995: \$? = $ac_status" >&5 + echo "$as_me:18047: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="-l$cf_gpp_libname $CXXLIBS" @@ -18009,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 LIBS="$cf_save" - echo "$as_me:18012: result: $cf_cxx_library" >&5 + echo "$as_me:18064: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -18025,7 +18077,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:18028: checking how to run the C++ preprocessor" >&5 +echo "$as_me:18080: 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 @@ -18042,18 +18094,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 18045 "configure" +#line 18097 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18050: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18102: \"$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:18056: \$? = $ac_status" >&5 + echo "$as_me:18108: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18076,17 +18128,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 18079 "configure" +#line 18131 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18083: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18135: \"$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:18089: \$? = $ac_status" >&5 + echo "$as_me:18141: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18123,7 +18175,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:18126: result: $CXXCPP" >&5 +echo "$as_me:18178: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -18133,18 +18185,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 18136 "configure" +#line 18188 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18141: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18193: \"$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:18147: \$? = $ac_status" >&5 + echo "$as_me:18199: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18167,17 +18219,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 18170 "configure" +#line 18222 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18174: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18226: \"$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:18180: \$? = $ac_status" >&5 + echo "$as_me:18232: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18205,7 +18257,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:18208: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:18260: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -18220,23 +18272,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:18223: checking for $ac_header" >&5 +echo "$as_me:18275: 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 18229 "configure" +#line 18281 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18233: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18285: \"$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:18239: \$? = $ac_status" >&5 + echo "$as_me:18291: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18255,7 +18307,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18258: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18310: 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:18323: 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 18277 "configure" +#line 18329 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18281: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18333: \"$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:18287: \$? = $ac_status" >&5 + echo "$as_me:18339: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18303,7 +18355,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18306: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18358: 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:18369: 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 18320 "configure" +#line 18372 "configure" #include "confdefs.h" #include @@ -18334,16 +18386,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18337: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18389: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18340: \$? = $ac_status" >&5 + echo "$as_me:18392: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18343: \"$ac_try\"") >&5 + { (eval echo "$as_me:18395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18346: \$? = $ac_status" >&5 + echo "$as_me:18398: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -18352,7 +18404,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18355: result: $cf_iostream_namespace" >&5 + echo "$as_me:18407: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then cat >>confdefs.h <<\EOF @@ -18362,7 +18414,7 @@ EOF fi fi -echo "$as_me:18365: checking if we should include stdbool.h" >&5 +echo "$as_me:18417: 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 @@ -18370,7 +18422,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18373 "configure" +#line 18425 "configure" #include "confdefs.h" int @@ -18382,23 +18434,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18385: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18437: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18388: \$? = $ac_status" >&5 + echo "$as_me:18440: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18391: \"$ac_try\"") >&5 + { (eval echo "$as_me:18443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18394: \$? = $ac_status" >&5 + echo "$as_me:18446: \$? = $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 18401 "configure" +#line 18453 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18414,16 +18466,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18417: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18420: \$? = $ac_status" >&5 + echo "$as_me:18472: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18423: \"$ac_try\"") >&5 + { (eval echo "$as_me:18475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18426: \$? = $ac_status" >&5 + echo "$as_me:18478: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18437,13 +18489,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18440: result: yes" >&5 +then echo "$as_me:18492: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18442: result: no" >&5 +else echo "$as_me:18494: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18446: checking for builtin bool type" >&5 +echo "$as_me:18498: 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 @@ -18451,7 +18503,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18454 "configure" +#line 18506 "configure" #include "confdefs.h" #include @@ -18466,16 +18518,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18469: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18472: \$? = $ac_status" >&5 + echo "$as_me:18524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18475: \"$ac_try\"") >&5 + { (eval echo "$as_me:18527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18478: \$? = $ac_status" >&5 + echo "$as_me:18530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -18488,13 +18540,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:18491: result: yes" >&5 +then echo "$as_me:18543: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18493: result: no" >&5 +else echo "$as_me:18545: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18497: checking for size of bool" >&5 +echo "$as_me:18549: 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 @@ -18505,7 +18557,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18508 "configure" +#line 18560 "configure" #include "confdefs.h" #include @@ -18547,15 +18599,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18550: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18602: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18553: \$? = $ac_status" >&5 + echo "$as_me:18605: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18555: \"$ac_try\"") >&5 + { (eval echo "$as_me:18607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18558: \$? = $ac_status" >&5 + echo "$as_me:18610: \$? = $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 @@ -18573,18 +18625,18 @@ fi fi rm -f cf_test.out -echo "$as_me:18576: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:18628: 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 #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:18582: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:18634: 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:18587: checking for special defines needed for etip.h" >&5 +echo "$as_me:18639: 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" @@ -18602,7 +18654,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 18605 "configure" +#line 18657 "configure" #include "confdefs.h" #include @@ -18616,16 +18668,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18622: \$? = $ac_status" >&5 + echo "$as_me:18674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18625: \"$ac_try\"") >&5 + { (eval echo "$as_me:18677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18628: \$? = $ac_status" >&5 + echo "$as_me:18680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:18701: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:18654: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:18706: 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 @@ -18668,7 +18720,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18671 "configure" +#line 18723 "configure" #include "confdefs.h" class TEST { @@ -18687,15 +18739,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18690: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18742: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18693: \$? = $ac_status" >&5 + echo "$as_me:18745: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18695: \"$ac_try\"") >&5 + { (eval echo "$as_me:18747: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18698: \$? = $ac_status" >&5 + echo "$as_me:18750: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -18714,7 +18766,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:18717: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:18769: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF @@ -18723,7 +18775,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:18726: checking if $CXX accepts static_cast" >&5 +echo "$as_me:18778: 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 @@ -18737,7 +18789,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 18740 "configure" +#line 18792 "configure" #include "confdefs.h" class NCursesPanel @@ -18781,16 +18833,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18784: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18836: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18787: \$? = $ac_status" >&5 + echo "$as_me:18839: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18790: \"$ac_try\"") >&5 + { (eval echo "$as_me:18842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18793: \$? = $ac_status" >&5 + echo "$as_me:18845: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -18808,7 +18860,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:18811: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:18863: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -18856,7 +18908,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:18859: checking for size of bool" >&5 +echo "$as_me:18911: 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 @@ -18867,7 +18919,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18870 "configure" +#line 18922 "configure" #include "confdefs.h" #include @@ -18909,15 +18961,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18912: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18964: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18915: \$? = $ac_status" >&5 + echo "$as_me:18967: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18917: \"$ac_try\"") >&5 + { (eval echo "$as_me:18969: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18920: \$? = $ac_status" >&5 + echo "$as_me:18972: \$? = $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 @@ -18935,25 +18987,25 @@ fi fi rm -f cf_test.out -echo "$as_me:18938: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:18990: 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 #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:18944: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:18996: 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:18950: checking for fallback type of bool" >&5 + echo "$as_me:19002: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in #(vi i?86) cf_cv_type_of_bool=char ;; #(vi *) cf_cv_type_of_bool=int ;; esac - echo "$as_me:18956: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:19008: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -18982,7 +19034,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:18985: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:19037: 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 @@ -18993,7 +19045,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:18996: checking for $ac_word" >&5 +echo "$as_me:19048: 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 @@ -19008,7 +19060,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:19011: found $ac_dir/$ac_word" >&5 +echo "$as_me:19063: found $ac_dir/$ac_word" >&5 break done @@ -19017,10 +19069,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:19020: result: $gnat_exists" >&5 + echo "$as_me:19072: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:19023: result: no" >&5 + echo "$as_me:19075: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19029,12 +19081,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:19032: checking for gnat version" >&5 +echo "$as_me:19084: 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:19037: result: $cf_gnat_version" >&5 +echo "$as_me:19089: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in #(vi @@ -19042,7 +19094,7 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=yes ;; *) - { echo "$as_me:19045: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:19097: 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 ;; @@ -19050,7 +19102,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:19053: checking for $ac_word" >&5 +echo "$as_me:19105: 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 @@ -19065,7 +19117,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:19068: found $ac_dir/$ac_word" >&5 +echo "$as_me:19120: found $ac_dir/$ac_word" >&5 break done @@ -19074,10 +19126,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:19077: result: $M4_exists" >&5 + echo "$as_me:19129: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:19080: result: no" >&5 + echo "$as_me:19132: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19086,7 +19138,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:19089: checking if GNAT works" >&5 + echo "$as_me:19141: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -19114,7 +19166,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:19117: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:19169: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -19139,7 +19191,7 @@ fi ;; esac -echo "$as_me:19142: checking if GNAT supports generics" >&5 +echo "$as_me:19194: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[1-9]*|[4-9].*) #(vi @@ -19149,7 +19201,7 @@ case $cf_gnat_version in #(vi cf_gnat_generics=no ;; esac -echo "$as_me:19152: result: $cf_gnat_generics" >&5 +echo "$as_me:19204: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -19161,7 +19213,7 @@ else cf_generic_objects= fi -echo "$as_me:19164: checking if GNAT supports SIGINT" >&5 +echo "$as_me:19216: 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 @@ -19209,7 +19261,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19212: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:19264: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -19218,7 +19270,7 @@ else USE_GNAT_SIGINT="#" fi -echo "$as_me:19221: checking if GNAT pragma Unreferenced works" >&5 +echo "$as_me:19273: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 if test "${cf_cv_pragma_unreferenced+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19249,7 +19301,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19252: result: $cf_cv_pragma_unreferenced" >&5 +echo "$as_me:19304: result: $cf_cv_pragma_unreferenced" >&5 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 # if the pragma is supported, use it (needed in the Trace code). @@ -19262,7 +19314,7 @@ fi cf_gnat_libraries=no cf_gnat_projects=no -echo "$as_me:19265: checking if GNAT supports project files" >&5 +echo "$as_me:19317: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[0-9]*) #(vi @@ -19330,14 +19382,14 @@ CF_EOF esac ;; esac -echo "$as_me:19333: result: $cf_gnat_projects" >&5 +echo "$as_me:19385: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 if test $cf_gnat_projects = yes then - echo "$as_me:19338: checking if GNAT supports libraries" >&5 + echo "$as_me:19390: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:19340: result: $cf_gnat_libraries" >&5 + echo "$as_me:19392: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -19357,7 +19409,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:19360: checking for ada-compiler" >&5 +echo "$as_me:19412: 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. @@ -19368,12 +19420,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:19371: result: $cf_ada_compiler" >&5 +echo "$as_me:19423: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:19376: checking for ada-include" >&5 +echo "$as_me:19428: 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. @@ -19409,7 +19461,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19412: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19464: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19418,10 +19470,10 @@ esac fi ADA_INCLUDE="$withval" -echo "$as_me:19421: result: $ADA_INCLUDE" >&5 +echo "$as_me:19473: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:19424: checking for ada-objects" >&5 +echo "$as_me:19476: 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. @@ -19457,7 +19509,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19460: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19512: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19466,10 +19518,10 @@ esac fi ADA_OBJECTS="$withval" -echo "$as_me:19469: result: $ADA_OBJECTS" >&5 +echo "$as_me:19521: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:19472: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:19524: 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. @@ -19479,7 +19531,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:19482: result: $with_ada_sharedlib" >&5 +echo "$as_me:19534: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -19510,7 +19562,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:19513: checking for library subsets" >&5 +echo "$as_me:19565: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -19551,7 +19603,7 @@ fi test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:19554: result: $LIB_SUBSETS" >&5 +echo "$as_me:19606: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -19589,7 +19641,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:19592: checking default library suffix" >&5 +echo "$as_me:19644: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -19600,10 +19652,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:19603: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:19655: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:19606: checking default library-dependency suffix" >&5 +echo "$as_me:19658: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -19656,10 +19708,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:19659: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:19711: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:19662: checking default object directory" >&5 +echo "$as_me:19714: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -19675,12 +19727,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:19678: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:19730: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 # libtool thinks it can make c++ shared libraries (perhaps only g++) if test "$cf_with_cxx" = yes ; then -echo "$as_me:19683: checking c++ library-dependency suffix" >&5 +echo "$as_me:19735: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX @@ -19737,7 +19789,7 @@ else test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" fi -echo "$as_me:19740: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:19792: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -19810,9 +19862,15 @@ if test "$with_termlib" != no ; then else TEST_ARGS="-l${TINFO_ARG_SUFFIX}" TEST_ARG2="-l${TINFO_ARG_SUFFIX}" - TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + if test "x$with_term_driver" != xno ; then + TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" + TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}" + TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" + else + TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + TINFO_LIBS="$TEST_ARGS" + fi TINFO_LDFLAGS="-L${LIB_DIR}" - TINFO_LIBS="$TEST_ARGS" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi else @@ -19896,19 +19954,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:19899: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:19957: 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:19908: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:19966: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19911: \$? = $ac_status" >&5 + echo "$as_me:19969: \$? = $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 @@ -19919,10 +19977,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19922 "configure" +#line 19980 "configure" #include "confdefs.h" -#line 19925 "configure" +#line 19983 "configure" #include int cf_ldflags_static(FILE *fp); @@ -19937,16 +19995,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19940: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19998: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19943: \$? = $ac_status" >&5 + echo "$as_me:20001: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19946: \"$ac_try\"") >&5 + { (eval echo "$as_me:20004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19949: \$? = $ac_status" >&5 + echo "$as_me:20007: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -19969,7 +20027,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:19972: result: $cf_ldflags_static" >&5 + echo "$as_me:20030: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -19985,12 +20043,12 @@ fi ;; esac -echo "$as_me:19988: checking where we will install curses.h" >&5 +echo "$as_me:20046: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 test "$with_overwrite" = no && \ test "x$includedir" = 'x${prefix}/include' && \ includedir='${prefix}/include/ncurses'${LIB_SUFFIX} -echo "$as_me:19993: result: $includedir" >&5 +echo "$as_me:20051: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -19998,7 +20056,7 @@ echo "${ECHO_T}$includedir" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:20001: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:20059: 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 @@ -20015,7 +20073,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:20018: checking for src modules" >&5 +echo "$as_me:20076: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -20080,7 +20138,7 @@ EOF fi fi done -echo "$as_me:20083: result: $cf_cv_src_modules" >&5 +echo "$as_me:20141: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -20292,7 +20350,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:20295: checking for $ac_word" >&5 +echo "$as_me:20353: 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 @@ -20309,7 +20367,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:20312: found $ac_dir/$ac_word" >&5 + echo "$as_me:20370: found $ac_dir/$ac_word" >&5 break fi done @@ -20321,10 +20379,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:20324: result: $TIC_PATH" >&5 + echo "$as_me:20382: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:20327: result: no" >&5 + echo "$as_me:20385: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20332,7 +20390,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:20335: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:20393: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -20433,7 +20491,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:20436: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:20494: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -20609,7 +20667,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:20612: error: ambiguous option: $1 + { { echo "$as_me:20670: 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;} @@ -20628,7 +20686,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:20631: error: unrecognized option: $1 + -*) { { echo "$as_me:20689: 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;} @@ -20711,6 +20769,7 @@ cf_cv_shared_soname='$cf_cv_shared_soname' cf_cv_shlib_version="$cf_cv_shlib_version" cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" cf_cv_system_name="$cf_cv_system_name" +cf_cv_term_driver="$with_term_driver" cf_with_ada="$cf_with_ada" cf_with_cxx_binding="$cf_with_cxx_binding" cf_with_manpages="$cf_with_manpages" @@ -20735,7 +20794,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:20738: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:20797: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21149,7 +21208,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21152: creating $ac_file" >&5 + { echo "$as_me:21211: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21167,7 +21226,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:21170: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21229: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21180,7 +21239,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21183: error: cannot find input file: $f" >&5 + { { echo "$as_me:21242: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21246,7 +21305,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:21249: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:21308: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -21257,7 +21316,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:21260: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21319: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21270,7 +21329,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21273: error: cannot find input file: $f" >&5 + { { echo "$as_me:21332: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21328,7 +21387,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:21331: $ac_file is unchanged" >&5 + { echo "$as_me:21390: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -21735,6 +21794,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ prefix=$cf_prefix \ suffix=$cf_suffix \ subset=$cf_subset \ + driver=$cf_cv_term_driver \ SymLink="$LN_S" \ TermlibRoot=$TINFO_NAME \ TermlibSuffix=$TINFO_SUFFIX \ diff --git a/configure.in b/configure.in index b02dc184..04326aea 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.531 2011/10/30 01:00:05 tom Exp $ +dnl $Id: configure.in,v 1.534 2011/12/17 21:12:37 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.13.20020210) -AC_REVISION($Revision: 1.531 $) +AC_REVISION($Revision: 1.534 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1406,6 +1406,7 @@ else AC_FUNC_SETVBUF_REVERSED fi AC_TYPE_SIGNAL +AC_CHECK_TYPE(intptr_t, long) CF_TYPE_SIGACTION CF_SIZECHANGE CF_FUNC_MEMMOVE @@ -1721,9 +1722,15 @@ if test "$with_termlib" != no ; then else TEST_ARGS="-l${TINFO_ARG_SUFFIX}" TEST_ARG2="-l${TINFO_ARG_SUFFIX}" - TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + if test "x$with_term_driver" != xno ; then + TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" + TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}" + TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" + else + TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + TINFO_LIBS="$TEST_ARGS" + fi TINFO_LDFLAGS="-L${LIB_DIR}" - TINFO_LIBS="$TEST_ARGS" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi else @@ -1942,6 +1949,7 @@ cf_cv_shared_soname='$cf_cv_shared_soname' cf_cv_shlib_version="$cf_cv_shlib_version" cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" cf_cv_system_name="$cf_cv_system_name" +cf_cv_term_driver="$with_term_driver" cf_with_ada="$cf_with_ada" cf_with_cxx_binding="$cf_with_cxx_binding" cf_with_manpages="$cf_with_manpages" diff --git a/dist.mk b/dist.mk index 870fb76d..babb68c8 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.847 2011/12/10 15:27:30 tom Exp $ +# $Id: dist.mk,v 1.848 2011/12/17 16:54:35 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 = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20111210 +NCURSES_PATCH = 20111217 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/ncurses_defs b/include/ncurses_defs index c0c3e7bd..957ee3e9 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,4 +1,4 @@ -# $Id: ncurses_defs,v 1.51 2011/10/29 18:48:53 tom Exp $ +# $Id: ncurses_defs,v 1.52 2011/12/17 18:14:30 tom Exp $ ############################################################################## # Copyright (c) 2000-2010,2011 Free Software Foundation, Inc. # # # @@ -125,6 +125,7 @@ HAVE_SIGVEC HAVE_SIZECHANGE HAVE_SLK_COLOR HAVE_SLK_INIT 1 +HAVE_STDINT_H HAVE_STRDUP HAVE_STRSTR HAVE_SYMLINK diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x index 0e95d1c2..77a1b6bb 100644 --- a/man/curs_terminfo.3x +++ b/man/curs_terminfo.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1999-2008,2010 Free Software Foundation, Inc. * +.\" Copyright (c) 1999-2010,2011 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_terminfo.3x,v 1.35 2010/12/04 18:38:55 tom Exp $ +.\" $Id: curs_terminfo.3x,v 1.36 2011/12/17 23:31:40 tom Exp $ .TH curs_terminfo 3X "" .ds n 5 .na @@ -346,7 +346,7 @@ X/Open states that the old location must be given for \fBmvcur\fP. This implementation allows the caller to use \-1's for the old ordinates. In that case, the old location is unknown. .PP -Extended terminal capability names, e.g., as defined by \fBtic\ \-x\fP, +Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP, are not stored in the arrays described in this section. .SH SEE ALSO \fBcurses\fR(3X), diff --git a/man/curs_util.3x b/man/curs_util.3x index fb912b65..3d33e199 100644 --- a/man/curs_util.3x +++ b/man/curs_util.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_util.3x,v 1.32 2010/12/04 18:38:55 tom Exp $ +.\" $Id: curs_util.3x,v 1.33 2011/12/17 23:31:30 tom Exp $ .TH curs_util 3X "" .de bP .IP \(bu 4 @@ -224,7 +224,7 @@ this implementation returns strings ``M\-^@'', ``M\-^A'', etc. .PP The \fBkeyname\fP function may return the names of user-defined string capabilities which are defined in the terminfo entry via the \fB\-x\fP -option of \fBtic\fP. +option of \fB@TIC@\fP. This implementation automatically assigns at run-time keycodes to user-defined strings which begin with "k". The keycodes start at KEY_MAX, but are not guaranteed to be diff --git a/man/infocmp.1m b/man/infocmp.1m index 454d716a..e598a8a8 100644 --- a/man/infocmp.1m +++ b/man/infocmp.1m @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: infocmp.1m,v 1.49 2011/08/06 17:46:28 tom Exp $ +.\" $Id: infocmp.1m,v 1.50 2011/12/17 23:15:19 tom Exp $ .TH @INFOCMP@ 1M "" .ds n 5 .ds d @TERMINFO@ @@ -37,6 +37,7 @@ \fB@INFOCMP@\fR [\fB\-\ 1\ C\ +D\ E\ F\ G\ @@ -180,7 +181,7 @@ the first of the other \fItermname\fR entries that has this capability gives a different value for the capability than that in the first \fItermname\fR. .PP The order of the other \fItermname\fR entries is significant. Since the -terminfo compiler \fBtic\fR does a left-to-right scan of the capabilities, +terminfo compiler \fB@TIC@\fR does a left-to-right scan of the capabilities, specifying two \fBuse=\fR entries that contain differing entries for the same capabilities will produce different results depending on the order that the entries are given in. \fB@INFOCMP@\fR will flag any such inconsistencies between @@ -220,6 +221,9 @@ of 60 characters. \fB\-a\fR tells \fB@INFOCMP@\fP to retain commented-out capabilities rather than discarding them. Capabilities are commented by prefixing them with a period. +.TP +\fB\-D\fR +tells \fB@INFOCMP@\fP to print the database locations that it knows about, and exit. .TP 5 \fB\-E\fR Dump the capabilities of the given terminal as tables, needed in @@ -372,7 +376,7 @@ This is mainly useful for testing and analysis, since the compiled descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo). .TP \fB\-t\fR -tells \fBtic\fP to discard commented-out capabilities. +tells \fB@TIC@\fP to discard commented-out capabilities. Normally when translating from terminfo to termcap, untranslatable capabilities are commented-out. .TP 5 @@ -395,7 +399,7 @@ changes the output to \fIwidth\fR characters. \fB\-x\fR print information for user-defined capabilities. These are extensions to the terminfo repertoire which can be loaded -using the \fB\-x\fR option of \fBtic\fP. +using the \fB\-x\fR option of \fB@TIC@\fP. .SH FILES .TP 20 \*d diff --git a/man/ncurses.3x b/man/ncurses.3x index 22509fa1..14900d94 100644 --- a/man/ncurses.3x +++ b/man/ncurses.3x @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: ncurses.3x,v 1.105 2011/07/30 23:38:59 tom Exp $ +.\" $Id: ncurses.3x,v 1.106 2011/12/17 23:19:59 tom Exp $ .hy 0 .TH ncurses 3X "" .de bP @@ -108,9 +108,9 @@ Most programs would additionally use the sequence: .sp Before a \fBcurses\fR program is run, the tab stops of the terminal should be set and its initialization strings, if defined, must be output. -This can be done by executing the \fBtput init\fR command +This can be done by executing the \fB@TPUT@ init\fR command after the shell environment variable \fBTERM\fR has been exported. -\fBtset(1)\fR is usually responsible for doing this. +\fB@TSET@(1)\fR is usually responsible for doing this. [See \fBterminfo\fR(\*n) for further details.] .PP The \fBncurses\fR library permits manipulation of data structures, @@ -936,7 +936,7 @@ disables the special check for "linux" and "screen". .IP As an alternative to the environment variable, ncurses checks for an extended terminfo capability \fBU8\fP. -This is a numeric capability which can be compiled using \fBtic\ \-x\fP. +This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP. For example .RS 5 .sp diff --git a/man/tabs.1 b/man/tabs.1 index c867db51..32d30520 100644 --- a/man/tabs.1 +++ b/man/tabs.1 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * +.\" Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,19 +26,19 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tabs.1,v 1.8 2010/12/04 18:40:45 tom Exp $ +.\" $Id: tabs.1,v 1.9 2011/12/17 23:31:59 tom Exp $ .TH @TABS@ 1 "" .ds n 5 .SH NAME -\fBtabs\fR \- set tabs on a terminal +\fB@TABS@\fR \- set tabs on a terminal .SH SYNOPSIS -\fBtabs\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR +\fB@TABS@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR .br .SH DESCRIPTION .PP -The \fBtabs\fP program clears and sets tab-stops on the terminal. +The \fB@TABS@\fP program clears and sets tab-stops on the terminal. This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities. -If either is absent, \fBtabs\fP is unable to clear/set tab-stops. +If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops. The terminal should be configured to use hard tabs, e.g., .sp .RS @@ -48,8 +48,8 @@ stty tab0 .SS General Options .TP 5 .BI \-T "name" -Tell \fBtabs\fP which terminal type to use. -If this option is not given, \fBtabs\fP will use the \fB$TERM\fP +Tell \fB@TABS@\fP which terminal type to use. +If this option is not given, \fB@TABS@\fP will use the \fB$TERM\fP environment variable. If that is not set, it will use the \fIansi+tabs\fP entry. .TP 5 @@ -59,10 +59,10 @@ The first data line shows the expected tab-stops marked with asterisks. The second data line shows the actual tab-stops, marked with asterisks. .TP 5 .B \-n -This option tells \fBtabs\fP to check the options and run any debugging +This option tells \fB@TABS@\fP to check the options and run any debugging option, but not to modify the terminal settings. .PP -The \fBtabs\fP program processes a single list of tab stops. +The \fB@TABS@\fP program processes a single list of tab stops. The last option to be processed which defines a list is the one that determines the list to be processed. .SS Implicit Lists diff --git a/man/term.7 b/man/term.7 index 78aa095a..cee8a012 100644 --- a/man/term.7 +++ b/man/term.7 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: term.7,v 1.22 2010/12/04 18:41:07 tom Exp $ +.\" $Id: term.7,v 1.23 2011/12/17 23:32:17 tom Exp $ .TH term 7 .ds n 5 .ds d @TERMINFO@ @@ -55,7 +55,7 @@ can almost always be avoided by explicitly exporting `vt100' (assuming you are in fact using a VT100-superset console, terminal, or terminal emulator.) .PP In any case, you are free to override the system \fBTERM\fR setting to your -taste in your shell profile. The \fBtset\fP(1) utility may be of assistance; +taste in your shell profile. The \fB@TSET@\fP(1) utility may be of assistance; you can give it a set of rules for deducing or requesting a terminal type based on the tty device and baud rate. .PP diff --git a/man/term_variables.3x b/man/term_variables.3x index 58b7cfea..bd2e0f6e 100644 --- a/man/term_variables.3x +++ b/man/term_variables.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2010 Free Software Foundation, Inc. * +.\" Copyright (c) 2010,2011 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: term_variables.3x,v 1.2 2010/12/04 18:38:55 tom Exp $ +.\" $Id: term_variables.3x,v 1.3 2011/12/17 23:31:50 tom Exp $ .TH term_variables 3X "" .ds n 5 .na @@ -110,7 +110,7 @@ use as a parameter to \fBset_term\fP, for switching between screens. Alternatively, one can save the return value from \fBnewterm\fP or \fBsetupterm\fP to reuse in \fBset_term\fP. .SS Terminfo Names -The \fBtic\fP(1) and \fBinfocmp\fP(1) programs use lookup tables for +The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for the long and short names of terminfo capabilities, as well as the corresponding names for termcap capabilities. These are available to other applications, diff --git a/man/terminfo.tail b/man/terminfo.tail index 7353cd58..a3ee0a8a 100644 --- a/man/terminfo.tail +++ b/man/terminfo.tail @@ -1,4 +1,4 @@ -.\" $Id: terminfo.tail,v 1.54 2011/07/30 23:39:52 tom Exp $ +.\" $Id: terminfo.tail,v 1.55 2011/12/17 23:19:59 tom Exp $ .\" Beginning of terminfo.tail file .\" This file is part of ncurses. .\" See "terminfo.head" for copyright. @@ -397,7 +397,7 @@ It is possible to form else-if's a la Algol 68: .IP where c\di\u are conditions, b\di\u are bodies. .IP -Use the \fB\-f\fP option of \fBtic\fP or \fB@INFOCMP@\fP to see +Use the \fB\-f\fP option of \fB@TIC@\fP or \fB@INFOCMP@\fP to see the structure of if-then-else's. Some strings, e.g., \fBsgr\fP can be very complicated when written on one line. @@ -974,7 +974,7 @@ the numeric parameter .B it is given, showing the number of spaces the tabs are set to. This is normally used by the -.IR tset +.IR @TSET@ command to determine whether to set the mode for hardware tab expansion, and whether to set the tab stops. If the terminal has tab stops that can be saved in non-volatile memory, diff --git a/man/tic.1m b/man/tic.1m index 92c0853e..57c9b8a1 100644 --- a/man/tic.1m +++ b/man/tic.1m @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tic.1m,v 1.52 2011/11/27 01:13:07 tom Exp $ +.\" $Id: tic.1m,v 1.53 2011/12/17 23:13:19 tom Exp $ .TH @TIC@ 1M "" .ds n 5 .ds d @TERMINFO@ @@ -34,9 +34,9 @@ .IP \(bu 4 .. .SH NAME -\fBtic\fR \- the \fIterminfo\fR entry-description compiler +\fB@TIC@\fR \- the \fIterminfo\fR entry-description compiler .SH SYNOPSIS -\fBtic\fR +\fB@TIC@\fR [\fB\-\ 0\ 1\ @@ -67,14 +67,14 @@ x\ \fIfile\fR .br .SH DESCRIPTION -The \fBtic\fR command translates a \fBterminfo\fR file from source +The \fB@TIC@\fR command translates a \fBterminfo\fR file from source format into compiled format. The compiled format is necessary for use with the library routines in \fBncurses\fR(3X). .PP As described in \fBterm\fR(\*n), the database may be either a directory tree (one file per terminal entry) or a hashed database (one record per entry). -The \fBtic\fR writes only one type of entry, depending on how it was built: +The \fB@TIC@\fR writes only one type of entry, depending on how it was built: .bP For directory trees, the top-level directory, e.g., /usr/share/terminfo, specifies the location of the database. @@ -96,7 +96,7 @@ First, you may override the system default by setting the variable location, e.g., an existing directory (for directory trees) or valid location for a hashed database. .bP -Secondly, if \fBtic\fR cannot write in \fI\*d\fR +Secondly, if \fB@TIC@\fR cannot write in \fI\*d\fR or the location specified using your TERMINFO variable, it looks for the directory \fI$HOME/.terminfo\fR (or hashed database \fI$HOME/.terminfo.db)\fR; @@ -114,7 +114,7 @@ restricts the output to a single line restricts the output to a single column .TP \fB\-a\fR -tells \fBtic\fP to retain commented-out capabilities rather than discarding +tells \fB@TIC@\fP to retain commented-out capabilities rather than discarding them. Capabilities are commented by prefixing them with a period. This sets the \fB\-x\fR option, because it treats the commented-out @@ -135,7 +135,7 @@ from terminfo format. For a stricter BSD-compatible translation, add the \fB\-K\fR option. .TP \fB\-c\fR -tells \fBtic\fP to only check \fIfile\fR for errors, including syntax problems and +tells \fB@TIC@\fP to only check \fIfile\fR for errors, including syntax problems and bad use links. If you specify \fB\-C\fR (\fB\-I\fR) with this option, the code will print warnings about entries which, after use resolution, are more than @@ -147,10 +147,10 @@ these entries may cause core dumps with other implementations. .TP \fB\-D\fR -tells \fBtic\fP to print the database locations that it knows about, and exit. +tells \fB@TIC@\fP to print the database locations that it knows about, and exit. The first location shown is the one to which it would write compiled terminal descriptions. -If \fBtic\fP is not able to find a writable database location +If \fB@TIC@\fP is not able to find a writable database location according to the rules summarized above, it will print a diagnostic and exit with an error rather than printing a list of database locations. @@ -232,12 +232,12 @@ This is mainly useful for testing and analysis, since the compiled descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo). .TP \fB\-t\fR -tells \fBtic\fP to discard commented-out capabilities. +tells \fB@TIC@\fP to discard commented-out capabilities. Normally when translating from terminfo to termcap, untranslatable capabilities are commented-out. .TP 5 \fB\-U\fR -tells \fBtic\fP to not post-process the data after parsing the source file. +tells \fB@TIC@\fP to not post-process the data after parsing the source file. Normally, it infers data which is commonly missing in older terminfo data, or in termcaps. .TP @@ -246,7 +246,7 @@ reports the version of ncurses which was used in this program, and exits. .TP \fB\-v\fR\fIn\fR specifies that (verbose) output be written to standard error trace -information showing \fBtic\fR's progress. +information showing \fB@TIC@\fR's progress. The optional parameter \fIn\fR is a number from 1 to 10, inclusive, indicating the desired level of detail of information. If \fIn\fR is omitted, the default level is 1. @@ -260,7 +260,7 @@ If it is omitted, it defaults to 60. .TP \fB\-x\fR Treat unknown capabilities as user-defined. -That is, if you supply a capability name which \fBtic\fP does not recognize, +That is, if you supply a capability name which \fB@TIC@\fP does not recognize, it will infer its type (boolean, number or string) from the syntax and make an extended table entry for that. User-defined capability strings @@ -297,18 +297,18 @@ All values computed in construction of the hash table .LP If the debug level \fIn\fR is not given, it is taken to be one. .PP -All but one of the capabilities recognized by \fBtic\fR are documented +All but one of the capabilities recognized by \fB@TIC@\fR are documented in \fBterminfo\fR(\*n). The exception is the \fBuse\fR capability. .PP When a \fBuse\fR=\fIentry\fR\-\fIname\fR field is discovered in a -terminal entry currently being compiled, \fBtic\fR reads in the binary +terminal entry currently being compiled, \fB@TIC@\fR reads in the binary from \fB\*d\fR to complete the entry. (Entries created from \fIfile\fR will be used first. If the environment variable \fBTERMINFO\fR is set, that database location is searched instead of -\fB\*d\fR.) \fBtic\fR duplicates the capabilities in +\fB\*d\fR.) \fB@TIC@\fR duplicates the capabilities in \fIentry\fR\-\fIname\fR for the current entry, with the exception of those capabilities that explicitly are defined in the current entry. .PP @@ -328,14 +328,14 @@ Terminal names exceeding the maximum alias length (32 characters on systems with long filenames, 14 characters otherwise) will be truncated to the maximum alias length and a warning message will be printed. .SH COMPATIBILITY -There is some evidence that historic \fBtic\fR implementations treated +There is some evidence that historic \fB@TIC@\fR implementations treated description fields with no whitespace in them as additional aliases or short names. -This \fBtic\fR does not do that, but it does warn when +This \fB@TIC@\fR does not do that, but it does warn when description fields may be treated that way and check them for dangerous characters. .SH EXTENSIONS -Unlike the stock SVr4 \fBtic\fR command, this implementation can actually +Unlike the stock SVr4 \fB@TIC@\fR command, this implementation can actually compile termcap sources. In fact, entries in terminfo and termcap syntax can be mixed in a single source file. @@ -344,7 +344,7 @@ termcap names taken to be equivalent to terminfo names. .PP The SVr4 manual pages are not clear on the resolution rules for \fBuse\fR capabilities. -This implementation of \fBtic\fR will find \fBuse\fR targets anywhere +This implementation of \fB@TIC@\fR will find \fBuse\fR targets anywhere in the source file, or anywhere in the file tree rooted at \fBTERMINFO\fR (if \fBTERMINFO\fR is defined), or in the user's \fI$HOME/.terminfo\fR database @@ -352,7 +352,7 @@ or in the user's \fI$HOME/.terminfo\fR database or (finally) anywhere in the system's file tree of compiled entries. .PP -The error messages from this \fBtic\fR have the same format as GNU C +The error messages from this \fB@TIC@\fR have the same format as GNU C error messages, and can be parsed by GNU Emacs's compile facility. .PP The diff --git a/man/toe.1m b/man/toe.1m index c8eb4812..9ef3b1a3 100644 --- a/man/toe.1m +++ b/man/toe.1m @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * .\" copy of this software and associated documentation files (the * @@ -26,19 +26,19 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: toe.1m,v 1.23 2010/12/04 18:40:45 tom Exp $ +.\" $Id: toe.1m,v 1.24 2011/12/17 23:31:21 tom Exp $ .TH @TOE@ 1M "" .ds n 5 .ds d @TERMINFO@ .SH NAME -\fBtoe\fR \- table of (terminfo) entries +\fB@TOE@\fR \- table of (terminfo) entries .SH SYNOPSIS -\fBtoe\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR +\fB@TOE@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR .br .SH DESCRIPTION .PP With no options, -\fBtoe\fR lists all available terminal types by primary name +\fB@TOE@\fR lists all available terminal types by primary name with descriptions. File arguments specify the directories to be scanned; if no such arguments are given, @@ -78,7 +78,7 @@ followed by a newline. .TP \fB\-v\fR\fIn\fR specifies that (verbose) output be written to standard error, -showing \fBtoe\fR's progress. +showing \fB@TOE@\fR's progress. The optional parameter \fIn\fR is a number from 1 to 10, interpreted as for \fB@TIC@\fR(1M). .TP diff --git a/man/tput.1 b/man/tput.1 index 665c7119..915a2d79 100644 --- a/man/tput.1 +++ b/man/tput.1 @@ -1,6 +1,6 @@ '\" t .\"*************************************************************************** -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2010,2011 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 * @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tput.1,v 1.29 2010/12/04 18:41:07 tom Exp $ +.\" $Id: tput.1,v 1.30 2011/12/17 23:32:08 tom Exp $ .TH @TPUT@ 1 "" .ds d @TERMINFO@ .ds n 1 @@ -159,7 +159,7 @@ name in the first line of the terminal's description in the .PP If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the same effect as \fB@TPUT@ reset\fR. -See \fBtset\fR for comparison, which has similar behavior. +See \fB@TSET@\fR for comparison, which has similar behavior. .SH EXAMPLES .TP 5 \fB@TPUT@ init\fR @@ -275,7 +275,7 @@ In that case, the exit code is set to 4 + \fBerrno\fR. .PP Any other exit code indicates an error; see the DIAGNOSTICS section. .SH DIAGNOSTICS -\fBtput\fR prints the following error messages and sets the corresponding exit +\fB@TPUT@\fR prints the following error messages and sets the corresponding exit codes. .PP .ne 15 @@ -303,12 +303,12 @@ AT&T/USL curses before SVr4. .PP X/Open documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP. In this implementation, \fBclear\fP is part of the \fIcapname\fR support. -Other implementations of \fBtput\fP on +Other implementations of \fB@TPUT@\fP on SVr4-based systems such as Solaris, IRIX64 and HPUX as well as others such as AIX and Tru64 provide support for \fIcapname\fR operands. A few platforms such as FreeBSD and NetBSD recognize termcap names rather -than terminfo capability names in their respective \fBtput\fP commands. +than terminfo capability names in their respective \fB@TPUT@\fP commands. .SH SEE ALSO \fB@CLEAR@\fR(1), \fBstty\fR(1), diff --git a/man/tset.1 b/man/tset.1 index c97a20a5..f2bf09d4 100644 --- a/man/tset.1 +++ b/man/tset.1 @@ -26,12 +26,12 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tset.1,v 1.26 2011/09/03 13:58:35 Sven.Joachim Exp $ +.\" $Id: tset.1,v 1.27 2011/12/17 23:20:35 tom Exp $ .TH @TSET@ 1 "" .SH NAME -\fBtset\fR, \fBreset\fR \- terminal initialization +\fB@TSET@\fR, \fBreset\fR \- terminal initialization .SH SYNOPSIS -\fBtset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR] +\fB@TSET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR] .br \fBreset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR] .SH DESCRIPTION @@ -72,7 +72,7 @@ Use the \fB\-c\fP or \fB\-w\fP option to select only the window sizing versus the other initialization. If neither option is given, both are assumed. .PP -When invoked as \fBreset\fR, \fBtset\fR sets cooked and echo modes, +When invoked as \fBreset\fR, \fB@TSET@\fR sets cooked and echo modes, turns off cbreak and raw modes, turns on newline translation and resets any unset special characters to their default values before doing the terminal initialization described above. This is useful @@ -110,7 +110,7 @@ for more information. .TP .B \-Q Do not display any values for the erase, interrupt and line kill characters. -Normally \fBtset\fR displays the values for control characters which +Normally \fB@TSET@\fR displays the values for control characters which differ from the system's default values. .TP .B \-q @@ -153,19 +153,19 @@ Note, the \fBcsh\fR commands set and unset the shell variable \fBnoglob\fR, leaving it unset. The following line in the \fB.login\fR or \fB.profile\fR files will initialize the environment correctly: .sp - eval \`tset \-s options ... \` + eval \`@TSET@ \-s options ... \` . .SH TERMINAL TYPE MAPPING When the terminal is not hardwired into the system (or the current system information is incorrect) the terminal type derived from the \fI/etc/ttys\fR file or the \fBTERM\fR environmental variable is often something generic like \fBnetwork\fR, \fBdialup\fR, or \fBunknown\fR. -When \fBtset\fR is used in a startup script it is often desirable to +When \fB@TSET@\fR is used in a startup script it is often desirable to provide information about the type of terminal used on such ports. .PP The purpose of the \fB\-m\fR option is to map from some set of conditions to a terminal type, that is, to -tell \fBtset\fR +tell \fB@TSET@\fR ``If I'm on this port at a particular speed, guess that I'm on that kind of terminal''. .PP @@ -208,20 +208,20 @@ entire \fB\-m\fR option argument be placed within single quote characters, and that \fBcsh\fR users insert a backslash character (``\e'') before any exclamation marks (``!''). .SH HISTORY -The \fBtset\fR command appeared in BSD 3.0. The \fBncurses\fR implementation +The \fB@TSET@\fR command appeared in BSD 3.0. The \fBncurses\fR implementation was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric S. Raymond . .SH COMPATIBILITY -The \fBtset\fR utility has been provided for backward-compatibility with BSD +The \fB@TSET@\fR utility has been provided for backward-compatibility with BSD environments (under most modern UNIXes, \fB/etc/inittab\fR and \fIgetty\fR(1) can set \fBTERM\fR appropriately for each dial-up line; this obviates what was -\fBtset\fR's most important use). This implementation behaves like 4.4BSD +\fB@TSET@\fR's most important use). This implementation behaves like 4.4BSD tset, with a few exceptions specified here. .PP The \fB\-S\fR option of BSD tset no longer works; it prints an error message to stderr and dies. The \fB\-s\fR option only sets \fBTERM\fR, not \fBTERMCAP\fP. Both these changes are because the \fBTERMCAP\fR variable is no longer supported under -terminfo-based \fBncurses\fR, which makes \fBtset \-S\fR useless (we made it die +terminfo-based \fBncurses\fR, which makes \fB@TSET@ \-S\fR useless (we made it die noisily rather than silently induce lossage). .PP There was an undocumented 4.4BSD feature that invoking tset via a link named @@ -229,7 +229,7 @@ There was an undocumented 4.4BSD feature that invoking tset via a link named terminal to use upper-case only. This feature has been omitted. .PP The \fB\-A\fR, \fB\-E\fR, \fB\-h\fR, \fB\-u\fR and \fB\-v\fR -options were deleted from the \fBtset\fR +options were deleted from the \fB@TSET@\fR utility in 4.4BSD. None of them were documented in 4.3BSD and all are of limited utility at best. @@ -244,14 +244,14 @@ It is still permissible to specify the \fB\-e\fR, \fB\-i\fR, and \fB\-k\fR optio arguments, although it is strongly recommended that such usage be fixed to explicitly specify the character. .PP -As of 4.4BSD, executing \fBtset\fR as \fBreset\fR no longer implies the \fB\-Q\fR +As of 4.4BSD, executing \fB@TSET@\fR as \fBreset\fR no longer implies the \fB\-Q\fR option. Also, the interaction between the \- option and the \fIterminal\fR -argument in some historic implementations of \fBtset\fR has been removed. +argument in some historic implementations of \fB@TSET@\fR has been removed. .SH ENVIRONMENT -The \fBtset\fR command uses these environment variables: +The \fB@TSET@\fR command uses these environment variables: .TP 5 SHELL -tells \fBtset\fP whether to initialize \fBTERM\fP using \fBsh\fP or +tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP or \fBcsh\fP syntax. .TP 5 TERM @@ -261,7 +261,7 @@ Each terminal type is distinct, though many are similar. TERMCAP may denote the location of a termcap database. If it is not an absolute pathname, e.g., begins with a `/', -\fBtset\fP removes the variable from the environment before looking +\fB@TSET@\fP removes the variable from the environment before looking for the terminal description. .SH FILES .TP 5 diff --git a/misc/terminfo.src b/misc/terminfo.src index 8df0f629..748032b4 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.404 $ -# $Date: 2011/11/13 01:54:10 $ +# $Revision: 1.405 $ +# $Date: 2011/12/17 17:26:46 $ # # 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 @@ -21260,8 +21260,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, ######## CHANGE HISTORY # # The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94. -# Releases 9 and up are maintained by Eric S. Raymond as part of the ncurses -# project. +# Releases 9 and 10 (up until the release of ncurses 4.2 in 1998) were +# maintained by Eric S. Raymond as part of the ncurses project. # # This file contains all the capability information present in John Kunze's # last version of the termcap master file, except as noted in the change @@ -21361,7 +21361,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * Replaced HP entries up to hpsub with purpose-built ones. # * Blank rmir/smir/rmdc/smdc capabilities removed. # * Small fixes merged in from SCO entries for lpr, fos, tvi910+, tvi924. -# 9.4.8 (Fri Apr 7 09:36:34 EDT 199): +# 9.4.8 (Fri Apr 7 09:36:34 EDT 1995): # * Replaced the Ann Arbor entries with SCO's, the init strings are # more efficient (but the entries otherwise identical). # * Added dg211 from Shuford archive. @@ -22635,4 +22635,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # 2011-11-12 # * add pccon entries for OpenBSD console (Alexei Malinin) # +# 2011-12-17 +# * corrected old changelog comments -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/mk-1st.awk b/mk-1st.awk index c23066e3..e48584c8 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,4 +1,4 @@ -# $Id: mk-1st.awk,v 1.86 2011/07/02 18:04:15 tom Exp $ +# $Id: mk-1st.awk,v 1.87 2011/12/17 20:27:27 tom Exp $ ############################################################################## # Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # # # @@ -38,6 +38,7 @@ # prefix (e.g., "lib", for Unix-style libraries) # suffix (e.g., "_g.a", for debug libraries) # subset ("none", "base", "base+ext_funcs" or "termlib", etc.) +# driver ("yes" or "no", depends on --enable-term-driver) # ShlibVer ("rel", "abi" or "auto", to augment DoLinks variable) # ShlibVerInfix ("yes" or "no", determines location of version #) # SymLink ("ln -s", etc) @@ -181,6 +182,11 @@ function shlib_build(directory) { dst_libs = sprintf("%s/%s", directory, end_name); printf "%s : \\\n", dst_libs printf "\t\t%s \\\n", directory + if (subset == "ticlib" && driver == "yes" ) { + base = name; + sub(/^tic/, "ncurses", base); # workaround for "w" + printf "\t\t%s/%s \\\n", directory, end_name_of(base); + } if (subset ~ /^base/ || subset == "ticlib" ) { save_suffix = suffix sub(/^[^.]\./,".",suffix) @@ -242,6 +248,7 @@ BEGIN { printf "# prefix: %s\n", prefix printf "# suffix: %s\n", suffix printf "# subset: %s\n", subset + printf "# driver: %s\n", driver printf "# ShlibVer: %s\n", ShlibVer printf "# ShlibVerInfix: %s\n", ShlibVerInfix printf "# SymLink: %s\n", SymLink diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c index 7ee9e794..4564956b 100644 --- a/ncurses/base/lib_getch.c +++ b/ncurses/base/lib_getch.c @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: lib_getch.c,v 1.122 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: lib_getch.c,v 1.123 2011/12/17 18:50:11 tom Exp $") #include @@ -133,7 +133,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl)) int rc; #ifdef USE_TERM_DRIVER - rc = TCBOf(sp)->drv->testmouse(TCBOf(sp), delay); + rc = TCBOf(sp)->drv->testmouse(TCBOf(sp), delay EVENTLIST_2nd(evl)); #else #if USE_SYSMOUSE if ((sp->_mouse_type == M_SYSMOUSE) diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 2dcc7254..ff7a5463 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.490 2011/11/19 21:56:10 tom Exp $ + * $Id: curses.priv.h,v 1.491 2011/12/17 18:52:21 tom Exp $ * * curses.priv.h * @@ -2148,7 +2148,7 @@ typedef struct term_driver { void (*initcolor)(struct DriverTCB*, int, int, int, int); void (*docolor)(struct DriverTCB*, int, int, int, int(*)(SCREEN*, int)); void (*initmouse)(struct DriverTCB*); - int (*testmouse)(struct DriverTCB*, int); + int (*testmouse)(struct DriverTCB*, int EVENTLIST_2nd(_nc_eventlist*)); void (*setfilter)(struct DriverTCB*); void (*hwlabel)(struct DriverTCB*, int, char*); void (*hwlabelOnOff)(struct DriverTCB*, int); diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c index 4e4a8aac..0cf68764 100644 --- a/ncurses/tinfo/db_iterator.c +++ b/ncurses/tinfo/db_iterator.c @@ -43,7 +43,7 @@ #include #endif -MODULE_ID("$Id: db_iterator.c,v 1.24 2011/12/10 19:48:07 tom Exp $") +MODULE_ID("$Id: db_iterator.c,v 1.25 2011/12/17 21:30:20 tom Exp $") #define HaveTicDirectory _nc_globals.have_tic_directory #define KeepTicDirectory _nc_globals.keep_tic_directory @@ -331,7 +331,7 @@ _nc_first_db(DBDIRS * state, int *offset) for (j = 0; my_list[j] != 0; ++j) { #ifdef TERMINFO if (*my_list[j] == '\0') - my_list[j] = TERMINFO; + my_list[j] = strdup(TERMINFO); #endif for (k = 0; k < j; ++k) { if (!strcmp(my_list[j], my_list[k])) { diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c index e97eff6f..6bca8ac8 100644 --- a/ncurses/tinfo/tinfo_driver.c +++ b/ncurses/tinfo/tinfo_driver.c @@ -50,7 +50,7 @@ # endif #endif -MODULE_ID("$Id: tinfo_driver.c,v 1.16 2011/10/22 17:50:33 tom Exp $") +MODULE_ID("$Id: tinfo_driver.c,v 1.17 2011/12/17 20:40:33 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -839,7 +839,9 @@ drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB) } static int -drv_testmouse(TERMINAL_CONTROL_BLOCK * TCB, int delay) +drv_testmouse(TERMINAL_CONTROL_BLOCK * TCB, + int delay + EVENTLIST_2nd(_nc_eventlist * evl)) { int rc = 0; SCREEN *sp; diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c index 7a8e6a9e..7aefe9dc 100644 --- a/ncurses/trace/lib_trace.c +++ b/ncurses/trace/lib_trace.c @@ -47,7 +47,7 @@ #include -MODULE_ID("$Id: lib_trace.c,v 1.77 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: lib_trace.c,v 1.78 2011/12/17 18:41:48 tom Exp $") NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ @@ -185,9 +185,9 @@ _nc_va_tracef(const char *fmt, va_list ap) if ((pthread_self)) # endif #ifdef __MINGW32__ - fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self().p); + fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self().p); #else - fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self()); + fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self()); #endif #endif if (before || after) { diff --git a/progs/infocmp.c b/progs/infocmp.c index 8d2cabee..7b52dded 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.108 2011/08/06 16:36:06 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.110 2011/12/17 23:59:50 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -1251,6 +1251,23 @@ terminal_env(void) return terminal; } +/* + * Show the databases that infocmp knows about. The location to which it writes is + */ +static void +show_databases(void) +{ + DBDIRS state; + int offset; + const char *path2; + + _nc_first_db(&state, &offset); + while ((path2 = _nc_next_db(&state, &offset)) != 0) { + printf("%s\n", path2); + } + _nc_last_db(); +} + /*************************************************************************** * * Main sequence @@ -1302,7 +1319,7 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, - "01A:aB:CcdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) { + "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) { switch (c) { case '0': mwidth = 65535; @@ -1337,6 +1354,11 @@ main(int argc, char *argv[]) sortmode = S_TERMCAP; break; + case 'D': + show_databases(); + ExitProgram(EXIT_SUCCESS); + break; + case 'c': compare = C_COMMON; break;