From 5242fccf157e715ed878455a3efea6c82b840eb5 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 4 Feb 2007 01:44:56 +0000 Subject: [PATCH] ncurses 5.6 - patch 20070203 + modify fix_wchnstr() in form library to strip attributes (and color) from the cchar_t array (field cells) read from a field's window. Otherwise, when copying the field cells back to the window, the associated color overrides the field's background color (report by Ricardo Cantu). + improve tracing for form library, showing created forms, fields, etc. + ignore --enable-rpath configure option if --with-shared was omitted. + add _nc_leaks_tinfo(), _nc_free_tic(), _nc_free_tinfo() entrypoints to allow leak-checking when both tic- and tinfo-libraries are built. + drop CF_CPP_VSCAN_FUNC macro from configure script, since C++ binding no longer relies on it. + disallow combining configure script options --with-ticlib and --enable-termcap (report by Rong-En Fan). + remove tack from ncurses tree. --- Ada95/gen/Makefile.in | 4 +- MANIFEST | 27 - NEWS | 18 +- TO-DO | 23 +- aclocal.m4 | 80 +- configure | 2230 ++++++------ configure.in | 17 +- dist.mk | 4 +- form/fld_def.c | 5 +- form/fld_dup.c | 5 +- form/fld_ftlink.c | 5 +- form/fld_link.c | 5 +- form/fld_newftyp.c | 5 +- form/frm_def.c | 6 +- form/frm_driver.c | 17 +- form/fty_alnum.c | 14 +- form/fty_alpha.c | 14 +- form/fty_enum.c | 10 +- form/fty_int.c | 10 +- form/fty_num.c | 10 +- form/fty_regex.c | 7 +- include/nc_alloc.h | 7 +- include/ncurses_defs | 8 +- ncurses/base/lib_color.c | 6 +- ncurses/base/lib_freeall.c | 20 +- ncurses/base/lib_newwin.c | 16 +- ncurses/tinfo/comp_parse.c | 9 +- ncurses/tinfo/entries.c | 35 +- ncurses/widechar/lib_in_wchnstr.c | 6 +- progs/infocmp.c | 5 +- progs/progs.priv.h | 9 +- progs/toe.c | 5 +- tack/COPYING | 340 -- tack/HISTORY | 50 - tack/Makefile.in | 214 -- tack/README | 20 - tack/aclocal.m4 | 1694 --------- tack/ansi.c | 854 ----- tack/charset.c | 711 ---- tack/color.c | 769 ---- tack/configure | 5414 ----------------------------- tack/configure.in | 200 -- tack/control.c | 664 ---- tack/crum.c | 426 --- tack/edit.c | 992 ------ tack/fun.c | 925 ----- tack/init.c | 316 -- tack/menu.c | 421 --- tack/modes.c | 913 ----- tack/modules | 50 - tack/ncurses_tst.hin | 56 - tack/output.c | 818 ----- tack/pad.c | 1958 ----------- tack/scan.c | 264 -- tack/sync.c | 436 --- tack/sysdep.c | 504 --- tack/tack.1 | 340 -- tack/tack.c | 603 ---- tack/tack.h | 428 --- test/configure | 608 ++-- test/demo_termcap.c | 5 +- test/dots.c | 5 +- test/railroad.c | 5 +- test/test.priv.h | 8 +- 64 files changed, 1545 insertions(+), 22108 deletions(-) delete mode 100644 tack/COPYING delete mode 100644 tack/HISTORY delete mode 100644 tack/Makefile.in delete mode 100644 tack/README delete mode 100644 tack/aclocal.m4 delete mode 100644 tack/ansi.c delete mode 100644 tack/charset.c delete mode 100644 tack/color.c delete mode 100644 tack/configure delete mode 100644 tack/configure.in delete mode 100644 tack/control.c delete mode 100644 tack/crum.c delete mode 100644 tack/edit.c delete mode 100644 tack/fun.c delete mode 100644 tack/init.c delete mode 100644 tack/menu.c delete mode 100644 tack/modes.c delete mode 100644 tack/modules delete mode 100644 tack/ncurses_tst.hin delete mode 100644 tack/output.c delete mode 100644 tack/pad.c delete mode 100644 tack/scan.c delete mode 100644 tack/sync.c delete mode 100644 tack/sysdep.c delete mode 100644 tack/tack.1 delete mode 100644 tack/tack.c delete mode 100644 tack/tack.h diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 66e939bf..a110d17b 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -28,7 +28,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.52 2007/01/14 00:13:32 tom Exp $ +# $Id: Makefile.in,v 1.53 2007/02/04 00:42:40 tom Exp $ # .SUFFIXES: @@ -71,7 +71,7 @@ ABI_VERSION = @cf_cv_abi_version@ LOCAL_LIBDIR = @top_builddir@/lib LINK = $(HOST_CC) -LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TICS_LEAKS@ @TINFO_ARGS2@ +LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@ RANLIB = @RANLIB@ diff --git a/MANIFEST b/MANIFEST index fd2eff28..d6c18636 100644 --- a/MANIFEST +++ b/MANIFEST @@ -936,33 +936,6 @@ ./progs/toe.c ./progs/tput.c ./progs/tset.c -./tack/COPYING -./tack/HISTORY -./tack/Makefile.in -./tack/README -./tack/aclocal.m4 -./tack/ansi.c -./tack/charset.c -./tack/color.c -./tack/configure -./tack/configure.in -./tack/control.c -./tack/crum.c -./tack/edit.c -./tack/fun.c -./tack/init.c -./tack/menu.c -./tack/modes.c -./tack/modules -./tack/ncurses_tst.hin -./tack/output.c -./tack/pad.c -./tack/scan.c -./tack/sync.c -./tack/sysdep.c -./tack/tack.1 -./tack/tack.c -./tack/tack.h ./tar-copy.sh ./test/Makefile.in ./test/README diff --git a/NEWS b/NEWS index 028fde8d..43259f65 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.1074 2007/01/28 16:55:02 tom Exp $ +-- $Id: NEWS,v 1.1079 2007/02/04 00:30:41 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,22 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20070203 + + modify fix_wchnstr() in form library to strip attributes (and color) + from the cchar_t array (field cells) read from a field's window. + Otherwise, when copying the field cells back to the window, the + associated color overrides the field's background color (report by + Ricardo Cantu). + + improve tracing for form library, showing created forms, fields, etc. + + ignore --enable-rpath configure option if --with-shared was omitted. + + add _nc_leaks_tinfo(), _nc_free_tic(), _nc_free_tinfo() entrypoints + to allow leak-checking when both tic- and tinfo-libraries are built. + + drop CF_CPP_VSCAN_FUNC macro from configure script, since C++ binding + no longer relies on it. + + disallow combining configure script options --with-ticlib and + --enable-termcap (report by Rong-En Fan). + + remove tack from ncurses tree. + 20070128 + fix typo in configure script that broke --with-termlib option (report by Rong-En Fan). diff --git a/TO-DO b/TO-DO index 6834e038..22acd0f1 100644 --- a/TO-DO +++ b/TO-DO @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files (the -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: TO-DO,v 1.48 2006/10/28 19:49:16 tom Exp $ +-- $Id: TO-DO,v 1.49 2007/02/03 16:29:17 tom Exp $ ------------------------------------------------------------------------------- SHORT-TERM TO-DO ITEMS: @@ -58,9 +58,6 @@ Known Problems: + The window classes defined in the c++ subdirectory need documentation. Some C++ programmer could earn a lot of good karma by doing this... -+ The resizeterm() function does not handle ripped-off lines such as that done - for the slk_XXX functions. - + vid_attr() should support the set_a_attributes (sgr1) string, but does not. There appear to be no terminals that require that functionality. @@ -75,19 +72,19 @@ Portability (or lack thereof): ncurses/tty/lib_tstp.c . + In theory, vwprintw and vwscanf are supposed to use the older varargs.h - interface for handling variadic argument lists. Linux doesn't have - varargs.h, it has the newer X/Open-standard stdargs.h equivalent. So these - functions use stdargs instead. This is unlikely to be a problem unless - you're building ncurses on a System V old enough to only have varargs.h. - (Solaris 2.5.1 uses the stdarg.h binding as well). + interface for handling variadic argument lists (and are deprecated by X/Open + for that reason). Linux doesn't have varargs.h, it has the newer + X/Open-standard stdargs.h equivalent. So these functions use stdargs + instead. This is unlikely to be a problem unless you're building ncurses on + a System V old enough to only have varargs.h. (Solaris 2.5.1 used the + stdarg.h binding as well). + If you're using a BSD earlier than 4.4BSD, or a Linux old enough not to have a native vsscanf(3) in its library, vwscanw() will not work. You lose. (It should work on any System V, however). If you want to fix this, add an implementation to ncurses/vsscanf.c. -+ The C++ binding fails to build with a few C++ compilers, mainly with - configure script problems with vsscanf(). ++ The C++ binding fails to build with a few C++ compilers. + terminfo.5 does not format with the SunOS (and most other platform's) tbl utility because it relies on a diversion for each table entry. Get the @@ -106,7 +103,7 @@ LONGER-TERM TO-DO ITEMS: 1. Extended COSE conformance -There is an XPG4 standard recently released which describes a superset +There is an XPG4 standard released in 1996 which describes a superset of the SVr4 API. The library is BASE conformant with this standard. We would like to make ncurses fully conformant at the EXTENDED level supporting internationalization. diff --git a/aclocal.m4 b/aclocal.m4 index a3ba0e11..555f7739 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.415 2007/01/28 16:51:41 tom Exp $ +dnl $Id: aclocal.m4,v 1.416 2007/02/03 16:35:13 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -703,84 +703,6 @@ fi test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_VSCAN_FUNC version: 5 updated: 2001/12/02 01:39:28 -dnl ----------------- -dnl Check if the g++ compiler supports vscan function (not a standard feature). -AC_DEFUN([CF_CPP_VSCAN_FUNC], -[ -if test -n "$CXX"; then - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_CHECK_HEADERS(strstream.h) - -AC_CACHE_CHECK(if $CXX supports vscan function,cf_cv_cpp_vscan_func,[ - for cf_vscan_func in strstream strstream_cast stdio - do - case $cf_vscan_func in #(vi - stdio) cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi - strstream) cf_vscan_defs=USE_STRSTREAM_VSCAN ;; - strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;; - esac - AC_TRY_LINK([ -#include -#include -#define $cf_vscan_defs 1 -#if defined(USE_STDIO_VSCAN) -#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN) -#include -#endif - -int scanw(const char* fmt, ...) -{ - int result = -1; - char buf[BUFSIZ]; - - va_list args; - va_start(args, fmt); -#if defined(USE_STDIO_VSCAN) - if (::vsscanf(buf, fmt, args) != -1) - result = 0; -#elif defined(USE_STRSTREAM_VSCAN) - strstreambuf ss(buf, sizeof(buf)); - if (ss.vscan(fmt, args) != -1) - result = 0; -#elif defined(USE_STRSTREAM_VSCAN_CAST) - strstreambuf ss(buf, sizeof(buf)); - if (ss.vscan(fmt, (_IO_va_list)args) != -1) - result = 0; -#else -#error case $cf_vscan_func failed -#endif - va_end(args); - return result; -} -],[int tmp, foo = scanw("%d", &tmp)], - [cf_cv_cpp_vscan_func=$cf_vscan_func; break], - [cf_cv_cpp_vscan_func=no]) - test "$cf_cv_cpp_vscan_func" != no && break - done -]) - -AC_LANG_RESTORE -fi - -case $cf_cv_cpp_vscan_func in #(vi -stdio) #(vi - AC_DEFINE(CPP_HAS_VSCAN_FUNC) - AC_DEFINE(USE_STDIO_VSCAN) - ;; -strstream) - AC_DEFINE(CPP_HAS_VSCAN_FUNC) - AC_DEFINE(USE_STRSTREAM_VSCAN) - ;; -strstream_cast) - AC_DEFINE(CPP_HAS_VSCAN_FUNC) - AC_DEFINE(USE_STRSTREAM_VSCAN_CAST) - ;; -esac -])dnl -dnl --------------------------------------------------------------------------- dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 dnl ---------- dnl "dirname" is not portable, so we fake it with a shell script. diff --git a/configure b/configure index 0e620fd7..0d20da77 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.389 . +# From configure.in Revision: 1.393 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20061216. # @@ -4828,7 +4828,9 @@ esac echo "$as_me:4828: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 -echo "$as_me:4831: checking if rpath option should be used" >&5 +case $DFT_LWR_MODEL in +shared) +echo "$as_me:4833: checking if rpath option should be used" >&5 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 # Check whether --enable-rpath or --disable-rpath was given. @@ -4838,8 +4840,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_ld_rpath=no fi; -echo "$as_me:4841: result: $cf_cv_ld_rpath" >&5 +echo "$as_me:4843: result: $cf_cv_ld_rpath" >&5 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 + ;; +esac LOCAL_LDFLAGS= LOCAL_LDFLAGS2= @@ -4848,7 +4852,7 @@ echo "${ECHO_T}$cf_cv_ld_rpath" >&6 cf_cv_do_symlinks=no - echo "$as_me:4851: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:4855: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. @@ -4863,7 +4867,7 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; *) - { { echo "$as_me:4866: error: option value must be one of: rel, abi, auto or no" >&5 + { { echo "$as_me:4870: error: option value must be one of: rel, abi, auto or no" >&5 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} { (exit 1); exit 1; }; } ;; @@ -4872,7 +4876,7 @@ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:4875: result: $cf_cv_shlib_version" >&5 + echo "$as_me:4879: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -4881,14 +4885,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 CC_SHARED_OPTS= if test "$GCC" = yes then - echo "$as_me:4884: checking which $CC option to use" >&5 + echo "$as_me:4888: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >conftest.$ac_ext <<_ACEOF -#line 4891 "configure" +#line 4895 "configure" #include "confdefs.h" #include int @@ -4900,16 +4904,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4903: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4907: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4906: \$? = $ac_status" >&5 + echo "$as_me:4910: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4909: \"$ac_try\"") >&5 + { (eval echo "$as_me:4913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4912: \$? = $ac_status" >&5 + echo "$as_me:4916: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -4918,7 +4922,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:4921: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:4925: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -4941,7 +4945,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:4944: checking if ld -search_paths_first works" >&5 + echo "$as_me:4948: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4950,7 +4954,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 4953 "configure" +#line 4957 "configure" #include "confdefs.h" int @@ -4962,16 +4966,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4969: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4968: \$? = $ac_status" >&5 + echo "$as_me:4972: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4971: \"$ac_try\"") >&5 + { (eval echo "$as_me:4975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4974: \$? = $ac_status" >&5 + echo "$as_me:4978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -4982,7 +4986,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:4985: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:4989: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test $cf_cv_ldflags_search_paths_first = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -5178,7 +5182,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; *) - { echo "$as_me:5181: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:5185: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -5186,12 +5190,12 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} esac if test -n "$cf_ld_rpath_opt" ; then - echo "$as_me:5189: checking if we need a space after rpath option" >&5 + echo "$as_me:5193: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="$LIBS ${cf_ld_rpath_opt}$libdir" cat >conftest.$ac_ext <<_ACEOF -#line 5194 "configure" +#line 5198 "configure" #include "confdefs.h" int @@ -5203,16 +5207,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5206: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5210: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5209: \$? = $ac_status" >&5 + echo "$as_me:5213: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5212: \"$ac_try\"") >&5 + { (eval echo "$as_me:5216: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5215: \$? = $ac_status" >&5 + echo "$as_me:5219: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -5222,7 +5226,7 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:5225: result: $cf_rpath_space" >&5 + echo "$as_me:5229: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" @@ -5231,7 +5235,7 @@ echo "${ECHO_T}$cf_rpath_space" >&6 if test "$CC_SHARED_OPTS" = "unknown"; then for model in $cf_list_models; do if test "$model" = "shared"; then - { { echo "$as_me:5234: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:5238: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi @@ -5241,7 +5245,7 @@ fi ############################################################################### ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:5244: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:5248: checking if you wish to install ncurses overwriting curses" >&5 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 # Check whether --enable-overwrite or --disable-overwrite was given. @@ -5251,10 +5255,10 @@ if test "${enable_overwrite+set}" = set; then else if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi fi; -echo "$as_me:5254: result: $with_overwrite" >&5 +echo "$as_me:5258: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:5257: checking if external terminfo-database is used" >&5 +echo "$as_me:5261: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 # Check whether --enable-database or --disable-database was given. @@ -5264,7 +5268,7 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:5267: result: $use_database" >&5 +echo "$as_me:5271: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 case $host_os in #(vi @@ -5286,7 +5290,7 @@ if test "$use_database" != no ; then #define USE_DATABASE 1 EOF - echo "$as_me:5289: checking which terminfo source-file will be installed" >&5 + echo "$as_me:5293: checking which terminfo source-file will be installed" >&5 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 # Check whether --enable-database or --disable-database was given. @@ -5294,10 +5298,10 @@ if test "${enable_database+set}" = set; then enableval="$enable_database" TERMINFO_SRC=$withval fi; - echo "$as_me:5297: result: $TERMINFO_SRC" >&5 + echo "$as_me:5301: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:5300: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:5304: checking whether to use hashed database instead of directory/tree" >&5 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 # Check whether --with-hashed-db or --without-hashed-db was given. @@ -5307,11 +5311,11 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:5310: result: $with_hashed_db" >&5 + echo "$as_me:5314: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 fi -echo "$as_me:5314: checking for list of fallback descriptions" >&5 +echo "$as_me:5318: checking for list of fallback descriptions" >&5 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 # Check whether --with-fallbacks or --without-fallbacks was given. @@ -5321,11 +5325,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:5324: result: $with_fallback" >&5 +echo "$as_me:5328: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` -echo "$as_me:5328: checking if you want modern xterm or antique" >&5 +echo "$as_me:5332: checking if you want modern xterm or antique" >&5 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 # Check whether --with-xterm-new or --without-xterm-new was given. @@ -5339,7 +5343,7 @@ case $with_xterm_new in no) with_xterm_new=xterm-old;; *) with_xterm_new=xterm-new;; esac -echo "$as_me:5342: result: $with_xterm_new" >&5 +echo "$as_me:5346: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new @@ -5349,7 +5353,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:5352: checking for list of terminfo directories" >&5 +echo "$as_me:5356: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. @@ -5389,7 +5393,7 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5392: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:5396: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5402,13 +5406,13 @@ IFS="$ac_save_ifs" eval 'TERMINFO_DIRS="$cf_dst_path"' -echo "$as_me:5405: result: $TERMINFO_DIRS" >&5 +echo "$as_me:5409: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 +echo "$as_me:5415: checking for default terminfo directory" >&5 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. @@ -5443,7 +5447,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5446: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:5450: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5451,7 +5455,7 @@ esac TERMINFO="$withval" -echo "$as_me:5454: result: $TERMINFO" >&5 +echo "$as_me:5458: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:5468: checking if big-core option selected" >&5 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 # Check whether --enable-big-core or --disable-big-core was given. @@ -5473,7 +5477,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 5476 "configure" +#line 5480 "configure" #include "confdefs.h" #include @@ -5487,15 +5491,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5490: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5493: \$? = $ac_status" >&5 + echo "$as_me:5497: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5495: \"$ac_try\"") >&5 + { (eval echo "$as_me:5499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5498: \$? = $ac_status" >&5 + echo "$as_me:5502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -5507,14 +5511,14 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:5510: result: $with_big_core" >&5 +echo "$as_me:5514: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_BIG_CORE 1 EOF ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:5517: checking if you want termcap-fallback support" >&5 +echo "$as_me:5521: checking if you want termcap-fallback support" >&5 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 # Check whether --enable-termcap or --disable-termcap was given. @@ -5524,13 +5528,13 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:5527: result: $with_termcap" >&5 +echo "$as_me:5531: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 if test "$with_termcap" != "yes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - { { echo "$as_me:5533: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:5537: error: You have disabled the database w/o specifying fallbacks" >&5 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} { (exit 1); exit 1; }; } fi @@ -5541,11 +5545,17 @@ EOF else +if test "$with_ticlib" != no ; then + { { echo "$as_me:5549: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 +echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} + { (exit 1); exit 1; }; } +fi + cat >>confdefs.h <<\EOF #define USE_TERMCAP 1 EOF -echo "$as_me:5548: checking for list of termcap files" >&5 +echo "$as_me:5558: checking for list of termcap files" >&5 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 # Check whether --with-termpath or --without-termpath was given. @@ -5585,7 +5595,7 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5588: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:5598: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5598,14 +5608,14 @@ IFS="$ac_save_ifs" eval 'TERMPATH="$cf_dst_path"' -echo "$as_me:5601: result: $TERMPATH" >&5 +echo "$as_me:5611: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <&5 +echo "$as_me:5618: checking if fast termcap-loader is needed" >&5 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 # Check whether --enable-getcap or --disable-getcap was given. @@ -5615,13 +5625,13 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; -echo "$as_me:5618: result: $with_getcap" >&5 +echo "$as_me:5628: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF -echo "$as_me:5624: checking if translated termcaps will be cached in ~/.terminfo" >&5 +echo "$as_me:5634: checking if translated termcaps will be cached in ~/.terminfo" >&5 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. @@ -5631,7 +5641,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; -echo "$as_me:5634: result: $with_getcap_cache" >&5 +echo "$as_me:5644: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF #define USE_GETCAP_CACHE 1 @@ -5640,7 +5650,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:5643: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:5653: checking if ~/.terminfo is wanted" >&5 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. @@ -5650,13 +5660,13 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:5653: result: $with_home_terminfo" >&5 +echo "$as_me:5663: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:5659: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:5669: checking if you want to use restricted environment when running as root" >&5 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 # Check whether --enable-root-environ or --disable-root-environ was given. @@ -5666,7 +5676,7 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:5669: result: $with_root_environ" >&5 +echo "$as_me:5679: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF #define USE_ROOT_ENVIRON 1 @@ -5680,13 +5690,13 @@ for ac_func in \ unlink do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5683: checking for $ac_func" >&5 +echo "$as_me:5693: 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 5689 "configure" +#line 5699 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5717,16 +5727,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5720: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5730: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5723: \$? = $ac_status" >&5 + echo "$as_me:5733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5726: \"$ac_try\"") >&5 + { (eval echo "$as_me:5736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5729: \$? = $ac_status" >&5 + echo "$as_me:5739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5736,7 +5746,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5739: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5749: 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:5766: 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 5762 "configure" +#line 5772 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5790,16 +5800,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5793: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5803: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5796: \$? = $ac_status" >&5 + echo "$as_me:5806: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5799: \"$ac_try\"") >&5 + { (eval echo "$as_me:5809: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5802: \$? = $ac_status" >&5 + echo "$as_me:5812: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5809,7 +5819,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5812: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5822: 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:5833: checking if link/symlink functions work" >&5 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 if test "${cf_cv_link_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5833,7 +5843,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 5836 "configure" +#line 5846 "configure" #include "confdefs.h" #include @@ -5863,15 +5873,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5866: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5869: \$? = $ac_status" >&5 + echo "$as_me:5879: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5871: \"$ac_try\"") >&5 + { (eval echo "$as_me:5881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5874: \$? = $ac_status" >&5 + echo "$as_me:5884: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -5889,7 +5899,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:5892: result: $cf_cv_link_funcs" >&5 +echo "$as_me:5902: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF #define HAVE_LINK 1 @@ -5907,7 +5917,7 @@ with_symlinks=no # soft links (symbolic links) are useful for some systems where hard links do # not work, or to make it simpler to copy terminfo trees around. if test "$ac_cv_func_symlink" = yes ; then - echo "$as_me:5910: checking if tic should use symbolic links" >&5 + echo "$as_me:5920: checking if tic should use symbolic links" >&5 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 # Check whether --enable-symlinks or --disable-symlinks was given. @@ -5917,21 +5927,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:5920: result: $with_symlinks" >&5 + echo "$as_me:5930: result: $with_symlinks" >&5 echo "${ECHO_T}$with_symlinks" >&6 fi # If we have hard links and did not choose to use soft links instead, there is # no reason to make this choice optional - use the hard links. if test "$with_symlinks" = no ; then - echo "$as_me:5927: checking if tic should use hard links" >&5 + echo "$as_me:5937: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 if test "$ac_cv_func_link" = yes ; then with_links=yes else with_links=no fi - echo "$as_me:5934: result: $with_links" >&5 + echo "$as_me:5944: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -5944,7 +5954,7 @@ test "$with_symlinks" = yes && cat >>confdefs.h <<\EOF EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:5947: checking if you want broken-linker support code" >&5 +echo "$as_me:5957: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -5954,7 +5964,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER-no} fi; -echo "$as_me:5957: result: $with_broken_linker" >&5 +echo "$as_me:5967: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -5979,7 +5989,7 @@ EOF fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:5982: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:5992: checking if tputs should process BSD-style prefix padding" >&5 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 # Check whether --enable-bsdpad or --disable-bsdpad was given. @@ -5989,7 +5999,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:5992: result: $with_bsdpad" >&5 +echo "$as_me:6002: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF #define BSD_TPUTS 1 @@ -6006,7 +6016,7 @@ NCURSES_WINT_T=0 # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:6009: checking if $CC -U and -D options work together" >&5 +echo "$as_me:6019: checking if $CC -U and -D options work together" >&5 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 if test "${cf_cv_cc_u_d_options+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6015,7 +6025,7 @@ else cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" cat >conftest.$ac_ext <<_ACEOF -#line 6018 "configure" +#line 6028 "configure" #include "confdefs.h" int @@ -6034,16 +6044,16 @@ make a defined-error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6037: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6047: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6040: \$? = $ac_status" >&5 + echo "$as_me:6050: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6043: \"$ac_try\"") >&5 + { (eval echo "$as_me:6053: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6046: \$? = $ac_status" >&5 + echo "$as_me:6056: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_u_d_options=yes @@ -6057,7 +6067,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:6060: result: $cf_cv_cc_u_d_options" >&5 +echo "$as_me:6070: result: $cf_cv_cc_u_d_options" >&5 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 cf_XOPEN_SOURCE=500 @@ -6083,14 +6093,14 @@ irix[56].*) #(vi ;; linux*|gnu*) #(vi -echo "$as_me:6086: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:6096: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6093 "configure" +#line 6103 "configure" #include "confdefs.h" #include int @@ -6105,16 +6115,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6108: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6111: \$? = $ac_status" >&5 + echo "$as_me:6121: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6114: \"$ac_try\"") >&5 + { (eval echo "$as_me:6124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6117: \$? = $ac_status" >&5 + echo "$as_me:6127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -6123,7 +6133,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 6126 "configure" +#line 6136 "configure" #include "confdefs.h" #include int @@ -6138,16 +6148,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6141: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6151: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6144: \$? = $ac_status" >&5 + echo "$as_me:6154: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6147: \"$ac_try\"") >&5 + { (eval echo "$as_me:6157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6150: \$? = $ac_status" >&5 + echo "$as_me:6160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -6162,7 +6172,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6165: result: $cf_cv_gnu_source" >&5 +echo "$as_me:6175: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -6189,14 +6199,14 @@ solaris*) #(vi CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; *) - echo "$as_me:6192: checking if we should define _XOPEN_SOURCE" >&5 + echo "$as_me:6202: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6199 "configure" +#line 6209 "configure" #include "confdefs.h" #include int @@ -6211,16 +6221,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6214: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6224: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6217: \$? = $ac_status" >&5 + echo "$as_me:6227: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6220: \"$ac_try\"") >&5 + { (eval echo "$as_me:6230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6223: \$? = $ac_status" >&5 + echo "$as_me:6233: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -6229,7 +6239,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 6232 "configure" +#line 6242 "configure" #include "confdefs.h" #include int @@ -6244,16 +6254,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6247: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6257: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6250: \$? = $ac_status" >&5 + echo "$as_me:6260: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6253: \"$ac_try\"") >&5 + { (eval echo "$as_me:6263: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6256: \$? = $ac_status" >&5 + echo "$as_me:6266: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -6268,7 +6278,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6271: result: $cf_cv_xopen_source" >&5 +echo "$as_me:6281: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -6302,16 +6312,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` -echo "$as_me:6305: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:6315: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "(line 6311) testing if the symbol is already defined go no further ..." 1>&5 +echo "(line 6321) testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6314 "configure" +#line 6324 "configure" #include "confdefs.h" #include int @@ -6326,16 +6336,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6332: \$? = $ac_status" >&5 + echo "$as_me:6342: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6335: \"$ac_try\"") >&5 + { (eval echo "$as_me:6345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6338: \$? = $ac_status" >&5 + echo "$as_me:6348: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -6356,7 +6366,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 6359 "configure" +#line 6369 "configure" #include "confdefs.h" #include int @@ -6371,16 +6381,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6374: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6384: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6377: \$? = $ac_status" >&5 + echo "$as_me:6387: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6380: \"$ac_try\"") >&5 + { (eval echo "$as_me:6390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6383: \$? = $ac_status" >&5 + echo "$as_me:6393: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6391,15 +6401,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "(line 6394) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "(line 6404) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "(line 6399) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 6409) testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6402 "configure" +#line 6412 "configure" #include "confdefs.h" #include int @@ -6414,16 +6424,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6417: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6427: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6420: \$? = $ac_status" >&5 + echo "$as_me:6430: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6423: \"$ac_try\"") >&5 + { (eval echo "$as_me:6433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6426: \$? = $ac_status" >&5 + echo "$as_me:6436: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6439,7 +6449,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6442: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:6452: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -6458,14 +6468,14 @@ esac # Work around breakage on OS X -echo "$as_me:6461: checking if SIGWINCH is defined" >&5 +echo "$as_me:6471: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6468 "configure" +#line 6478 "configure" #include "confdefs.h" #include @@ -6480,23 +6490,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6483: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6493: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6486: \$? = $ac_status" >&5 + echo "$as_me:6496: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6489: \"$ac_try\"") >&5 + { (eval echo "$as_me:6499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6492: \$? = $ac_status" >&5 + echo "$as_me:6502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 6499 "configure" +#line 6509 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6514,16 +6524,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6517: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6520: \$? = $ac_status" >&5 + echo "$as_me:6530: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6523: \"$ac_try\"") >&5 + { (eval echo "$as_me:6533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6526: \$? = $ac_status" >&5 + echo "$as_me:6536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -6537,11 +6547,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6540: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:6550: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:6544: checking for actual SIGWINCH definition" >&5 +echo "$as_me:6554: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6552,7 +6562,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 6555 "configure" +#line 6565 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6574,16 +6584,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6577: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6587: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6580: \$? = $ac_status" >&5 + echo "$as_me:6590: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6583: \"$ac_try\"") >&5 + { (eval echo "$as_me:6593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6586: \$? = $ac_status" >&5 + echo "$as_me:6596: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -6597,7 +6607,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:6600: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:6610: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -6607,13 +6617,13 @@ fi # Checks for CODESET support. - echo "$as_me:6610: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:6620: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6616 "configure" +#line 6626 "configure" #include "confdefs.h" #include int @@ -6625,16 +6635,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6628: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6631: \$? = $ac_status" >&5 + echo "$as_me:6641: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6634: \"$ac_try\"") >&5 + { (eval echo "$as_me:6644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6637: \$? = $ac_status" >&5 + echo "$as_me:6647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -6645,7 +6655,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6648: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6658: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -6659,7 +6669,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:6662: checking if you want wide-character code" >&5 +echo "$as_me:6672: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -6669,7 +6679,7 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:6672: result: $with_widec" >&5 +echo "$as_me:6682: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 if test "$with_widec" = yes ; then LIB_SUFFIX="w${LIB_SUFFIX}" @@ -6677,10 +6687,10 @@ if test "$with_widec" = yes ; then #define USE_WIDEC_SUPPORT 1 EOF -echo "$as_me:6680: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:6690: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6683 "configure" +#line 6693 "configure" #include "confdefs.h" #include @@ -6696,16 +6706,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6709: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6702: \$? = $ac_status" >&5 + echo "$as_me:6712: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6705: \"$ac_try\"") >&5 + { (eval echo "$as_me:6715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6708: \$? = $ac_status" >&5 + echo "$as_me:6718: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -6714,16 +6724,16 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:6717: result: $cf_result" >&5 +echo "$as_me:6727: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" elif test "x" != "x" ; then - echo "$as_me:6723: checking checking for compatible value versus " >&5 + echo "$as_me:6733: checking checking for compatible value versus " >&5 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6726 "configure" +#line 6736 "configure" #include "confdefs.h" #include @@ -6739,16 +6749,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6742: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6745: \$? = $ac_status" >&5 + echo "$as_me:6755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6748: \"$ac_try\"") >&5 + { (eval echo "$as_me:6758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6751: \$? = $ac_status" >&5 + echo "$as_me:6761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -6757,7 +6767,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:6760: result: $cf_result" >&5 + echo "$as_me:6770: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -6771,13 +6781,13 @@ fi for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6774: checking for $ac_func" >&5 +echo "$as_me:6784: 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 6780 "configure" +#line 6790 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6808,16 +6818,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6811: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6814: \$? = $ac_status" >&5 + echo "$as_me:6824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6817: \"$ac_try\"") >&5 + { (eval echo "$as_me:6827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6820: \$? = $ac_status" >&5 + echo "$as_me:6830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6827,7 +6837,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6830: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6840: 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:6852: checking for putwc in libutf8" >&5 echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6 if test "${cf_cv_libutf8+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6848,7 +6858,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6851 "configure" +#line 6861 "configure" #include "confdefs.h" #include @@ -6861,16 +6871,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6864: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6874: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6867: \$? = $ac_status" >&5 + echo "$as_me:6877: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6870: \"$ac_try\"") >&5 + { (eval echo "$as_me:6880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6873: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libutf8=yes else @@ -6882,7 +6892,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:6885: result: $cf_cv_libutf8" >&5 +echo "$as_me:6895: result: $cf_cv_libutf8" >&5 echo "${ECHO_T}$cf_cv_libutf8" >&6 if test "$cf_cv_libutf8" = yes ; then @@ -6899,14 +6909,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:6902: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:6912: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6909 "configure" +#line 6919 "configure" #include "confdefs.h" #include @@ -6924,23 +6934,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6930: \$? = $ac_status" >&5 + echo "$as_me:6940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6933: \"$ac_try\"") >&5 + { (eval echo "$as_me:6943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6936: \$? = $ac_status" >&5 + echo "$as_me:6946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 6943 "configure" +#line 6953 "configure" #include "confdefs.h" #include @@ -6959,16 +6969,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6962: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6965: \$? = $ac_status" >&5 + echo "$as_me:6975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6968: \"$ac_try\"") >&5 + { (eval echo "$as_me:6978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6971: \$? = $ac_status" >&5 + echo "$as_me:6981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -6980,7 +6990,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6983: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:6993: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -6997,14 +7007,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:7000: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:7010: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7007 "configure" +#line 7017 "configure" #include "confdefs.h" #include @@ -7022,23 +7032,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7025: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7035: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7028: \$? = $ac_status" >&5 + echo "$as_me:7038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7031: \"$ac_try\"") >&5 + { (eval echo "$as_me:7041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7034: \$? = $ac_status" >&5 + echo "$as_me:7044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 7041 "configure" +#line 7051 "configure" #include "confdefs.h" #include @@ -7057,16 +7067,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7060: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7063: \$? = $ac_status" >&5 + echo "$as_me:7073: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7066: \"$ac_try\"") >&5 + { (eval echo "$as_me:7076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7069: \$? = $ac_status" >&5 + echo "$as_me:7079: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -7078,7 +7088,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7081: result: $cf_cv_wchar_t" >&5 +echo "$as_me:7091: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -7100,14 +7110,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:7103: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:7113: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7110 "configure" +#line 7120 "configure" #include "confdefs.h" #include @@ -7125,23 +7135,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7128: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7131: \$? = $ac_status" >&5 + echo "$as_me:7141: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7134: \"$ac_try\"") >&5 + { (eval echo "$as_me:7144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7137: \$? = $ac_status" >&5 + echo "$as_me:7147: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 7144 "configure" +#line 7154 "configure" #include "confdefs.h" #include @@ -7160,16 +7170,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7163: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7173: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7166: \$? = $ac_status" >&5 + echo "$as_me:7176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7169: \"$ac_try\"") >&5 + { (eval echo "$as_me:7179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7172: \$? = $ac_status" >&5 + echo "$as_me:7182: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -7181,7 +7191,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7184: result: $cf_cv_wint_t" >&5 +echo "$as_me:7194: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -7220,7 +7230,7 @@ case $cf_cv_abi_version in ;; esac -echo "$as_me:7223: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:7233: checking whether to enable _LP64 definition in curses.h" >&5 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 # Check whether --enable-lp64 or --disable-lp64 was given. @@ -7230,7 +7240,7 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$default_with_lp64 fi; -echo "$as_me:7233: result: $with_lp64" >&5 +echo "$as_me:7243: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "$with_lp64" = yes ; then @@ -7246,7 +7256,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:7249: checking for special C compiler options needed for large files" >&5 + echo "$as_me:7259: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7258,7 +7268,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 7261 "configure" +#line 7271 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -7278,16 +7288,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7281: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7284: \$? = $ac_status" >&5 + echo "$as_me:7294: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7287: \"$ac_try\"") >&5 + { (eval echo "$as_me:7297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7290: \$? = $ac_status" >&5 + echo "$as_me:7300: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7297,16 +7307,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:7300: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7310: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7303: \$? = $ac_status" >&5 + echo "$as_me:7313: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7306: \"$ac_try\"") >&5 + { (eval echo "$as_me:7316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7309: \$? = $ac_status" >&5 + echo "$as_me:7319: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -7320,13 +7330,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:7323: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:7333: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:7329: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:7339: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7334,7 +7344,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 7337 "configure" +#line 7347 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -7354,16 +7364,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7357: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7367: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7360: \$? = $ac_status" >&5 + echo "$as_me:7370: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7363: \"$ac_try\"") >&5 + { (eval echo "$as_me:7373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7366: \$? = $ac_status" >&5 + echo "$as_me:7376: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7372,7 +7382,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 7375 "configure" +#line 7385 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -7393,16 +7403,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7396: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7399: \$? = $ac_status" >&5 + echo "$as_me:7409: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7402: \"$ac_try\"") >&5 + { (eval echo "$as_me:7412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7405: \$? = $ac_status" >&5 + echo "$as_me:7415: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -7413,7 +7423,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:7416: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:7426: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -7423,7 +7433,7 @@ EOF fi rm -f conftest* - echo "$as_me:7426: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:7436: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7431,7 +7441,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 7434 "configure" +#line 7444 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -7451,16 +7461,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7454: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7464: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7457: \$? = $ac_status" >&5 + echo "$as_me:7467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7460: \"$ac_try\"") >&5 + { (eval echo "$as_me:7470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7463: \$? = $ac_status" >&5 + echo "$as_me:7473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7469,7 +7479,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 7472 "configure" +#line 7482 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -7490,16 +7500,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7493: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7503: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7496: \$? = $ac_status" >&5 + echo "$as_me:7506: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7499: \"$ac_try\"") >&5 + { (eval echo "$as_me:7509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7502: \$? = $ac_status" >&5 + echo "$as_me:7512: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -7510,7 +7520,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:7513: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:7523: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -7523,7 +7533,7 @@ rm -f conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:7526: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:7536: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7531,7 +7541,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 7534 "configure" +#line 7544 "configure" #include "confdefs.h" #include int @@ -7543,16 +7553,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7546: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7556: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7549: \$? = $ac_status" >&5 + echo "$as_me:7559: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7552: \"$ac_try\"") >&5 + { (eval echo "$as_me:7562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7555: \$? = $ac_status" >&5 + echo "$as_me:7565: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7561,7 +7571,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 7564 "configure" +#line 7574 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -7574,16 +7584,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7577: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7587: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7580: \$? = $ac_status" >&5 + echo "$as_me:7590: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7583: \"$ac_try\"") >&5 + { (eval echo "$as_me:7593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7586: \$? = $ac_status" >&5 + echo "$as_me:7596: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -7594,7 +7604,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:7597: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:7607: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -7608,13 +7618,13 @@ rm -f conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:7611: checking for fseeko" >&5 +echo "$as_me:7621: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7617 "configure" +#line 7627 "configure" #include "confdefs.h" #include int @@ -7626,16 +7636,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7629: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7632: \$? = $ac_status" >&5 + echo "$as_me:7642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7635: \"$ac_try\"") >&5 + { (eval echo "$as_me:7645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7638: \$? = $ac_status" >&5 + echo "$as_me:7648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -7645,7 +7655,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7648: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:7658: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -7665,14 +7675,14 @@ fi test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES " test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " - echo "$as_me:7668: checking whether to use struct dirent64" >&5 + echo "$as_me:7678: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7675 "configure" +#line 7685 "configure" #include "confdefs.h" #include @@ -7693,16 +7703,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7696: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7706: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7699: \$? = $ac_status" >&5 + echo "$as_me:7709: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7702: \"$ac_try\"") >&5 + { (eval echo "$as_me:7712: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7705: \$? = $ac_status" >&5 + echo "$as_me:7715: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -7713,7 +7723,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7716: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:7726: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF #define HAVE_STRUCT_DIRENT64 1 @@ -7722,7 +7732,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:7725: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:7735: checking if you want tparm not to use X/Open fixed-parameter list" >&5 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. @@ -7732,13 +7742,13 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:7735: result: $with_tparm_varargs" >&5 +echo "$as_me:7745: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1 ### use option --with-bool to override bool's type -echo "$as_me:7741: checking for type of bool" >&5 +echo "$as_me:7751: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 # Check whether --with-bool or --without-bool was given. @@ -7748,10 +7758,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:7751: result: $NCURSES_BOOL" >&5 +echo "$as_me:7761: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:7754: checking for alternate terminal capabilities file" >&5 +echo "$as_me:7764: checking for alternate terminal capabilities file" >&5 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 # Check whether --with-caps or --without-caps was given. @@ -7762,11 +7772,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:7765: result: $TERMINFO_CAPS" >&5 +echo "$as_me:7775: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:7769: checking for type of chtype" >&5 +echo "$as_me:7779: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 # Check whether --with-chtype or --without-chtype was given. @@ -7776,11 +7786,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=auto fi; -echo "$as_me:7779: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:7789: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:7783: checking for type of ospeed" >&5 +echo "$as_me:7793: checking for type of ospeed" >&5 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 # Check whether --with-ospeed or --without-ospeed was given. @@ -7790,11 +7800,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:7793: result: $NCURSES_OSPEED" >&5 +echo "$as_me:7803: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:7797: checking for type of mmask_t" >&5 +echo "$as_me:7807: checking for type of mmask_t" >&5 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 # Check whether --with-mmask-t or --without-mmask-t was given. @@ -7804,11 +7814,11 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=auto fi; -echo "$as_me:7807: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:7817: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 ### Enable compiling-in rcs id's -echo "$as_me:7811: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:7821: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -7818,7 +7828,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:7821: result: $with_rcs_ids" >&5 +echo "$as_me:7831: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF #define USE_RCS_IDS 1 @@ -7826,7 +7836,7 @@ EOF ############################################################################### -echo "$as_me:7829: checking format of man-pages" >&5 +echo "$as_me:7839: checking format of man-pages" >&5 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 # Check whether --with-manpage-format or --without-manpage-format was given. @@ -7915,14 +7925,14 @@ unknown) ;; esac -echo "$as_me:7918: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:7928: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:7921: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:7931: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:7925: checking for manpage renaming" >&5 +echo "$as_me:7935: checking for manpage renaming" >&5 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 # Check whether --with-manpage-renames or --without-manpage-renames was given. @@ -7950,7 +7960,7 @@ if test "$MANPAGE_RENAMES" != no ; then if test -f $srcdir/man/$MANPAGE_RENAMES ; then MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES elif test ! -f $MANPAGE_RENAMES ; then - { { echo "$as_me:7953: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:7963: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi @@ -7964,10 +7974,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} fi fi -echo "$as_me:7967: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:7977: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:7970: checking if manpage aliases will be installed" >&5 +echo "$as_me:7980: checking if manpage aliases will be installed" >&5 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. @@ -7978,7 +7988,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:7981: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:7991: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 if test "$LN_S" = "ln -s"; then @@ -7989,7 +7999,7 @@ fi MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:7992: checking if manpage symlinks should be used" >&5 +echo "$as_me:8002: checking if manpage symlinks should be used" >&5 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. @@ -8002,17 +8012,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:8005: WARNING: cannot make symlinks" >&5 + { echo "$as_me:8015: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:8011: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:8021: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:8015: checking for manpage tbl" >&5 +echo "$as_me:8025: checking for manpage tbl" >&5 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. @@ -8023,7 +8033,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:8026: result: $MANPAGE_TBL" >&5 +echo "$as_me:8036: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -8330,7 +8340,7 @@ chmod 755 $cf_edit_man ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:8333: checking if you want to build with function extensions" >&5 +echo "$as_me:8343: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -8340,7 +8350,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:8343: result: $with_ext_funcs" >&5 +echo "$as_me:8353: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -8377,7 +8387,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:8380: checking for extended use of const keyword" >&5 +echo "$as_me:8390: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -8387,14 +8397,14 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:8390: result: $with_ext_const" >&5 +echo "$as_me:8400: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then NCURSES_CONST=const fi -echo "$as_me:8397: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:8407: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -8404,19 +8414,19 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:8407: result: $with_no_padding" >&5 +echo "$as_me:8417: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:8413: checking for ANSI C header files" >&5 +echo "$as_me:8423: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8419 "configure" +#line 8429 "configure" #include "confdefs.h" #include #include @@ -8424,13 +8434,13 @@ else #include _ACEOF -if { (eval echo "$as_me:8427: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8437: \"$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:8433: \$? = $ac_status" >&5 + echo "$as_me:8443: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8452,7 +8462,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 8455 "configure" +#line 8465 "configure" #include "confdefs.h" #include @@ -8470,7 +8480,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 8473 "configure" +#line 8483 "configure" #include "confdefs.h" #include @@ -8491,7 +8501,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 8494 "configure" +#line 8504 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -8517,15 +8527,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8520: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8530: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8523: \$? = $ac_status" >&5 + echo "$as_me:8533: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8525: \"$ac_try\"") >&5 + { (eval echo "$as_me:8535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8528: \$? = $ac_status" >&5 + echo "$as_me:8538: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8538,7 +8548,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:8541: result: $ac_cv_header_stdc" >&5 +echo "$as_me:8551: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -8554,28 +8564,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8557: checking for $ac_header" >&5 +echo "$as_me:8567: 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 8563 "configure" +#line 8573 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8579: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8572: \$? = $ac_status" >&5 + echo "$as_me:8582: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8575: \"$ac_try\"") >&5 + { (eval echo "$as_me:8585: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8578: \$? = $ac_status" >&5 + echo "$as_me:8588: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -8585,7 +8595,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8588: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8598: 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:8608: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8604 "configure" +#line 8614 "configure" #include "confdefs.h" $ac_includes_default int @@ -8616,16 +8626,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8622: \$? = $ac_status" >&5 + echo "$as_me:8632: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8625: \"$ac_try\"") >&5 + { (eval echo "$as_me:8635: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8628: \$? = $ac_status" >&5 + echo "$as_me:8638: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -8635,10 +8645,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8638: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:8648: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:8641: checking size of signed char" >&5 +echo "$as_me:8651: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8647,7 +8657,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 8650 "configure" +#line 8660 "configure" #include "confdefs.h" $ac_includes_default int @@ -8659,21 +8669,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8662: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8672: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8665: \$? = $ac_status" >&5 + echo "$as_me:8675: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8668: \"$ac_try\"") >&5 + { (eval echo "$as_me:8678: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8671: \$? = $ac_status" >&5 + echo "$as_me:8681: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 8676 "configure" +#line 8686 "configure" #include "confdefs.h" $ac_includes_default int @@ -8685,16 +8695,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8688: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8698: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8691: \$? = $ac_status" >&5 + echo "$as_me:8701: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8694: \"$ac_try\"") >&5 + { (eval echo "$as_me:8704: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8697: \$? = $ac_status" >&5 + echo "$as_me:8707: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -8710,7 +8720,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 8713 "configure" +#line 8723 "configure" #include "confdefs.h" $ac_includes_default int @@ -8722,16 +8732,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8725: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8735: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8728: \$? = $ac_status" >&5 + echo "$as_me:8738: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8731: \"$ac_try\"") >&5 + { (eval echo "$as_me:8741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8734: \$? = $ac_status" >&5 + echo "$as_me:8744: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -8747,7 +8757,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 8750 "configure" +#line 8760 "configure" #include "confdefs.h" $ac_includes_default int @@ -8759,16 +8769,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8762: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8772: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8765: \$? = $ac_status" >&5 + echo "$as_me:8775: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8768: \"$ac_try\"") >&5 + { (eval echo "$as_me:8778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8771: \$? = $ac_status" >&5 + echo "$as_me:8781: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -8781,12 +8791,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:8784: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:8794: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 8789 "configure" +#line 8799 "configure" #include "confdefs.h" $ac_includes_default int @@ -8802,15 +8812,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8815: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8808: \$? = $ac_status" >&5 + echo "$as_me:8818: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8810: \"$ac_try\"") >&5 + { (eval echo "$as_me:8820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8813: \$? = $ac_status" >&5 + echo "$as_me:8823: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -8826,7 +8836,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:8829: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:8839: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:8850: checking if you want to use signed Boolean array in term.h" >&5 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -8847,12 +8857,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:8850: result: $with_signed_char" >&5 +echo "$as_me:8860: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "$with_signed_char" != yes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:8855: checking if you want SIGWINCH handler" >&5 +echo "$as_me:8865: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -8862,14 +8872,14 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:8865: result: $with_sigwinch" >&5 +echo "$as_me:8875: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF #define USE_SIGWINCH 1 EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:8872: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:8882: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -8879,7 +8889,7 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:8882: result: $with_tcap_names" >&5 +echo "$as_me:8892: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 @@ -8887,7 +8897,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1 ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:8890: checking if you want all development code" >&5 +echo "$as_me:8900: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -8897,11 +8907,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:8900: result: $with_develop" >&5 +echo "$as_me:8910: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:8904: checking if you want hard-tabs code" >&5 +echo "$as_me:8914: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -8911,14 +8921,14 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:8914: result: $enable_hard_tabs" >&5 +echo "$as_me:8924: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF #define USE_HARD_TABS 1 EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:8921: checking if you want limited support for xmc" >&5 +echo "$as_me:8931: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -8928,7 +8938,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:8931: result: $enable_xmc_glitch" >&5 +echo "$as_me:8941: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF #define USE_XMC_SUPPORT 1 @@ -8937,7 +8947,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:8940: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:8950: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -8947,14 +8957,14 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:8950: result: $with_assumed_color" >&5 +echo "$as_me:8960: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF #define USE_ASSUMED_COLOR 1 EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:8957: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:8967: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -8964,14 +8974,14 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:8967: result: $with_hashmap" >&5 +echo "$as_me:8977: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF #define USE_HASHMAP 1 EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:8974: checking if you want colorfgbg code" >&5 +echo "$as_me:8984: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -8981,14 +8991,14 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:8984: result: $with_colorfgbg" >&5 +echo "$as_me:8994: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF #define USE_COLORFGBG 1 EOF ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:8991: checking if you want to use experimental extended colors" >&5 +echo "$as_me:9001: checking if you want to use experimental extended colors" >&5 echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -8998,12 +9008,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=no fi; -echo "$as_me:9001: result: $with_ext_colors" >&5 +echo "$as_me:9011: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "$with_ext_colors" = yes ; then if test "$with_widec" != yes ; then - { echo "$as_me:9006: WARNING: This option applies only to wide-character library" >&5 + { echo "$as_me:9016: WARNING: This option applies only to wide-character library" >&5 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} else # cannot be ABI 5 since it changes sizeof(cchar_t) @@ -9013,7 +9023,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:9016: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:9026: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -9028,7 +9038,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:9031: checking if you want to use experimental extended mouse encoding" >&5 +echo "$as_me:9041: checking if you want to use experimental extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -9038,7 +9048,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=no fi; -echo "$as_me:9041: result: $with_ext_mouse" >&5 +echo "$as_me:9051: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "$with_ext_mouse" = yes ; then @@ -9049,7 +9059,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:9052: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:9062: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -9057,7 +9067,7 @@ fi fi -echo "$as_me:9060: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:9070: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -9067,7 +9077,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:9070: result: $with_safe_sprintf" >&5 +echo "$as_me:9080: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF #define USE_SAFE_SPRINTF 1 @@ -9076,7 +9086,7 @@ EOF ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:9079: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:9089: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -9086,7 +9096,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:9089: result: $with_scroll_hints" >&5 +echo "$as_me:9099: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF #define USE_SCROLL_HINTS 1 @@ -9094,7 +9104,7 @@ EOF fi -echo "$as_me:9097: checking if you want experimental wgetch-events code" >&5 +echo "$as_me:9107: checking if you want experimental wgetch-events code" >&5 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -9104,7 +9114,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:9107: result: $with_wgetch_events" >&5 +echo "$as_me:9117: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF #define NCURSES_WGETCH_EVENTS 1 @@ -9113,7 +9123,7 @@ EOF ############################################################################### ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:9116: checking if you want to display full commands during build" >&5 +echo "$as_me:9126: checking if you want to display full commands during build" >&5 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -9129,11 +9139,11 @@ else ECHO_LINK='@ echo linking $@ ... ;' test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" fi -echo "$as_me:9132: result: $with_echo" >&5 +echo "$as_me:9142: result: $with_echo" >&5 echo "${ECHO_T}$with_echo" >&6 ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:9136: checking if you want to see compiler warnings" >&5 +echo "$as_me:9146: checking if you want to see compiler warnings" >&5 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -9141,7 +9151,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:9144: result: $with_warnings" >&5 +echo "$as_me:9154: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test -n "$with_warnings"; then @@ -9152,12 +9162,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:9155: checking if this is really Intel C compiler" >&5 + echo "$as_me:9165: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 9160 "configure" +#line 9170 "configure" #include "confdefs.h" int @@ -9174,16 +9184,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9177: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9187: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9180: \$? = $ac_status" >&5 + echo "$as_me:9190: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9183: \"$ac_try\"") >&5 + { (eval echo "$as_me:9193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9186: \$? = $ac_status" >&5 + echo "$as_me:9196: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -9194,14 +9204,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:9197: result: $INTEL_COMPILER" >&5 + echo "$as_me:9207: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:9232: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -9236,12 +9246,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:9239: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:9249: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9242: \$? = $ac_status" >&5 + echo "$as_me:9252: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9244: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9254: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -9250,7 +9260,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:9253: checking for $CC warning options..." >&5 + { echo "$as_me:9263: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" @@ -9270,12 +9280,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9276: \$? = $ac_status" >&5 + echo "$as_me:9286: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9278: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9288: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -9304,12 +9314,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:9307: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:9317: checking if this is really Intel C++ compiler" >&5 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 9312 "configure" +#line 9322 "configure" #include "confdefs.h" int @@ -9326,16 +9336,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9332: \$? = $ac_status" >&5 + echo "$as_me:9342: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9335: \"$ac_try\"") >&5 + { (eval echo "$as_me:9345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9338: \$? = $ac_status" >&5 + echo "$as_me:9348: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -9346,7 +9356,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:9349: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:9359: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -9360,7 +9370,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:9391: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -9395,12 +9405,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:9398: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:9408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9401: \$? = $ac_status" >&5 + echo "$as_me:9411: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9403: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9413: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -9409,7 +9419,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:9412: checking for $CXX warning options..." >&5 + { echo "$as_me:9422: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -9438,16 +9448,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:9441: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9444: \$? = $ac_status" >&5 + echo "$as_me:9454: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9446: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9456: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:9450: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9460: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -9483,10 +9493,10 @@ cat > conftest.i <&5 + { echo "$as_me:9496: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:9537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9530: \$? = $ac_status" >&5 + echo "$as_me:9540: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9532: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:9542: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h fi @@ -9541,7 +9551,7 @@ rm -rf conftest* fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:9544: checking if you want to enable runtime assertions" >&5 +echo "$as_me:9554: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -9551,7 +9561,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:9554: result: $with_assertions" >&5 +echo "$as_me:9564: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -9569,7 +9579,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:9572: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:9582: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -9585,7 +9595,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:9588: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:9598: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -9669,23 +9679,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:9672: checking for dmalloc.h" >&5 + echo "$as_me:9682: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9678 "configure" +#line 9688 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:9682: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9692: \"$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:9688: \$? = $ac_status" >&5 + echo "$as_me:9698: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9704,11 +9714,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9707: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:9717: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test $ac_cv_header_dmalloc_h = yes; then -echo "$as_me:9711: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:9721: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9716,7 +9726,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9719 "configure" +#line 9729 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9735,16 +9745,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9748: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9741: \$? = $ac_status" >&5 + echo "$as_me:9751: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9744: \"$ac_try\"") >&5 + { (eval echo "$as_me:9754: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9747: \$? = $ac_status" >&5 + echo "$as_me:9757: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -9755,7 +9765,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9758: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:9768: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then cat >>confdefs.h <&5 +echo "$as_me:9783: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -9786,7 +9796,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:9789: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:9799: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -9870,23 +9880,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:9873: checking for dbmalloc.h" >&5 + echo "$as_me:9883: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9879 "configure" +#line 9889 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:9883: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9893: \"$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:9889: \$? = $ac_status" >&5 + echo "$as_me:9899: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9905,11 +9915,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9908: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:9918: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test $ac_cv_header_dbmalloc_h = yes; then -echo "$as_me:9912: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:9922: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9917,7 +9927,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9920 "configure" +#line 9930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9936,16 +9946,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9939: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9949: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9942: \$? = $ac_status" >&5 + echo "$as_me:9952: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9945: \"$ac_try\"") >&5 + { (eval echo "$as_me:9955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9948: \$? = $ac_status" >&5 + echo "$as_me:9958: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -9956,7 +9966,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9959: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:9969: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then cat >>confdefs.h <&5 +echo "$as_me:9984: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -9987,7 +9997,7 @@ EOF else with_valgrind= fi; -echo "$as_me:9990: result: ${with_valgrind:-no}" >&5 +echo "$as_me:10000: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -10070,7 +10080,7 @@ fi ;; esac -echo "$as_me:10073: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:10083: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -10080,7 +10090,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:10083: result: $with_no_leaks" >&5 +echo "$as_me:10093: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -10125,7 +10135,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:10128: checking whether to add trace feature to all models" >&5 +echo "$as_me:10138: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -10135,7 +10145,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:10138: result: $cf_with_trace" >&5 +echo "$as_me:10148: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -10216,13 +10226,13 @@ else fi ### Checks for libraries. -echo "$as_me:10219: checking for gettimeofday" >&5 +echo "$as_me:10229: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10225 "configure" +#line 10235 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -10253,16 +10263,16 @@ f = gettimeofday; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10256: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10266: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10259: \$? = $ac_status" >&5 + echo "$as_me:10269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10262: \"$ac_try\"") >&5 + { (eval echo "$as_me:10272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10265: \$? = $ac_status" >&5 + echo "$as_me:10275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -10272,7 +10282,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10275: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:10285: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then cat >>confdefs.h <<\EOF @@ -10281,7 +10291,7 @@ EOF else -echo "$as_me:10284: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:10294: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10289,7 +10299,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10292 "configure" +#line 10302 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10308,16 +10318,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10321: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10314: \$? = $ac_status" >&5 + echo "$as_me:10324: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10317: \"$ac_try\"") >&5 + { (eval echo "$as_me:10327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10320: \$? = $ac_status" >&5 + echo "$as_me:10330: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -10328,7 +10338,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10331: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:10341: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test $ac_cv_lib_bsd_gettimeofday = yes; then cat >>confdefs.h <<\EOF @@ -10340,14 +10350,14 @@ fi fi -echo "$as_me:10343: checking if -lm needed for math functions" >&5 +echo "$as_me:10353: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10350 "configure" +#line 10360 "configure" #include "confdefs.h" #include @@ -10362,16 +10372,16 @@ double x = rand(); printf("result = %g\n", sin(x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10365: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10375: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10368: \$? = $ac_status" >&5 + echo "$as_me:10378: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10371: \"$ac_try\"") >&5 + { (eval echo "$as_me:10381: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10374: \$? = $ac_status" >&5 + echo "$as_me:10384: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -10381,7 +10391,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10384: result: $cf_cv_need_libm" >&5 +echo "$as_me:10394: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -10389,13 +10399,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:10392: checking for ANSI C header files" >&5 +echo "$as_me:10402: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10398 "configure" +#line 10408 "configure" #include "confdefs.h" #include #include @@ -10403,13 +10413,13 @@ else #include _ACEOF -if { (eval echo "$as_me:10406: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10416: \"$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:10412: \$? = $ac_status" >&5 + echo "$as_me:10422: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10431,7 +10441,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 10434 "configure" +#line 10444 "configure" #include "confdefs.h" #include @@ -10449,7 +10459,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 10452 "configure" +#line 10462 "configure" #include "confdefs.h" #include @@ -10470,7 +10480,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 10473 "configure" +#line 10483 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -10496,15 +10506,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10499: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10509: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10502: \$? = $ac_status" >&5 + echo "$as_me:10512: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10504: \"$ac_try\"") >&5 + { (eval echo "$as_me:10514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10507: \$? = $ac_status" >&5 + echo "$as_me:10517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10517,7 +10527,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:10520: result: $ac_cv_header_stdc" >&5 +echo "$as_me:10530: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -10530,13 +10540,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:10533: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:10543: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10539 "configure" +#line 10549 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -10551,16 +10561,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10554: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10564: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10557: \$? = $ac_status" >&5 + echo "$as_me:10567: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10560: \"$ac_try\"") >&5 + { (eval echo "$as_me:10570: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10563: \$? = $ac_status" >&5 + echo "$as_me:10573: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -10570,7 +10580,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10573: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:10583: 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:10596: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10591,7 +10601,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10594 "configure" +#line 10604 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10610,16 +10620,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10613: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10623: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10616: \$? = $ac_status" >&5 + echo "$as_me:10626: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10619: \"$ac_try\"") >&5 + { (eval echo "$as_me:10629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10622: \$? = $ac_status" >&5 + echo "$as_me:10632: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -10630,14 +10640,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10633: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:10643: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:10640: checking for opendir in -lx" >&5 + echo "$as_me:10650: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10645,7 +10655,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10648 "configure" +#line 10658 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10664,16 +10674,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10667: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10677: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10670: \$? = $ac_status" >&5 + echo "$as_me:10680: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10673: \"$ac_try\"") >&5 + { (eval echo "$as_me:10683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10676: \$? = $ac_status" >&5 + echo "$as_me:10686: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -10684,7 +10694,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10687: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:10697: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -10692,13 +10702,13 @@ fi fi -echo "$as_me:10695: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:10705: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10701 "configure" +#line 10711 "configure" #include "confdefs.h" #include #include @@ -10714,16 +10724,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10717: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10720: \$? = $ac_status" >&5 + echo "$as_me:10730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10723: \"$ac_try\"") >&5 + { (eval echo "$as_me:10733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10726: \$? = $ac_status" >&5 + echo "$as_me:10736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -10733,7 +10743,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10736: result: $ac_cv_header_time" >&5 +echo "$as_me:10746: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -10743,14 +10753,14 @@ EOF fi -echo "$as_me:10746: checking for regular-expression headers" >&5 +echo "$as_me:10756: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10753 "configure" +#line 10763 "configure" #include "confdefs.h" #include #include @@ -10768,16 +10778,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10771: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10781: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10774: \$? = $ac_status" >&5 + echo "$as_me:10784: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10777: \"$ac_try\"") >&5 + { (eval echo "$as_me:10787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10780: \$? = $ac_status" >&5 + echo "$as_me:10790: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regex.h" else @@ -10785,7 +10795,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 10788 "configure" +#line 10798 "configure" #include "confdefs.h" #include int @@ -10800,16 +10810,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10803: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10813: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10806: \$? = $ac_status" >&5 + echo "$as_me:10816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10809: \"$ac_try\"") >&5 + { (eval echo "$as_me:10819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10812: \$? = $ac_status" >&5 + echo "$as_me:10822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regexp.h" else @@ -10819,7 +10829,7 @@ cat conftest.$ac_ext >&5 cf_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10822 "configure" +#line 10832 "configure" #include "confdefs.h" #include int @@ -10834,16 +10844,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10837: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10847: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10840: \$? = $ac_status" >&5 + echo "$as_me:10850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10843: \"$ac_try\"") >&5 + { (eval echo "$as_me:10853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10846: \$? = $ac_status" >&5 + echo "$as_me:10856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regexpr.h" else @@ -10859,7 +10869,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10862: result: $cf_cv_regex" >&5 +echo "$as_me:10872: result: $cf_cv_regex" >&5 echo "${ECHO_T}$cf_cv_regex" >&6 case $cf_cv_regex in regex.h) cat >>confdefs.h <<\EOF @@ -10895,23 +10905,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10898: checking for $ac_header" >&5 +echo "$as_me:10908: 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 10904 "configure" +#line 10914 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10908: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10918: \"$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:10914: \$? = $ac_status" >&5 + echo "$as_me:10924: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10930,7 +10940,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:10933: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:10943: 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 < to declare fd_set if test "$ISC" = yes ; then -echo "$as_me:10947: checking for main in -lcposix" >&5 +echo "$as_me:10957: checking for main in -lcposix" >&5 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10952,7 +10962,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10955 "configure" +#line 10965 "configure" #include "confdefs.h" int @@ -10964,16 +10974,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10967: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10977: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10970: \$? = $ac_status" >&5 + echo "$as_me:10980: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10973: \"$ac_try\"") >&5 + { (eval echo "$as_me:10983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10976: \$? = $ac_status" >&5 + echo "$as_me:10986: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -10984,7 +10994,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10987: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:10997: result: $ac_cv_lib_cposix_main" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 if test $ac_cv_lib_cposix_main = yes; then cat >>confdefs.h <&5 + echo "$as_me:11008: checking for bzero in -linet" >&5 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_bzero+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11003,7 +11013,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11006 "configure" +#line 11016 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11022,16 +11032,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11025: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11028: \$? = $ac_status" >&5 + echo "$as_me:11038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11031: \"$ac_try\"") >&5 + { (eval echo "$as_me:11041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11034: \$? = $ac_status" >&5 + echo "$as_me:11044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -11042,21 +11052,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11045: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:11055: result: $ac_cv_lib_inet_bzero" >&5 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 if test $ac_cv_lib_inet_bzero = yes; then LIBS="$LIBS -linet" fi fi -echo "$as_me:11052: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:11062: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11059 "configure" +#line 11069 "configure" #include "confdefs.h" #include @@ -11076,16 +11086,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11089: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11082: \$? = $ac_status" >&5 + echo "$as_me:11092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11085: \"$ac_try\"") >&5 + { (eval echo "$as_me:11095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11088: \$? = $ac_status" >&5 + echo "$as_me:11098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -11097,7 +11107,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11100: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:11110: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF #define HAVE_SYS_TIME_SELECT 1 @@ -11111,7 +11121,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:11114: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:11124: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11119,7 +11129,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 11122 "configure" +#line 11132 "configure" #include "confdefs.h" #include #include @@ -11168,16 +11178,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:11171: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11181: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11174: \$? = $ac_status" >&5 + echo "$as_me:11184: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11177: \"$ac_try\"") >&5 + { (eval echo "$as_me:11187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11180: \$? = $ac_status" >&5 + echo "$as_me:11190: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -11194,21 +11204,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:11197: result: none needed" >&5 + echo "$as_me:11207: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:11200: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:11210: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:11205: checking for an ANSI C-conforming const" >&5 +echo "$as_me:11215: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11211 "configure" +#line 11221 "configure" #include "confdefs.h" int @@ -11266,16 +11276,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11269: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11272: \$? = $ac_status" >&5 + echo "$as_me:11282: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11275: \"$ac_try\"") >&5 + { (eval echo "$as_me:11285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11278: \$? = $ac_status" >&5 + echo "$as_me:11288: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -11285,7 +11295,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11288: result: $ac_cv_c_const" >&5 +echo "$as_me:11298: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -11295,7 +11305,7 @@ EOF fi -echo "$as_me:11298: checking for inline" >&5 +echo "$as_me:11308: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11303,7 +11313,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 11306 "configure" +#line 11316 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -11312,16 +11322,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11315: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11325: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11318: \$? = $ac_status" >&5 + echo "$as_me:11328: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11321: \"$ac_try\"") >&5 + { (eval echo "$as_me:11331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11324: \$? = $ac_status" >&5 + echo "$as_me:11334: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -11332,7 +11342,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:11335: result: $ac_cv_c_inline" >&5 +echo "$as_me:11345: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -11358,7 +11368,7 @@ fi if test $NCURSES_CHTYPE = auto ; then -echo "$as_me:11361: checking for type of chtype" >&5 +echo "$as_me:11371: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11368,7 +11378,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 11371 "configure" +#line 11381 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -11403,15 +11413,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11416: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11409: \$? = $ac_status" >&5 + echo "$as_me:11419: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11411: \"$ac_try\"") >&5 + { (eval echo "$as_me:11421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11414: \$? = $ac_status" >&5 + echo "$as_me:11424: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -11426,7 +11436,7 @@ fi fi -echo "$as_me:11429: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:11439: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:11450: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11447 "configure" +#line 11457 "configure" #include "confdefs.h" int @@ -11456,16 +11466,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11459: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11462: \$? = $ac_status" >&5 + echo "$as_me:11472: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11465: \"$ac_try\"") >&5 + { (eval echo "$as_me:11475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11468: \$? = $ac_status" >&5 + echo "$as_me:11478: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -11477,7 +11487,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11480: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:11490: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -11492,14 +11502,14 @@ fi ### Checks for external-data -echo "$as_me:11495: checking if external errno is declared" >&5 +echo "$as_me:11505: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11502 "configure" +#line 11512 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -11517,16 +11527,16 @@ long x = (long) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11520: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11530: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11523: \$? = $ac_status" >&5 + echo "$as_me:11533: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11526: \"$ac_try\"") >&5 + { (eval echo "$as_me:11536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11529: \$? = $ac_status" >&5 + echo "$as_me:11539: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -11537,7 +11547,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11540: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:11550: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -11552,14 +11562,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:11555: checking if external errno exists" >&5 +echo "$as_me:11565: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11562 "configure" +#line 11572 "configure" #include "confdefs.h" #undef errno @@ -11574,16 +11584,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11577: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11587: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11580: \$? = $ac_status" >&5 + echo "$as_me:11590: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11583: \"$ac_try\"") >&5 + { (eval echo "$as_me:11593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11586: \$? = $ac_status" >&5 + echo "$as_me:11596: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -11594,7 +11604,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11597: result: $cf_cv_have_errno" >&5 +echo "$as_me:11607: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -11607,7 +11617,7 @@ EOF fi -echo "$as_me:11610: checking if data-only library module links" >&5 +echo "$as_me:11620: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11615,20 +11625,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:11631: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11624: \$? = $ac_status" >&5 + echo "$as_me:11634: \$? = $ac_status" >&5 (exit $ac_status); } ; then mv conftest.o data.o && \ ( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:11654: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11647: \$? = $ac_status" >&5 + echo "$as_me:11657: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null @@ -11657,7 +11667,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 11660 "configure" +#line 11670 "configure" #include "confdefs.h" int main() @@ -11668,15 +11678,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11671: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11681: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11674: \$? = $ac_status" >&5 + echo "$as_me:11684: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11676: \"$ac_try\"") >&5 + { (eval echo "$as_me:11686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11679: \$? = $ac_status" >&5 + echo "$as_me:11689: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -11691,7 +11701,7 @@ fi fi -echo "$as_me:11694: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:11704: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -11726,13 +11736,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11729: checking for $ac_func" >&5 +echo "$as_me:11739: 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 11735 "configure" +#line 11745 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -11763,16 +11773,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11766: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11776: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11769: \$? = $ac_status" >&5 + echo "$as_me:11779: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11772: \"$ac_try\"") >&5 + { (eval echo "$as_me:11782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11775: \$? = $ac_status" >&5 + echo "$as_me:11785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -11782,7 +11792,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11785: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:11795: 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:11807: checking for terminal-capability database functions" >&5 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 if test "${cf_cv_cgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11804 "configure" +#line 11814 "configure" #include "confdefs.h" #include @@ -11821,16 +11831,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11824: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11834: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11827: \$? = $ac_status" >&5 + echo "$as_me:11837: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11830: \"$ac_try\"") >&5 + { (eval echo "$as_me:11840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11833: \$? = $ac_status" >&5 + echo "$as_me:11843: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -11842,7 +11852,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11845: result: $cf_cv_cgetent" >&5 +echo "$as_me:11855: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 @@ -11850,14 +11860,14 @@ EOF fi -echo "$as_me:11853: checking for isascii" >&5 +echo "$as_me:11863: checking for isascii" >&5 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 if test "${cf_cv_have_isascii+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11860 "configure" +#line 11870 "configure" #include "confdefs.h" #include int @@ -11869,16 +11879,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11872: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11882: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11875: \$? = $ac_status" >&5 + echo "$as_me:11885: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11878: \"$ac_try\"") >&5 + { (eval echo "$as_me:11888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11881: \$? = $ac_status" >&5 + echo "$as_me:11891: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -11889,17 +11899,17 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11892: result: $cf_cv_have_isascii" >&5 +echo "$as_me:11902: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF #define HAVE_ISASCII 1 EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:11899: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:11909: checking whether sigaction needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 11902 "configure" +#line 11912 "configure" #include "confdefs.h" #include @@ -11913,16 +11923,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11919: \$? = $ac_status" >&5 + echo "$as_me:11929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11922: \"$ac_try\"") >&5 + { (eval echo "$as_me:11932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11925: \$? = $ac_status" >&5 + echo "$as_me:11935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -11930,7 +11940,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 11933 "configure" +#line 11943 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -11945,16 +11955,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11948: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11951: \$? = $ac_status" >&5 + echo "$as_me:11961: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11954: \"$ac_try\"") >&5 + { (eval echo "$as_me:11964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11957: \$? = $ac_status" >&5 + echo "$as_me:11967: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes cat >>confdefs.h <<\EOF @@ -11969,11 +11979,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:11972: result: $sigact_bad" >&5 +echo "$as_me:11982: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:11976: checking if nanosleep really works" >&5 +echo "$as_me:11986: checking if nanosleep really works" >&5 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 if test "${cf_cv_func_nanosleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11983,7 +11993,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 11986 "configure" +#line 11996 "configure" #include "confdefs.h" #include @@ -12008,15 +12018,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12014: \$? = $ac_status" >&5 + echo "$as_me:12024: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12016: \"$ac_try\"") >&5 + { (eval echo "$as_me:12026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12019: \$? = $ac_status" >&5 + echo "$as_me:12029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -12028,7 +12038,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:12031: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:12041: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF @@ -12042,23 +12052,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12045: checking for $ac_header" >&5 +echo "$as_me:12055: 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 12051 "configure" +#line 12061 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12055: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12065: \"$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:12061: \$? = $ac_status" >&5 + echo "$as_me:12071: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12077,7 +12087,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12080: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12090: 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:12105: 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 12101 "configure" +#line 12111 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12105: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12115: \"$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:12111: \$? = $ac_status" >&5 + echo "$as_me:12121: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12127,7 +12137,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12130: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12140: 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:12158: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 12151 "configure" +#line 12161 "configure" #include "confdefs.h" #include int @@ -12160,16 +12170,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12163: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12173: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12166: \$? = $ac_status" >&5 + echo "$as_me:12176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12169: \"$ac_try\"") >&5 + { (eval echo "$as_me:12179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12172: \$? = $ac_status" >&5 + echo "$as_me:12182: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -12177,7 +12187,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 12180 "configure" +#line 12190 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -12191,16 +12201,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12194: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12204: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12197: \$? = $ac_status" >&5 + echo "$as_me:12207: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12200: \"$ac_try\"") >&5 + { (eval echo "$as_me:12210: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12203: \$? = $ac_status" >&5 + echo "$as_me:12213: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -12215,19 +12225,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:12218: result: $termios_bad" >&5 + echo "$as_me:12228: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:12223: checking for tcgetattr" >&5 +echo "$as_me:12233: checking for tcgetattr" >&5 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 if test "${cf_cv_have_tcgetattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12230 "configure" +#line 12240 "configure" #include "confdefs.h" #include @@ -12255,16 +12265,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12258: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12268: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12261: \$? = $ac_status" >&5 + echo "$as_me:12271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12264: \"$ac_try\"") >&5 + { (eval echo "$as_me:12274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12267: \$? = $ac_status" >&5 + echo "$as_me:12277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -12274,20 +12284,20 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12277: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:12287: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:12283: checking for vsscanf function or workaround" >&5 +echo "$as_me:12293: checking for vsscanf function or workaround" >&5 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 if test "${cf_cv_func_vsscanf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12290 "configure" +#line 12300 "configure" #include "confdefs.h" #include @@ -12303,16 +12313,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12309: \$? = $ac_status" >&5 + echo "$as_me:12319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12312: \"$ac_try\"") >&5 + { (eval echo "$as_me:12322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12315: \$? = $ac_status" >&5 + echo "$as_me:12325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -12320,7 +12330,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 12323 "configure" +#line 12333 "configure" #include "confdefs.h" #include @@ -12342,16 +12352,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12345: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12355: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12348: \$? = $ac_status" >&5 + echo "$as_me:12358: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12351: \"$ac_try\"") >&5 + { (eval echo "$as_me:12361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12354: \$? = $ac_status" >&5 + echo "$as_me:12364: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -12359,7 +12369,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 12362 "configure" +#line 12372 "configure" #include "confdefs.h" #include @@ -12381,16 +12391,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12387: \$? = $ac_status" >&5 + echo "$as_me:12397: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12390: \"$ac_try\"") >&5 + { (eval echo "$as_me:12400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12393: \$? = $ac_status" >&5 + echo "$as_me:12403: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -12405,7 +12415,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12408: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:12418: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in #(vi @@ -12423,7 +12433,7 @@ EOF ;; esac -echo "$as_me:12426: checking for working mkstemp" >&5 +echo "$as_me:12436: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12431,13 +12441,13 @@ else rm -f conftest* if test "$cross_compiling" = yes; then - echo "$as_me:12434: checking for mkstemp" >&5 + echo "$as_me:12444: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12440 "configure" +#line 12450 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -12468,16 +12478,16 @@ f = mkstemp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12471: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12481: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12474: \$? = $ac_status" >&5 + echo "$as_me:12484: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12477: \"$ac_try\"") >&5 + { (eval echo "$as_me:12487: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12480: \$? = $ac_status" >&5 + echo "$as_me:12490: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -12487,12 +12497,12 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12490: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:12500: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12495 "configure" +#line 12505 "configure" #include "confdefs.h" #include @@ -12530,15 +12540,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12533: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12543: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12536: \$? = $ac_status" >&5 + echo "$as_me:12546: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12538: \"$ac_try\"") >&5 + { (eval echo "$as_me:12548: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12541: \$? = $ac_status" >&5 + echo "$as_me:12551: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -12553,7 +12563,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:12556: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:12566: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "$cf_cv_func_mkstemp" = yes ; then cat >>confdefs.h <<\EOF @@ -12571,21 +12581,21 @@ else fi if test "$cross_compiling" = yes ; then - { echo "$as_me:12574: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:12584: WARNING: cross compiling: assume setvbuf params not reversed" >&5 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} else - echo "$as_me:12577: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:12587: checking whether setvbuf arguments are reversed" >&5 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:12583: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12593: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 12588 "configure" +#line 12598 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -12602,15 +12612,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12605: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12615: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12608: \$? = $ac_status" >&5 + echo "$as_me:12618: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12610: \"$ac_try\"") >&5 + { (eval echo "$as_me:12620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12613: \$? = $ac_status" >&5 + echo "$as_me:12623: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -12623,7 +12633,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:12626: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:12636: result: $ac_cv_func_setvbuf_reversed" >&5 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then @@ -12634,13 +12644,13 @@ EOF fi fi -echo "$as_me:12637: checking return type of signal handlers" >&5 +echo "$as_me:12647: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12643 "configure" +#line 12653 "configure" #include "confdefs.h" #include #include @@ -12662,16 +12672,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12675: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12668: \$? = $ac_status" >&5 + echo "$as_me:12678: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12671: \"$ac_try\"") >&5 + { (eval echo "$as_me:12681: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12674: \$? = $ac_status" >&5 + echo "$as_me:12684: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -12681,21 +12691,21 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12684: result: $ac_cv_type_signal" >&5 +echo "$as_me:12694: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <&5 +echo "$as_me:12701: checking for type sigaction_t" >&5 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 if test "${cf_cv_type_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12698 "configure" +#line 12708 "configure" #include "confdefs.h" #include @@ -12708,16 +12718,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12711: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12721: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12714: \$? = $ac_status" >&5 + echo "$as_me:12724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12717: \"$ac_try\"") >&5 + { (eval echo "$as_me:12727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12720: \$? = $ac_status" >&5 + echo "$as_me:12730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -12728,13 +12738,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12731: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:12741: 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:12737: checking declaration of size-change" >&5 +echo "$as_me:12747: 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 @@ -12749,7 +12759,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 12752 "configure" +#line 12762 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -12793,16 +12803,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12796: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12799: \$? = $ac_status" >&5 + echo "$as_me:12809: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12802: \"$ac_try\"") >&5 + { (eval echo "$as_me:12812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12805: \$? = $ac_status" >&5 + echo "$as_me:12815: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -12821,7 +12831,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:12824: result: $cf_cv_sizechange" >&5 +echo "$as_me:12834: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then cat >>confdefs.h <<\EOF @@ -12838,13 +12848,13 @@ EOF esac fi -echo "$as_me:12841: checking for memmove" >&5 +echo "$as_me:12851: 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 12847 "configure" +#line 12857 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -12875,16 +12885,16 @@ f = memmove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12878: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12888: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12881: \$? = $ac_status" >&5 + echo "$as_me:12891: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12884: \"$ac_try\"") >&5 + { (eval echo "$as_me:12894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12887: \$? = $ac_status" >&5 + echo "$as_me:12897: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -12894,19 +12904,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12897: result: $ac_cv_func_memmove" >&5 +echo "$as_me:12907: 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:12903: checking for bcopy" >&5 +echo "$as_me:12913: 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 12909 "configure" +#line 12919 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -12937,16 +12947,16 @@ f = bcopy; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12940: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12943: \$? = $ac_status" >&5 + echo "$as_me:12953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12946: \"$ac_try\"") >&5 + { (eval echo "$as_me:12956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12949: \$? = $ac_status" >&5 + echo "$as_me:12959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -12956,11 +12966,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12959: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:12969: 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:12963: checking if bcopy does overlapping moves" >&5 + echo "$as_me:12973: 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 @@ -12970,7 +12980,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 12973 "configure" +#line 12983 "configure" #include "confdefs.h" int main() { @@ -12984,15 +12994,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12987: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12990: \$? = $ac_status" >&5 + echo "$as_me:13000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12992: \"$ac_try\"") >&5 + { (eval echo "$as_me:13002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12995: \$? = $ac_status" >&5 + echo "$as_me:13005: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -13005,7 +13015,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:13008: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:13018: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -13026,7 +13036,7 @@ EOF fi -echo "$as_me:13029: checking if poll really works" >&5 +echo "$as_me:13039: 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 @@ -13036,7 +13046,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 13039 "configure" +#line 13049 "configure" #include "confdefs.h" #include @@ -13057,15 +13067,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13060: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13070: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13063: \$? = $ac_status" >&5 + echo "$as_me:13073: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13065: \"$ac_try\"") >&5 + { (eval echo "$as_me:13075: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13068: \$? = $ac_status" >&5 + echo "$as_me:13078: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -13077,7 +13087,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:13080: result: $cf_cv_working_poll" >&5 +echo "$as_me:13090: 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 @@ -13088,23 +13098,23 @@ if test "$with_hashed_db" != no ; then #define USE_HASHED_DB 1 EOF -echo "$as_me:13091: checking for db.h" >&5 +echo "$as_me:13101: 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 13097 "configure" +#line 13107 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13101: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13111: \"$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:13107: \$? = $ac_status" >&5 + echo "$as_me:13117: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13123,11 +13133,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13126: result: $ac_cv_header_db_h" >&5 +echo "$as_me:13136: 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:13130: checking for version of db" >&5 +echo "$as_me:13140: 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 @@ -13138,10 +13148,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 do -echo "(line 13141) testing checking for db version $cf_db_version ..." 1>&5 +echo "(line 13151) testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 13144 "configure" +#line 13154 "configure" #include "confdefs.h" $ac_includes_default @@ -13171,16 +13181,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13174: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13184: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13177: \$? = $ac_status" >&5 + echo "$as_me:13187: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13180: \"$ac_try\"") >&5 + { (eval echo "$as_me:13190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13183: \$? = $ac_status" >&5 + echo "$as_me:13193: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -13194,16 +13204,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:13197: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:13207: 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:13201: error: Cannot determine version of db" >&5 + { { echo "$as_me:13211: 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:13206: checking for db libraries" >&5 +echo "$as_me:13216: 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 @@ -13217,10 +13227,10 @@ do LIBS="-l$cf_db_libs $LIBS" fi -echo "(line 13220) testing checking for library "$cf_db_libs" ..." 1>&5 +echo "(line 13230) testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 13223 "configure" +#line 13233 "configure" #include "confdefs.h" $ac_includes_default @@ -13275,16 +13285,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13278: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13288: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13281: \$? = $ac_status" >&5 + echo "$as_me:13291: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13284: \"$ac_try\"") >&5 + { (eval echo "$as_me:13294: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13287: \$? = $ac_status" >&5 + echo "$as_me:13297: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -13304,11 +13314,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:13307: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:13317: 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:13311: error: Cannot determine library for db" >&5 + { { echo "$as_me:13321: 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 @@ -13318,7 +13328,7 @@ fi else - { { echo "$as_me:13321: error: Cannot find db.h" >&5 + { { echo "$as_me:13331: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -13333,7 +13343,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:13336: checking if we should include stdbool.h" >&5 +echo "$as_me:13346: 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 @@ -13341,7 +13351,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 13344 "configure" +#line 13354 "configure" #include "confdefs.h" int @@ -13353,23 +13363,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13356: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13366: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13359: \$? = $ac_status" >&5 + echo "$as_me:13369: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13362: \"$ac_try\"") >&5 + { (eval echo "$as_me:13372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13365: \$? = $ac_status" >&5 + echo "$as_me:13375: \$? = $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 13372 "configure" +#line 13382 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -13385,16 +13395,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13388: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13398: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13391: \$? = $ac_status" >&5 + echo "$as_me:13401: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13394: \"$ac_try\"") >&5 + { (eval echo "$as_me:13404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13397: \$? = $ac_status" >&5 + echo "$as_me:13407: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -13408,13 +13418,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:13411: result: yes" >&5 +then echo "$as_me:13421: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:13413: result: no" >&5 +else echo "$as_me:13423: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13417: checking for builtin bool type" >&5 +echo "$as_me:13427: 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 @@ -13422,7 +13432,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 13425 "configure" +#line 13435 "configure" #include "confdefs.h" #include @@ -13437,16 +13447,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13440: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13450: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13443: \$? = $ac_status" >&5 + echo "$as_me:13453: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13446: \"$ac_try\"") >&5 + { (eval echo "$as_me:13456: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13449: \$? = $ac_status" >&5 + echo "$as_me:13459: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -13459,9 +13469,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:13462: result: yes" >&5 +then echo "$as_me:13472: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:13464: result: no" >&5 +else echo "$as_me:13474: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13483,7 +13493,7 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:13486: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:13496: 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 @@ -13492,7 +13502,7 @@ else cf_save="$LIBS" LIBS="$LIBS -l$cf_stdcpp_libname" cat >conftest.$ac_ext <<_ACEOF -#line 13495 "configure" +#line 13505 "configure" #include "confdefs.h" #include @@ -13508,16 +13518,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13511: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13521: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13514: \$? = $ac_status" >&5 + echo "$as_me:13524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13517: \"$ac_try\"") >&5 + { (eval echo "$as_me:13527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13520: \$? = $ac_status" >&5 + echo "$as_me:13530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -13529,12 +13539,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:13532: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:13542: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" fi - echo "$as_me:13537: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:13547: 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 @@ -13550,15 +13560,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:13553: \"$ac_try\"") >&5 +if { (eval echo "$as_me:13563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13556: \$? = $ac_status" >&5 + echo "$as_me:13566: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:13558: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:13568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13561: \$? = $ac_status" >&5 + echo "$as_me:13571: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -13569,10 +13579,10 @@ rm -f conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:13572: result: yes" >&5 + echo "$as_me:13582: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13575: result: no" >&5 + echo "$as_me:13585: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13592,12 +13602,12 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:13595: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:13605: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" LIBS="$LIBS -l$cf_gpp_libname" cat >conftest.$ac_ext <<_ACEOF -#line 13600 "configure" +#line 13610 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -13611,16 +13621,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13614: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13624: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13617: \$? = $ac_status" >&5 + echo "$as_me:13627: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13620: \"$ac_try\"") >&5 + { (eval echo "$as_me:13630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13623: \$? = $ac_status" >&5 + echo "$as_me:13633: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="$CXXLIBS -l$cf_gpp_libname" @@ -13639,7 +13649,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13642 "configure" +#line 13652 "configure" #include "confdefs.h" #include @@ -13653,16 +13663,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13656: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13666: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13659: \$? = $ac_status" >&5 + echo "$as_me:13669: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13662: \"$ac_try\"") >&5 + { (eval echo "$as_me:13672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13665: \$? = $ac_status" >&5 + echo "$as_me:13675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="$CXXLIBS -l$cf_gpp_libname" @@ -13679,7 +13689,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:13682: result: $cf_cxx_library" >&5 + echo "$as_me:13692: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -13695,7 +13705,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:13698: checking how to run the C++ preprocessor" >&5 +echo "$as_me:13708: 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 @@ -13712,18 +13722,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 13715 "configure" +#line 13725 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:13720: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13730: \"$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:13726: \$? = $ac_status" >&5 + echo "$as_me:13736: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -13746,17 +13756,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 13749 "configure" +#line 13759 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13753: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13763: \"$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:13759: \$? = $ac_status" >&5 + echo "$as_me:13769: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -13793,7 +13803,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:13796: result: $CXXCPP" >&5 +echo "$as_me:13806: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -13803,18 +13813,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 13806 "configure" +#line 13816 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:13811: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13821: \"$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:13817: \$? = $ac_status" >&5 + echo "$as_me:13827: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -13837,17 +13847,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 13840 "configure" +#line 13850 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13844: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13854: \"$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:13850: \$? = $ac_status" >&5 + echo "$as_me:13860: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -13875,7 +13885,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:13878: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:13888: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -13890,23 +13900,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:13893: checking for $ac_header" >&5 +echo "$as_me:13903: 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 13899 "configure" +#line 13909 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13903: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13913: \"$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:13909: \$? = $ac_status" >&5 + echo "$as_me:13919: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -13925,7 +13935,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13928: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13938: 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:13948: 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 @@ -13943,7 +13953,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 13946 "configure" +#line 13956 "configure" #include "confdefs.h" int @@ -13955,23 +13965,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13958: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13961: \$? = $ac_status" >&5 + echo "$as_me:13971: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13964: \"$ac_try\"") >&5 + { (eval echo "$as_me:13974: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13967: \$? = $ac_status" >&5 + echo "$as_me:13977: \$? = $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 13974 "configure" +#line 13984 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -13987,16 +13997,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13990: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14000: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13993: \$? = $ac_status" >&5 + echo "$as_me:14003: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13996: \"$ac_try\"") >&5 + { (eval echo "$as_me:14006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13999: \$? = $ac_status" >&5 + echo "$as_me:14009: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -14010,13 +14020,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:14013: result: yes" >&5 +then echo "$as_me:14023: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:14015: result: no" >&5 +else echo "$as_me:14025: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:14019: checking for builtin bool type" >&5 +echo "$as_me:14029: 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 @@ -14024,7 +14034,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 14027 "configure" +#line 14037 "configure" #include "confdefs.h" #include @@ -14039,16 +14049,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14042: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14045: \$? = $ac_status" >&5 + echo "$as_me:14055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14048: \"$ac_try\"") >&5 + { (eval echo "$as_me:14058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14051: \$? = $ac_status" >&5 + echo "$as_me:14061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -14061,13 +14071,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:14064: result: yes" >&5 +then echo "$as_me:14074: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:14066: result: no" >&5 +else echo "$as_me:14076: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:14070: checking for size of bool" >&5 +echo "$as_me:14080: 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 @@ -14078,7 +14088,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14081 "configure" +#line 14091 "configure" #include "confdefs.h" #include @@ -14120,15 +14130,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14133: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14126: \$? = $ac_status" >&5 + echo "$as_me:14136: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14128: \"$ac_try\"") >&5 + { (eval echo "$as_me:14138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14131: \$? = $ac_status" >&5 + echo "$as_me:14141: \$? = $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 @@ -14146,18 +14156,18 @@ fi fi rm -f cf_test.out -echo "$as_me:14149: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:14159: 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:14155: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:14165: 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:14160: checking for special defines needed for etip.h" >&5 +echo "$as_me:14170: 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" @@ -14169,7 +14179,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 14172 "configure" +#line 14182 "configure" #include "confdefs.h" #include @@ -14183,16 +14193,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14186: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14196: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14189: \$? = $ac_status" >&5 + echo "$as_me:14199: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14192: \"$ac_try\"") >&5 + { (eval echo "$as_me:14202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14195: \$? = $ac_status" >&5 + echo "$as_me:14205: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:14226: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:14221: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:14231: 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 @@ -14235,7 +14245,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14238 "configure" +#line 14248 "configure" #include "confdefs.h" class TEST { @@ -14254,15 +14264,15 @@ void main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14257: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14267: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14260: \$? = $ac_status" >&5 + echo "$as_me:14270: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14262: \"$ac_try\"") >&5 + { (eval echo "$as_me:14272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14265: \$? = $ac_status" >&5 + echo "$as_me:14275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -14281,7 +14291,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:14284: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:14294: 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 @@ -14290,7 +14300,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:14293: checking if $CXX accepts static_cast" >&5 +echo "$as_me:14303: 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 @@ -14304,7 +14314,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 14307 "configure" +#line 14317 "configure" #include "confdefs.h" class NCursesPanel @@ -14348,16 +14358,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14351: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14361: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14354: \$? = $ac_status" >&5 + echo "$as_me:14364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14357: \"$ac_try\"") >&5 + { (eval echo "$as_me:14367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14360: \$? = $ac_status" >&5 + echo "$as_me:14370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -14375,7 +14385,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:14378: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:14388: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -14384,189 +14394,6 @@ test "$cf_cv_cpp_static_cast" = yes && cat >>confdefs.h <<\EOF #define CPP_HAS_STATIC_CAST 1 EOF -if test -n "$CXX"; then - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -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 - -for ac_header in strstream.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14399: 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 14405 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:14409: \"$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:14415: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:14434: 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 $ECHO_N "checking if $CXX supports vscan function... $ECHO_C" >&6 -if test "${cf_cv_cpp_vscan_func+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - for cf_vscan_func in strstream strstream_cast stdio - do - case $cf_vscan_func in #(vi - stdio) cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi - strstream) cf_vscan_defs=USE_STRSTREAM_VSCAN ;; - strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;; - esac - cat >conftest.$ac_ext <<_ACEOF -#line 14458 "configure" -#include "confdefs.h" - -#include -#include -#define $cf_vscan_defs 1 -#if defined(USE_STDIO_VSCAN) -#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN) -#include -#endif - -int scanw(const char* fmt, ...) -{ - int result = -1; - char buf[BUFSIZ]; - - va_list args; - va_start(args, fmt); -#if defined(USE_STDIO_VSCAN) - if (::vsscanf(buf, fmt, args) != -1) - result = 0; -#elif defined(USE_STRSTREAM_VSCAN) - strstreambuf ss(buf, sizeof(buf)); - if (ss.vscan(fmt, args) != -1) - result = 0; -#elif defined(USE_STRSTREAM_VSCAN_CAST) - strstreambuf ss(buf, sizeof(buf)); - if (ss.vscan(fmt, (_IO_va_list)args) != -1) - result = 0; -#else -#error case $cf_vscan_func failed -#endif - va_end(args); - return result; -} - -int -main () -{ -int tmp, foo = scanw("%d", &tmp) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14503: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14506: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14509: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14512: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_vscan_func=$cf_vscan_func; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_cpp_vscan_func=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - test "$cf_cv_cpp_vscan_func" != no && break - done - -fi -echo "$as_me:14525: result: $cf_cv_cpp_vscan_func" >&5 -echo "${ECHO_T}$cf_cv_cpp_vscan_func" >&6 - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -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 - -fi - -case $cf_cv_cpp_vscan_func in #(vi -stdio) #(vi - cat >>confdefs.h <<\EOF -#define CPP_HAS_VSCAN_FUNC 1 -EOF - - cat >>confdefs.h <<\EOF -#define USE_STDIO_VSCAN 1 -EOF - - ;; -strstream) - cat >>confdefs.h <<\EOF -#define CPP_HAS_VSCAN_FUNC 1 -EOF - - cat >>confdefs.h <<\EOF -#define USE_STRSTREAM_VSCAN 1 -EOF - - ;; -strstream_cast) - cat >>confdefs.h <<\EOF -#define CPP_HAS_VSCAN_FUNC 1 -EOF - - cat >>confdefs.h <<\EOF -#define USE_STRSTREAM_VSCAN_CAST 1 -EOF - - ;; -esac - CXX_AR='$(AR)' CXX_AR_OPTS='$(AR_OPTS)' case $cf_cv_system_name in #(vi @@ -14606,7 +14433,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:14609: checking for size of bool" >&5 +echo "$as_me:14436: 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 @@ -14617,7 +14444,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14620 "configure" +#line 14447 "configure" #include "confdefs.h" #include @@ -14659,15 +14486,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14662: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14665: \$? = $ac_status" >&5 + echo "$as_me:14492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14667: \"$ac_try\"") >&5 + { (eval echo "$as_me:14494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14670: \$? = $ac_status" >&5 + echo "$as_me:14497: \$? = $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 @@ -14685,25 +14512,25 @@ fi fi rm -f cf_test.out -echo "$as_me:14688: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:14515: 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:14694: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:14521: 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:14700: checking for fallback type of bool" >&5 + echo "$as_me:14527: 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:14706: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:14533: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -14733,7 +14560,7 @@ if test "$cf_with_ada" != "no" ; then 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:14736: checking for $ac_word" >&5 +echo "$as_me:14563: 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 @@ -14748,7 +14575,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:14751: found $ac_dir/$ac_word" >&5 +echo "$as_me:14578: found $ac_dir/$ac_word" >&5 break done @@ -14757,10 +14584,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:14760: result: $gnat_exists" >&5 + echo "$as_me:14587: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:14763: result: no" >&5 + echo "$as_me:14590: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14768,11 +14595,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_ada_make= else -echo "$as_me:14771: checking for gnat version" >&5 +echo "$as_me:14598: 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:14775: result: $cf_gnat_version" >&5 +echo "$as_me:14602: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -14795,7 +14622,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:14798: checking for $ac_word" >&5 +echo "$as_me:14625: 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 @@ -14810,7 +14637,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:14813: found $ac_dir/$ac_word" >&5 +echo "$as_me:14640: found $ac_dir/$ac_word" >&5 break done @@ -14819,10 +14646,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:14822: result: $M4_exists" >&5 + echo "$as_me:14649: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:14825: result: no" >&5 + echo "$as_me:14652: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14831,7 +14658,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:14834: checking if GNAT works" >&5 + echo "$as_me:14661: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -f conftest* @@ -14859,14 +14686,14 @@ else fi rm -f conftest* - echo "$as_me:14862: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:14689: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi if test "$cf_cv_prog_gnat_correct" = yes; then ADAFLAGS="-O3 -gnatpn $ADAFLAGS" - echo "$as_me:14869: checking if GNAT pragma Unreferenced works" >&5 + echo "$as_me:14696: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 rm -f conftest* @@ -14893,7 +14720,7 @@ else fi rm -f conftest* - echo "$as_me:14896: result: $cf_cv_pragma_unreferenced" >&5 + echo "$as_me:14723: 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). @@ -14945,7 +14772,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:14948: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:14775: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -14985,7 +14812,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:14988: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:14815: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -15007,7 +14834,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:15010: checking for library subsets" >&5 +echo "$as_me:14837: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -15030,7 +14857,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base" test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:15033: result: $LIB_SUBSETS" >&5 +echo "$as_me:14860: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -15068,7 +14895,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:15071: checking default library suffix" >&5 +echo "$as_me:14898: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -15079,10 +14906,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:15082: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:14909: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:15085: checking default library-dependency suffix" >&5 +echo "$as_me:14912: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -15111,10 +14938,10 @@ if test $DFT_LWR_MODEL = shared ; then ;; esac fi -echo "$as_me:15114: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:14941: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:15117: checking default object directory" >&5 +echo "$as_me:14944: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -15130,12 +14957,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:15133: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:14960: 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:15138: checking c++ library-dependency suffix" >&5 +echo "$as_me:14965: 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 @@ -15161,7 +14988,7 @@ else esac test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" fi -echo "$as_me:15164: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:14991: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -15172,8 +14999,6 @@ fi TICS_LIST="$SHLIB_LIST" TINFO_LIST="$SHLIB_LIST" -TICS_LEAKS= - if test "$with_ticlib" != no ; then if test "$with_ticlib" != yes ; then @@ -15223,12 +15048,12 @@ fi # needed for Ada95 TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'` -echo "$as_me:15226: checking where we will install curses.h" >&5 +echo "$as_me:15051: 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:15231: result: $includedir" >&5 +echo "$as_me:15056: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -15236,7 +15061,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:15239: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:15064: 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 @@ -15252,7 +15077,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:15255: checking for src modules" >&5 +echo "$as_me:15080: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -15315,7 +15140,7 @@ EOF fi fi done -echo "$as_me:15318: result: $cf_cv_src_modules" >&5 +echo "$as_me:15143: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -15561,7 +15386,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:15564: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:15389: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -15737,7 +15562,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:15740: error: ambiguous option: $1 + { { echo "$as_me:15565: 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;} @@ -15756,7 +15581,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:15759: error: unrecognized option: $1 + -*) { { echo "$as_me:15584: 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;} @@ -15849,7 +15674,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:15852: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:15677: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -16089,7 +15914,6 @@ s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t s,@TICS_ARGS@,$TICS_ARGS,;t t -s,@TICS_LEAKS@,$TICS_LEAKS,;t t s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t @@ -16222,7 +16046,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:16225: creating $ac_file" >&5 + { echo "$as_me:16049: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -16240,7 +16064,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:16243: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16067: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -16253,7 +16077,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16256: error: cannot find input file: $f" >&5 + { { echo "$as_me:16080: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -16319,7 +16143,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:16322: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:16146: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -16330,7 +16154,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:16333: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16157: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -16343,7 +16167,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16346: error: cannot find input file: $f" >&5 + { { echo "$as_me:16170: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -16401,7 +16225,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:16404: $ac_file is unchanged" >&5 + { echo "$as_me:16228: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 93542d23..8016c3ac 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.389 2007/01/21 00:30:30 tom Exp $ +dnl $Id: configure.in,v 1.393 2007/02/03 19:26:12 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.389 $) +AC_REVISION($Revision: 1.393 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -346,12 +346,16 @@ esac AC_SUBST(LD_MODEL)dnl the type of link (e.g., -g or -pg) AC_MSG_RESULT($LD_MODEL) +case $DFT_LWR_MODEL in +shared) AC_MSG_CHECKING(if rpath option should be used) AC_ARG_ENABLE(rpath, [ --enable-rpath use rpath option when generating shared libraries], [cf_cv_ld_rpath=$enableval], [cf_cv_ld_rpath=no]) AC_MSG_RESULT($cf_cv_ld_rpath) + ;; +esac CF_SHARED_OPTS if test "$CC_SHARED_OPTS" = "unknown"; then @@ -497,6 +501,10 @@ if test "$with_termcap" != "yes" ; then AC_DEFINE(PURE_TERMINFO) else +if test "$with_ticlib" != no ; then + AC_ERROR(Options --with-ticlib and --enable-termcap cannot be combined) +fi + AC_DEFINE(USE_TERMCAP) AC_MSG_CHECKING(for list of termcap files) CF_WITH_PATHLIST(termpath, @@ -1217,7 +1225,6 @@ if test -n "$CXX" ; then CF_ETIP_DEFINES CF_CPP_PARAM_INIT CF_CPP_STATIC_CAST - CF_CPP_VSCAN_FUNC CXX_AR='$(AR)' CXX_AR_OPTS='$(AR_OPTS)' @@ -1460,8 +1467,6 @@ fi TICS_LIST="$SHLIB_LIST" TINFO_LIST="$SHLIB_LIST" -TICS_LEAKS= - if test "$with_ticlib" != no ; then if test "$with_ticlib" != yes ; then @@ -1483,8 +1488,6 @@ AC_SUBST(TICS_DEP_SUFFIX) AC_SUBST(TICS_LIB_SUFFIX) AC_SUBST(TICS_ARGS) -AC_SUBST(TICS_LEAKS) - if test "$with_termlib" != no ; then if test "$with_termlib" != yes ; then diff --git a/dist.mk b/dist.mk index d246f883..caeeb537 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.575 2007/01/28 14:27:25 tom Exp $ +# $Id: dist.mk,v 1.576 2007/01/28 17:28:52 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 = 6 -NCURSES_PATCH = 20070128 +NCURSES_PATCH = 20070203 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/form/fld_def.c b/form/fld_def.c index dc023795..2aa14f77 100644 --- a/form/fld_def.c +++ b/form/fld_def.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_def.c,v 1.33 2005/04/16 17:31:17 tom Exp $") +MODULE_ID("$Id: fld_def.c,v 1.34 2007/02/03 23:37:46 tom Exp $") /* this can't be readonly */ static FIELD default_field = @@ -291,6 +291,7 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf) ((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */ (New_Field = (FIELD *)malloc(sizeof(FIELD))) != 0) { + T((T_CREATE("field %p"), New_Field)); *New_Field = default_field; New_Field->rows = rows; New_Field->cols = cols; diff --git a/form/fld_dup.c b/form/fld_dup.c index 2ffcd367..7091bce4 100644 --- a/form/fld_dup.c +++ b/form/fld_dup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_dup.c,v 1.10 2004/12/25 22:24:10 tom Exp $") +MODULE_ID("$Id: fld_dup.c,v 1.11 2007/02/03 23:37:46 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnform @@ -58,6 +58,7 @@ dup_field(FIELD *field, int frow, int fcol) ((err = E_SYSTEM_ERROR) != 0) && /* trick : this resets the default error */ (New_Field = (FIELD *)malloc(sizeof(FIELD)))) { + T((T_CREATE("field %p"), New_Field)); *New_Field = *_nc_Default_Field; New_Field->frow = frow; New_Field->fcol = fcol; diff --git a/form/fld_ftlink.c b/form/fld_ftlink.c index ce6014db..30150661 100644 --- a/form/fld_ftlink.c +++ b/form/fld_ftlink.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_ftlink.c,v 1.11 2004/12/25 22:24:10 tom Exp $") +MODULE_ID("$Id: fld_ftlink.c,v 1.12 2007/02/03 23:37:46 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnform @@ -60,6 +60,7 @@ link_fieldtype(FIELDTYPE *type1, FIELDTYPE *type2) if (nftyp) { + T((T_CREATE("fieldtype %p"), nftyp)); *nftyp = *_nc_Default_FieldType; nftyp->status |= _LINKED_TYPE; if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS)) diff --git a/form/fld_link.c b/form/fld_link.c index f1516640..c0461afa 100644 --- a/form/fld_link.c +++ b/form/fld_link.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_link.c,v 1.9 2004/12/25 22:24:10 tom Exp $") +MODULE_ID("$Id: fld_link.c,v 1.10 2007/02/03 23:37:46 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnform @@ -59,6 +59,7 @@ link_field(FIELD *field, int frow, int fcol) ((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */ (New_Field = (FIELD *)malloc(sizeof(FIELD)))) { + T((T_CREATE("field %p"), New_Field)); *New_Field = *_nc_Default_Field; New_Field->frow = frow; New_Field->fcol = fcol; diff --git a/form/fld_newftyp.c b/form/fld_newftyp.c index 235cd5f5..1ae38d67 100644 --- a/form/fld_newftyp.c +++ b/form/fld_newftyp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_newftyp.c,v 1.13 2004/12/25 22:24:10 tom Exp $") +MODULE_ID("$Id: fld_newftyp.c,v 1.14 2007/02/03 23:37:46 tom Exp $") static FIELDTYPE const default_fieldtype = { @@ -80,6 +80,7 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *), if (nftyp) { + T((T_CREATE("fieldtype %p"), nftyp)); *nftyp = default_fieldtype; nftyp->fcheck = field_check; nftyp->ccheck = char_check; diff --git a/form/frm_def.c b/form/frm_def.c index d15237e9..c0a78554 100644 --- a/form/frm_def.c +++ b/form/frm_def.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_def.c,v 1.20 2006/11/04 16:57:15 tom Exp $") +MODULE_ID("$Id: frm_def.c,v 1.21 2007/02/03 23:37:46 tom Exp $") /* this can't be readonly */ static FORM default_form = @@ -188,6 +188,7 @@ Connect_Fields(FORM *form, FIELD **fields) /* allocate page structures */ if ((pg = (_PAGE *) malloc(page_nr * sizeof(_PAGE))) != (_PAGE *) 0) { + T((T_CREATE("_PAGE %p"), pg)); form->page = pg; } else @@ -295,6 +296,7 @@ new_form(FIELD **fields) T((T_CALLED("new_form(%p)"), fields)); if (form) { + T((T_CREATE("form %p"), form)); *form = *_nc_Default_Form; if ((err = Associate_Fields(form, fields)) != E_OK) { diff --git a/form/frm_driver.c b/form/frm_driver.c index 354bace8..d5509537 100644 --- a/form/frm_driver.c +++ b/form/frm_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_driver.c,v 1.76 2006/11/04 18:45:35 tom Exp $") +MODULE_ID("$Id: frm_driver.c,v 1.78 2007/02/04 00:28:38 tom Exp $") /*---------------------------------------------------------------------------- This is the core module of the form library. It contains the majority @@ -262,7 +262,19 @@ wins_wchnstr(WINDOW *w, cchar_t *s, int n) static int fix_wchnstr(WINDOW *w, cchar_t *s, int n) { + int x; + win_wchnstr(w, s, n); + /* + * This function is used to extract the text only from the window. + * Strip attributes and color from the string so they will not be added + * back when copying the string to the window. + */ + for (x = 0; x < n; ++x) + { + RemAttr(s[x], A_ATTRIBUTES); + SetPair(s[x], 0); + } return n; } @@ -651,6 +663,7 @@ Field_Grown(FIELD *field, int amount) result = TRUE; /* allow sharing of recovery on failure */ + T((T_CREATE("fieldcell %p"), newbuf)); field->buf = newbuf; for (i = 0; i <= field->nbuf; i++) { diff --git a/form/fty_alnum.c b/form/fty_alnum.c index c2d056b7..2408b8cd 100644 --- a/form/fty_alnum.c +++ b/form/fty_alnum.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_alnum.c,v 1.19 2006/04/22 21:33:05 tom Exp $") +MODULE_ID("$Id: fty_alnum.c,v 1.20 2007/02/03 23:37:46 tom Exp $") #define thisARG alnumARG @@ -58,7 +58,10 @@ Make_This_Type(va_list *ap) thisARG *argp = (thisARG *) malloc(sizeof(thisARG)); if (argp) - argp->width = va_arg(*ap, int); + { + T((T_CREATE("thisARG %p"), argp)); + argp->width = va_arg(*ap, int); + } return ((void *)argp); } @@ -78,7 +81,10 @@ Copy_This_Type(const void *argp) thisARG *result = (thisARG *) malloc(sizeof(thisARG)); if (result) - *result = *ap; + { + T((T_CREATE("thisARG %p"), result)); + *result = *ap; + } return ((void *)result); } diff --git a/form/fty_alpha.c b/form/fty_alpha.c index bd7e000e..e9fb6f58 100644 --- a/form/fty_alpha.c +++ b/form/fty_alpha.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_alpha.c,v 1.21 2006/04/22 21:33:05 tom Exp $") +MODULE_ID("$Id: fty_alpha.c,v 1.22 2007/02/03 23:37:46 tom Exp $") #define thisARG alphaARG @@ -58,7 +58,10 @@ Make_This_Type(va_list *ap) thisARG *argp = (thisARG *) malloc(sizeof(thisARG)); if (argp) - argp->width = va_arg(*ap, int); + { + T((T_CREATE("thisARG %p"), argp)); + argp->width = va_arg(*ap, int); + } return ((void *)argp); } @@ -78,7 +81,10 @@ Copy_This_Type(const void *argp) thisARG *result = (thisARG *) malloc(sizeof(thisARG)); if (result) - *result = *ap; + { + T((T_CREATE("thisARG %p"), result)); + *result = *ap; + } return ((void *)result); } diff --git a/form/fty_enum.c b/form/fty_enum.c index 054cc4dc..6c39e9f4 100644 --- a/form/fty_enum.c +++ b/form/fty_enum.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_enum.c,v 1.20 2006/04/22 21:33:05 tom Exp $") +MODULE_ID("$Id: fty_enum.c,v 1.21 2007/02/03 23:37:46 tom Exp $") typedef struct { @@ -64,6 +64,7 @@ Make_Enum_Type(va_list *ap) char **kp = (char **)0; int ccase, cunique; + T((T_CREATE("enumARG %p"), argp)); argp->kwds = va_arg(*ap, char **); ccase = va_arg(*ap, int); cunique = va_arg(*ap, int); @@ -99,7 +100,10 @@ Copy_Enum_Type(const void *argp) result = (enumARG *)malloc(sizeof(enumARG)); if (result) - *result = *ap; + { + T((T_CREATE("enumARG %p"), result)); + *result = *ap; + } } return (void *)result; } diff --git a/form/fty_int.c b/form/fty_int.c index 13fef627..d8ac3d03 100644 --- a/form/fty_int.c +++ b/form/fty_int.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_int.c,v 1.20 2006/04/22 21:33:05 tom Exp $") +MODULE_ID("$Id: fty_int.c,v 1.21 2007/02/03 23:37:46 tom Exp $") #if USE_WIDEC_SUPPORT #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c))) @@ -67,6 +67,7 @@ Make_This_Type(va_list *ap) if (argp) { + T((T_CREATE("thisARG %p"), argp)); argp->precision = va_arg(*ap, int); argp->low = va_arg(*ap, long); argp->high = va_arg(*ap, long); @@ -92,7 +93,10 @@ Copy_This_Type(const void *argp) { result = (thisARG *) malloc(sizeof(thisARG)); if (result) - *result = *ap; + { + T((T_CREATE("thisARG %p"), result)); + *result = *ap; + } } return (void *)result; } diff --git a/form/fty_num.c b/form/fty_num.c index cd09dfb0..d45cb906 100644 --- a/form/fty_num.c +++ b/form/fty_num.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_num.c,v 1.23 2006/04/22 21:33:05 tom Exp $") +MODULE_ID("$Id: fty_num.c,v 1.24 2007/02/03 23:37:46 tom Exp $") #if HAVE_LOCALE_H #include @@ -78,6 +78,7 @@ Make_This_Type(va_list *ap) if (argn) { + T((T_CREATE("thisARG %p"), argn)); argn->precision = va_arg(*ap, int); argn->low = va_arg(*ap, double); argn->high = va_arg(*ap, double); @@ -109,7 +110,10 @@ Copy_This_Type(const void *argp) { result = (thisARG *) malloc(sizeof(thisARG)); if (result) - *result = *ap; + { + T((T_CREATE("thisARG %p"), result)); + *result = *ap; + } } return (void *)result; } diff --git a/form/fty_regex.c b/form/fty_regex.c index 087ff11e..5041ac14 100644 --- a/form/fty_regex.c +++ b/form/fty_regex.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_regex.c,v 1.19 2006/04/22 21:33:05 tom Exp $") +MODULE_ID("$Id: fty_regex.c,v 1.20 2007/02/03 23:37:46 tom Exp $") #if HAVE_REGEX_H_FUNCS /* We prefer POSIX regex */ #include @@ -109,10 +109,12 @@ Make_RegularExpression_Type(va_list *ap) if (preg) { + T((T_CREATE("RegExp_Arg %p"), preg)); if (((preg->pRegExp = (regex_t *) malloc(sizeof(regex_t))) != 0) && !regcomp(preg->pRegExp, rx, (REG_EXTENDED | REG_NOSUB | REG_NEWLINE))) { + T((T_CREATE("regex_t %p"), preg->pRegExp)); preg->refCount = (unsigned long *)malloc(sizeof(unsigned long)); *(preg->refCount) = 1; @@ -136,6 +138,7 @@ Make_RegularExpression_Type(va_list *ap) { int blen = RX_INCREMENT; + T((T_CREATE("RegExp_Arg %p"), pArg)); pArg->compiled_expression = NULL; pArg->refCount = (unsigned long *)malloc(sizeof(unsigned long)); diff --git a/include/nc_alloc.h b/include/nc_alloc.h index c5fcc734..9b5751de 100644 --- a/include/nc_alloc.h +++ b/include/nc_alloc.h @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996,1997 * ****************************************************************************/ -/* $Id: nc_alloc.h,v 1.14 2007/01/21 01:09:07 tom Exp $ */ +/* $Id: nc_alloc.h,v 1.15 2007/02/03 18:40:23 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 @@ -67,6 +67,8 @@ extern "C" { #define HAVE_NC_FREEALL 1 struct termtype; extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN; +extern NCURSES_EXPORT(void) _nc_free_tinfo(int) GCC_NORETURN; +extern NCURSES_EXPORT(void) _nc_free_tic(int) GCC_NORETURN; extern NCURSES_EXPORT(void) _nc_free_tparm(void); extern NCURSES_EXPORT(void) _nc_leaks_dump_entry(void); extern NCURSES_EXPORT(void) _nc_leaks_tic(void); @@ -88,6 +90,9 @@ extern NCURSES_EXPORT(void *) _nc_doalloc(void *, size_t); extern NCURSES_EXPORT(char *) _nc_strdup(const char *); #endif +/* entries.c */ +extern NCURSES_EXPORT(void) _nc_leaks_tinfo(void); + #define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type)) #define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type)) #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type)) diff --git a/include/ncurses_defs b/include/ncurses_defs index bba06615..93f7c302 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.30 2006/08/05 19:27:02 tom Exp $ +# $Id: ncurses_defs,v 1.31 2007/02/03 16:37:17 tom Exp $ ############################################################################## -# Copyright (c) 2000-2005,2006 Free Software Foundation, Inc. # +# Copyright (c) 2000-2006,2007 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -36,7 +36,6 @@ BSD_TPUTS CC_HAS_INLINE_FUNCS CC_HAS_PROTOS CPP_HAS_PARAM_INIT -CPP_HAS_VSCAN_FUNC CURSES_ACS_ARRAY acs_map CURSES_WACS_ARRAY _nc_wacs DECL_ERRNO @@ -192,9 +191,6 @@ USE_RCS_IDS USE_SAFE_SPRINTF USE_SCROLL_HINTS USE_SIGWINCH -USE_STDIO_VSCAN -USE_STRSTREAM_VSCAN -USE_STRSTREAM_VSCAN_CAST USE_SYMLINKS USE_SYSMOUSE USE_TERMCAP diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c index f81a1914..fa257b0a 100644 --- a/ncurses/base/lib_color.c +++ b/ncurses/base/lib_color.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -42,7 +42,7 @@ #include #include -MODULE_ID("$Id: lib_color.c,v 1.82 2006/12/31 00:22:19 tom Exp $") +MODULE_ID("$Id: lib_color.c,v 1.83 2007/02/03 23:10:06 tom Exp $") /* * These should be screen structure members. They need to be globals for @@ -494,7 +494,7 @@ pair_content(short pair, short *f, short *b) if (b) *b = bg; - T(("...pair_content(%d,%d,%d)", pair, fg, bg)); + TR(TRACE_ATTRS, ("...pair_content(%d,%d,%d)", pair, fg, bg)); result = OK; } returnCode(result); diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c index 90b6c1f4..0d8adc6f 100644 --- a/ncurses/base/lib_freeall.c +++ b/ncurses/base/lib_freeall.c @@ -40,7 +40,7 @@ extern int malloc_errfd; /* FIXME */ #endif -MODULE_ID("$Id: lib_freeall.c,v 1.41 2007/01/21 01:09:07 tom Exp $") +MODULE_ID("$Id: lib_freeall.c,v 1.42 2007/02/03 18:44:28 tom Exp $") /* * Free all ncurses data. This is used for testing only (there's no practical @@ -50,12 +50,10 @@ NCURSES_EXPORT(void) _nc_freeall(void) { WINDOWLIST *p, *q; - char *s; static va_list empty_va; T((T_CALLED("_nc_freeall()"))); #if NO_LEAKS - _nc_free_tparm(); if (SP != 0) { if (SP->_oldnum_list != 0) { FreeAndNull(SP->_oldnum_list); @@ -85,28 +83,18 @@ _nc_freeall(void) } delscreen(SP); } -#if NO_LEAKS - _nc_tgetent_leaks(); -#endif del_curterm(cur_term); - _nc_free_entries(_nc_head); - _nc_get_type(0); - _nc_first_name(0); + #if USE_WIDEC_SUPPORT FreeIfNeeded(_nc_wacs); #endif -#if NO_LEAKS - _nc_keyname_leaks(); -#endif - - if ((s = _nc_home_terminfo()) != 0) - free(s); - (void) _nc_printf_string(0, empty_va); #ifdef TRACE (void) _nc_trace_buf(-1, 0); #endif + _nc_leaks_tinfo(); + #if HAVE_LIBDBMALLOC malloc_dump(malloc_errfd); #elif HAVE_LIBDMALLOC diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c index ba516337..19f3ec85 100644 --- a/ncurses/base/lib_newwin.c +++ b/ncurses/base/lib_newwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: lib_newwin.c,v 1.38 2006/10/14 20:31:19 tom Exp $") +MODULE_ID("$Id: lib_newwin.c,v 1.39 2007/02/03 23:09:20 tom Exp $") static WINDOW * remove_window_from_screen(WINDOW *win) @@ -208,22 +208,22 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags) WINDOW *win; bool is_pad = (flags & _ISPAD); - T(("_nc_makenew(%d,%d,%d,%d)", num_lines, num_columns, begy, begx)); + T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx)); if (SP == 0) - return 0; + returnWin(0); if (!dimension_limit(num_lines) || !dimension_limit(num_columns)) - return 0; + returnWin(0); if ((wp = typeCalloc(WINDOWLIST, 1)) == 0) - return 0; + returnWin(0); win = &(wp->win); if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) { free(win); - return 0; + returnWin(0); } win->_curx = 0; @@ -303,5 +303,5 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags) T((T_CREATE("window %p"), win)); - return (win); + returnWin(win); } diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c index 0cb77fd4..f100f14f 100644 --- a/ncurses/tinfo/comp_parse.c +++ b/ncurses/tinfo/comp_parse.c @@ -53,7 +53,7 @@ #include #include -MODULE_ID("$Id: comp_parse.c,v 1.65 2007/01/21 01:10:09 tom Exp $") +MODULE_ID("$Id: comp_parse.c,v 1.66 2007/02/03 18:43:31 tom Exp $") static void sanity_check2(TERMTYPE *, bool); NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2; @@ -475,4 +475,11 @@ _nc_leaks_tic(void) _nc_comp_scan_leaks(); _nc_tic_expand(0, FALSE, 0); } + +NCURSES_EXPORT(void) +_nc_free_tic(int code) +{ + _nc_leaks_tic(); + _nc_free_tinfo(code); +} #endif diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c index 9cf2cdee..cd05a209 100644 --- a/ncurses/tinfo/entries.c +++ b/ncurses/tinfo/entries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2006 Free Software Foundation, Inc. * + * Copyright (c) 2006,2007 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -37,7 +37,7 @@ #include #include -MODULE_ID("$Id: entries.c,v 1.2 2006/12/24 00:58:33 tom Exp $") +MODULE_ID("$Id: entries.c,v 1.3 2007/02/03 18:51:23 tom Exp $") /**************************************************************************** * @@ -107,3 +107,34 @@ _nc_delink_entry(ENTRY * headp, TERMTYPE *tterm) } return ep; } + +NCURSES_EXPORT(void) +_nc_leaks_tinfo(void) +{ + char *s; + + T((T_CALLED("_nc_free_tinfo()"))); +#if NO_LEAKS + _nc_free_tparm(); + _nc_tgetent_leaks(); +#endif + _nc_free_entries(_nc_head); + _nc_get_type(0); + _nc_first_name(0); +#if NO_LEAKS + _nc_keyname_leaks(); +#endif + + if ((s = _nc_home_terminfo()) != 0) + free(s); + returnVoid; +} + +#if NO_LEAKS +NCURSES_EXPORT(void) +_nc_free_tinfo(int code) +{ + _nc_leaks_tinfo(); + exit(code); +} +#endif diff --git a/ncurses/widechar/lib_in_wchnstr.c b/ncurses/widechar/lib_in_wchnstr.c index 41ba18cc..ac0fcbe2 100644 --- a/ncurses/widechar/lib_in_wchnstr.c +++ b/ncurses/widechar/lib_in_wchnstr.c @@ -39,14 +39,14 @@ #include -MODULE_ID("$Id: lib_in_wchnstr.c,v 1.3 2004/05/16 00:12:30 tom Exp $") +MODULE_ID("$Id: lib_in_wchnstr.c,v 1.4 2007/02/03 23:10:20 tom Exp $") NCURSES_EXPORT(int) -win_wchnstr(WINDOW *win, cchar_t * wchstr, int n) +win_wchnstr(WINDOW *win, cchar_t *wchstr, int n) { int code = OK; - TR(TRACE_CALLS, (T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n)); + T((T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n)); if (win != 0 && wchstr != 0) { int row, col; diff --git a/progs/infocmp.c b/progs/infocmp.c index 932063e5..dbaf2377 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.86 2007/01/21 01:09:07 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.87 2007/02/03 19:10:27 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -96,8 +96,7 @@ ExitProgram(int code) while (termcount-- > 0) _nc_free_termtype(&entries[termcount].tterm); _nc_leaks_dump_entry(); - _nc_leaks_tic(); - _nc_free_and_exit(code); + _nc_free_tic(code); } #endif diff --git a/progs/progs.priv.h b/progs/progs.priv.h index eaa4c80f..362c3b38 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -30,7 +30,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.30 2006/11/26 00:28:01 tom Exp $ + * $Id: progs.priv.h,v 1.32 2007/02/03 19:59:02 tom Exp $ * * progs.priv.h * @@ -110,7 +110,12 @@ extern int optind; #include #include #include + #include +#if HAVE_NC_FREEALL +#undef ExitProgram +#define ExitProgram(code) _nc_free_tic(code) +#endif /* usually in */ #ifndef STDOUT_FILENO diff --git a/progs/toe.c b/progs/toe.c index 2e67bd50..9b62d1e3 100644 --- a/progs/toe.c +++ b/progs/toe.c @@ -46,7 +46,7 @@ #include #endif -MODULE_ID("$Id: toe.c,v 1.42 2007/01/21 01:09:07 tom Exp $") +MODULE_ID("$Id: toe.c,v 1.43 2007/02/03 19:10:39 tom Exp $") #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) @@ -60,8 +60,7 @@ ExitProgram(int code) { _nc_free_entries(_nc_head); _nc_leaks_dump_entry(); - _nc_leaks_tic(); - _nc_free_and_exit(code); + _nc_free_tic(code); } #endif diff --git a/tack/COPYING b/tack/COPYING deleted file mode 100644 index b6f92f3d..00000000 --- a/tack/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/tack/HISTORY b/tack/HISTORY deleted file mode 100644 index 9d26753b..00000000 --- a/tack/HISTORY +++ /dev/null @@ -1,50 +0,0 @@ - -Current history: - -2007/01/27 1.03 Update README to tell how to build tack after removal. -2006/11/25 Fixes for ncurses tparm() prototype. -2006/06/24 1.02 Modify to support ncurses extended string capabilities. -2003/10/18 1.01 Fix some logic in pad.c, improve bce test. -2003/09/20 Modified to allow running from compiled-in terminfo. -2001/10/20 Make menu titles agree with descriptions. -2000/03/04 Fix a few spelling errors -1999/09/04 Minor fix to build/link on BeOS -1999/05/16 Minor fix to build/link on CLIX -1999/05/09 Update to build/link on NeXT -1999/04/17 Update to work with ncurses 5.0 beta1 (TERMTYPE struct) -1999/02/07 Build with ncurses 4.2 981219 (renamed function) -1998/01/09 1.00 First release under GPL -1997/12/24 0.02 First version that requires ncurses -1997/10/29 0.01 Second beta release to the ncurses mailing list. -1997/10/06 0.00 First beta release to the ncurses mailing list. - -Ancient history: TACK -- the terminfo action checker - - The purpose of this program is to verify the correctness of -terminfos and to calculate the pads needed for each capability. -This program is not designed to test curses and therefore uses -as little of curses as possible. - - This program was originally called TED. In 1991 it was -released to USENET in comp.sources. TED was originally written to -test both terminfos and termcaps. The original intent was to -create a terminfo editor. This code fell quite short of its goal. -Tests were controlled by command line switches and editing was done -with pen and paper. - - In 1995 Eric S. Raymond got interested in the program and added -a first cut at making the program menu driven. He also converted -the code from K&R C to an ANSI/POSIX-conforming C. He re-christened -the program TAC (Terminfo Action Checker). Eric also wrote a man -page for TAC. - - In 1997 I decided to dust off the code and make it easier to -use by the novice. I totally rewrote the menu system and added -the editing features I originally planned for TED. I also did -a total rewrite of the code that does the timings. In the process -of rewriting the code I changed it to be more tightly coupled -with ncurses. By this time someone had taken the name TAC so -I re-christened the program TACK. - -Daniel Weaver - diff --git a/tack/Makefile.in b/tack/Makefile.in deleted file mode 100644 index 5c44c238..00000000 --- a/tack/Makefile.in +++ /dev/null @@ -1,214 +0,0 @@ -# $Id: Makefile.in,v 1.41 2007/01/14 00:07:45 tom Exp $ -############################################################################## -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # -# # -# Permission is hereby granted, free of charge, to any person obtaining a # -# copy of this software and associated documentation files (the "Software"), # -# to deal in the Software without restriction, including without limitation # -# the rights to use, copy, modify, merge, publish, distribute, distribute # -# with modifications, sublicense, and/or sell copies of the Software, and to # -# permit persons to whom the Software is furnished to do so, subject to the # -# following conditions: # -# # -# The above copyright notice and this permission notice shall be included in # -# all copies or substantial portions of the Software. # -# # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # -# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # -# DEALINGS IN THE SOFTWARE. # -# # -# Except as contained in this notice, the name(s) of the above copyright # -# holders shall not be used in advertising or otherwise to promote the sale, # -# use or other dealings in this Software without prior written # -# authorization. # -############################################################################## -# Makefile for tack -# -# The variable 'srcdir' refers to the source-distribution, and can be set with -# the configure script by "--srcdir=DIR". -# -# The rules are organized to produce the libraries for the configured models, -# and the programs with the configured default model. - -# turn off _all_ suffix rules; we'll generate our own -.SUFFIXES: - -SHELL = /bin/sh -THIS = Makefile - -CF_MFLAGS = @cf_cv_makeflags@ -@SET_MAKE@ - -x = @EXEEXT@ -o = .@OBJEXT@ - -MODEL = ../@DFT_OBJ_SUBDIR@ -DESTDIR = @DESTDIR@ -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -libdir = @libdir@ -mandir = @mandir@ -includedir = @includedir@ -datadir = @datadir@ - -LIBTOOL = @LIBTOOL@ -LIBTOOL_CLEAN = @LIB_CLEAN@ -LIBTOOL_COMPILE = @LIB_COMPILE@ -LIBTOOL_LINK = @LIB_LINK@ -LIBTOOL_INSTALL = @LIB_INSTALL@ -LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ - -INSTALL = @INSTALL@ -INSTALL_PROG = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -AWK = @AWK@ -LN_S = @LN_S@ - -CC = @CC@ -CPP = @CPP@ -CFLAGS = @CFLAGS@ - -INCDIR = $(srcdir)/../include -CPPFLAGS = -DHAVE_CONFIG_H -I../tack -I$(srcdir) @CPPFLAGS@ - -CCFLAGS = $(CPPFLAGS) $(CFLAGS) - -CFLAGS_LIBTOOL = $(CCFLAGS) -CFLAGS_NORMAL = $(CCFLAGS) -CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE -CFLAGS_PROFILE = $(CCFLAGS) -pg -CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ - -CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) - -REL_VERSION = @cf_cv_rel_version@ -ABI_VERSION = @cf_cv_abi_version@ -LOCAL_LIBDIR = @top_builddir@/lib - -LD = @LD@ -LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC) -LDFLAGS = @EXTRA_LDFLAGS@ \ - @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ - -LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL) -LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) -LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) -LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) -LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ - -LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) - -LINT = @LINT@ -LINT_OPTS = @LINT_OPTS@ -LINT_LIBS = -lncurses@LIB_SUFFIX@ @LIBS@ - -PROGS = tack$x - -@NCURSES_TREE@# Default library, for linking applications -@NCURSES_TREE@DEPS_CURSES = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@ - -################################################################################ -all: $(PROGS) - -sources: - -install: install.tack -uninstall: uninstall.tack - -# this line simplifies the configure-script -libs \ -install.libs \ -uninstall.libs: - -EDITARGS = $(DESTDIR)$(mandir) $(srcdir) $(srcdir)/*.[0-9]* - -install.tack: $(PROGS) \ - $(DESTDIR)$(bindir) \ - $(DESTDIR)$(mandir) - $(LIBTOOL_INSTALL) $(INSTALL_PROG) tack$x $(DESTDIR)$(bindir)/tack$x - sh ../edit_man.sh normal installing $(EDITARGS) - -uninstall.tack: - -@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(bindir)/tack$x - -sh ../edit_man.sh normal removing $(EDITARGS) - -$(DESTDIR)$(bindir) \ -$(DESTDIR)$(mandir) : - sh $(srcdir)/../mkinstalldirs $@ - -# -# Rules for building tack -# - -DEPS_TACK = \ - $(MODEL)/ansi$o \ - $(MODEL)/charset$o \ - $(MODEL)/color$o \ - $(MODEL)/control$o \ - $(MODEL)/crum$o \ - $(MODEL)/edit$o \ - $(MODEL)/fun$o \ - $(MODEL)/init$o \ - $(MODEL)/menu$o \ - $(MODEL)/modes$o \ - $(MODEL)/output$o \ - $(MODEL)/pad$o \ - $(MODEL)/scan$o \ - $(MODEL)/sync$o \ - $(MODEL)/sysdep$o \ - $(MODEL)/tack$o - -tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES) - @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@ - -# -# Utility productions start here -# - -tags: - ctags *.[ch] - -@MAKE_UPPER_TAGS@TAGS: -@MAKE_UPPER_TAGS@ etags *.[ch] - -mostlyclean :: - -rm -f core tags TAGS *~ *.bak *.i *.atac trace - -clean :: mostlyclean - -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi" - -rm -f $(DEPS_TACK) - -rm -f $(PROGS) - -rm -rf .libs - -distclean :: clean - -rm -f ncurses_cfg.h - -rm -f config.* *.log *.out - -rm -f Makefile - -realclean :: distclean - -tack.tar: Makefile.in modules *.[ch] tack.1 HISTORY COPYING - tar -cvf tack.tar Makefile.in modules *.[ch] tack.1 HISTORY COPYING - -# These rules are used to allow "make -n" to work on a clean directory-tree -@NCURSES_TREE@../include/hashsize.h \ -@NCURSES_TREE@../include/parametrized.h \ -@NCURSES_TREE@../include/term.h : -@NCURSES_TREE@ cd ../include; $(MAKE) $(CF_MFLAGS) - -@NCURSES_TREE@$(DEPS_CURSES) : -@NCURSES_TREE@ cd ../ncurses; $(MAKE) $(CF_MFLAGS) - -lint: - $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/*.c $(LINT_LIBS) - -############################################################################### -# The remainder of this file is automatically generated during configuration -############################################################################### diff --git a/tack/README b/tack/README deleted file mode 100644 index c19bcc8e..00000000 --- a/tack/README +++ /dev/null @@ -1,20 +0,0 @@ --- $Id: README,v 1.3 2007/01/27 23:14:19 tom Exp $ - -The 'tack' program is a diagnostic that is designed to create and -verify the correctness of terminfo's. This program can be used to -create new terminal descriptions that are not included in the standard -release. Although 'tack' has been distributed with ncurses, it is not an -integral part of ncurses. It may be removed from the release without -limiting the usefulness of ncurses on those terminals described in the -terminfo data base. The best way to remove 'tack' from the build is -to delete or rename the 'tack' directory before running the configure -script. - -Starting with ncurses 5.6 patch 20070113, this program can be built -outside the ncurses source-tree, provided that ncurses is configured -using the "--with-ticlib" option. That makes available the private -interfaces used by tack, and eliminates the need to distribute tack -as an optional part of ncurses. - -Unlike the rest of ncurses, the 'tack' program is covered under the GNU -Public License. diff --git a/tack/aclocal.m4 b/tack/aclocal.m4 deleted file mode 100644 index c012f385..00000000 --- a/tack/aclocal.m4 +++ /dev/null @@ -1,1694 +0,0 @@ -dnl*************************************************************************** -dnl Copyright (c) 2007 Free Software Foundation, Inc. * -dnl * -dnl Permission is hereby granted, free of charge, to any person obtaining a * -dnl copy of this software and associated documentation files (the * -dnl "Software"), to deal in the Software without restriction, including * -dnl without limitation the rights to use, copy, modify, merge, publish, * -dnl distribute, distribute with modifications, sublicense, and/or sell * -dnl copies of the Software, and to permit persons to whom the Software is * -dnl furnished to do so, subject to the following conditions: * -dnl * -dnl The above copyright notice and this permission notice shall be included * -dnl in all copies or substantial portions of the Software. * -dnl * -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * -dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * -dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * -dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * -dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -dnl * -dnl Except as contained in this notice, the name(s) of the above copyright * -dnl holders shall not be used in advertising or otherwise to promote the * -dnl sale, use or other dealings in this Software without prior written * -dnl authorization. * -dnl*************************************************************************** -dnl -dnl $Id: aclocal.m4,v 1.2 2007/01/13 23:57:11 tom Exp $ -dnl -dnl Author: Thomas E. Dickey -dnl -dnl Macros used in TACK test program auto-configuration script. -dnl -dnl These macros are maintained separately from NCURSES. The copyright on -dnl this file applies to the aggregation of macros and does not affect use of -dnl these macros in other applications. -dnl -dnl See http://invisible-island.net/autoconf/ for additional information. -dnl -dnl --------------------------------------------------------------------------- -dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30 -dnl ------------- -dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS -dnl The second parameter if given makes this macro verbose. -dnl -dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS, -dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily -dnl confused by the quotes (which require backslashes to keep them usable). -AC_DEFUN([CF_ADD_CFLAGS], -[ -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $1 -do -case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case $cf_add_cflags in - -D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - fi - ;; - esac - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac - ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)]) - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" -fi - -if test -n "$cf_new_extra_cppflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)]) - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" -fi - -AC_SUBST(EXTRA_CPPFLAGS) - -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 4 updated: 2002/12/21 14:25:52 -dnl ------------- -dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's -dnl redundant. We don't normally need to add -I/usr/local/include for gcc, -dnl but old versions (and some misinstalled ones) need that. To make things -dnl worse, gcc 3.x gives error messages if -I/usr/local/include is added to -dnl the include-path). -AC_DEFUN([CF_ADD_INCDIR], -[ -for cf_add_incdir in $1 -do - while true - do - case $cf_add_incdir in - /usr/include) # (vi - ;; - /usr/local/include) # (vi - if test "$GCC" = yes - then - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - AC_TRY_COMPILE([#include ], - [printf("Hello")], - [], - [CPPFLAGS="$cf_save_CPPFLAGS"]) - fi - ;; - *) # (vi - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - ;; - esac - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - done -done -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34 -dnl ---------------- -dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' -dnl in the sharutils 4.2 distribution. -AC_DEFUN([CF_ANSI_CC_CHECK], -[ -AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[ -cf_cv_ansi_cc=no -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) -for cf_arg in "-DCC_HAS_PROTOS" \ - "" \ - -qlanglvl=ansi \ - -std1 \ - -Ae \ - "-Aa -D_HPUX_SOURCE" \ - -Xc -do - CF_ADD_CFLAGS($cf_arg) - AC_TRY_COMPILE( -[ -#ifndef CC_HAS_PROTOS -#if !defined(__STDC__) || (__STDC__ != 1) -choke me -#endif -#endif -],[ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);};], - [cf_cv_ansi_cc="$cf_arg"; break]) -done -CFLAGS="$cf_save_CFLAGS" -CPPFLAGS="$cf_save_CPPFLAGS" -]) - -if test "$cf_cv_ansi_cc" != "no"; then -if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then - CF_ADD_CFLAGS($cf_cv_ansi_cc) -else - AC_DEFINE(CC_HAS_PROTOS) -fi -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ANSI_CC_REQD version: 3 updated: 1997/09/06 13:40:44 -dnl --------------- -dnl For programs that must use an ANSI compiler, obtain compiler options that -dnl will make it recognize prototypes. We'll do preprocessor checks in other -dnl macros, since tools such as unproto can fake prototypes, but only part of -dnl the preprocessor. -AC_DEFUN([CF_ANSI_CC_REQD], -[AC_REQUIRE([CF_ANSI_CC_CHECK]) -if test "$cf_cv_ansi_cc" = "no"; then - AC_ERROR( -[Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto]) -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31 -dnl ------------- -dnl Allow user to enable a normally-off option. -AC_DEFUN([CF_ARG_ENABLE], -[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41 -dnl ------------- -dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus -dnl values. -dnl -dnl Parameters: -dnl $1 = option name -dnl $2 = help-string -dnl $3 = action to perform if option is not default -dnl $4 = action if perform if option is default -dnl $5 = default option value (either 'yes' or 'no') -AC_DEFUN([CF_ARG_OPTION], -[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes) - if test "$enableval" != "$5" ; then -ifelse($3,,[ :]dnl -,[ $3]) ifelse($4,,,[ - else - $4]) - fi],[enableval=$5 ifelse($4,,,[ - $4 -])dnl - ])])dnl -dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31 -dnl -------------- -dnl Check if we're accidentally using a cache from a different machine. -dnl Derive the system name, as a check for reusing the autoconf cache. -dnl -dnl If we've packaged config.guess and config.sub, run that (since it does a -dnl better job than uname). Normally we'll use AC_CANONICAL_HOST, but allow -dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM -dnl which is useful in cross-compiles. -dnl -dnl Note: we would use $ac_config_sub, but that is one of the places where -dnl autoconf 2.5x broke compatibility with autoconf 2.13 -AC_DEFUN([CF_CHECK_CACHE], -[ -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - ifelse([$1],,[AC_CANONICAL_HOST],[$1]) - system_name="$host_os" -else - system_name="`(uname -s -r) 2>/dev/null`" - if test -z "$system_name" ; then - system_name="`(hostname) 2>/dev/null`" - fi -fi -test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name") -AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"]) - -test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring for $cf_cv_system_name) - -if test ".$system_name" != ".$cf_cv_system_name" ; then - AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)) - AC_ERROR("Please remove config.cache and try again.") -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58 -dnl --------------- -dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from -dnl a build-configuration such as imake. These have the pitfall that they -dnl often contain compiler-specific options which we cannot use, mixed with -dnl preprocessor options that we usually can. -AC_DEFUN([CF_CHECK_CFLAGS], -[ -CF_VERBOSE(checking additions to CFLAGS) -cf_check_cflags="$CFLAGS" -cf_check_cppflags="$CPPFLAGS" -CF_ADD_CFLAGS($1,yes) -if test "$cf_check_cflags" != "$CFLAGS" ; then -AC_TRY_LINK([#include ],[printf("Hello world");],, - [CF_VERBOSE(test-compile failed. Undoing change to \$CFLAGS) - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then - CF_VERBOSE(but keeping change to \$CPPFLAGS) - fi - CFLAGS="$cf_check_flags"]) -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27 -dnl ---------------- -dnl Tie together the configure-script macros for curses. It may be ncurses, -dnl but unless asked, we do not make a special search for ncurses. However, -dnl still check for the ncurses version number, for use in other macros. -AC_DEFUN([CF_CURSES_CONFIG], -[ -CF_CURSES_CPPFLAGS -CF_NCURSES_VERSION -CF_CURSES_LIBS -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_CURSES_CPPFLAGS version: 9 updated: 2006/02/04 19:44:43 -dnl ------------------ -dnl Look for the curses headers. -AC_DEFUN([CF_CURSES_CPPFLAGS],[ - -AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[ -cf_cv_curses_incdir=no -case $host_os in #(vi -hpux10.*) #(vi - test -d /usr/include/curses_colr && \ - cf_cv_curses_incdir="-I/usr/include/curses_colr" - ;; -sunos3*|sunos4*) - test -d /usr/5lib && \ - test -d /usr/5include && \ - cf_cv_curses_incdir="-I/usr/5include" - ;; -esac -]) -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" - -CF_CURSES_HEADER -CF_TERM_HEADER -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25 -dnl ---------------- -dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common -dnl variations of ncurses' installs. -dnl -dnl See also CF_NCURSES_HEADER, which sets the same cache variable. -AC_DEFUN([CF_CURSES_HEADER],[ -AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ -cf_cv_ncurses_header=none -for cf_header in \ - curses.h \ - ncurses.h \ - ncurses/curses.h \ - ncurses/ncurses.h -do -AC_TRY_COMPILE([#include <${cf_header}>], - [initscr(); tgoto("?", 0,0)], - [cf_cv_ncurses_header=$cf_header; break],[]) -done -]) - -if test "$cf_cv_ncurses_header" = none ; then - AC_MSG_ERROR(No curses header-files found) -fi - -# cheat, to get the right #define's for HAVE_NCURSES_H, etc. -AC_CHECK_HEADERS($cf_cv_ncurses_header) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 24 updated: 2006/02/04 19:44:43 -dnl -------------- -dnl Look for the curses libraries. Older curses implementations may require -dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. -AC_DEFUN([CF_CURSES_LIBS],[ - -AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl -AC_MSG_CHECKING(if we have identified curses libraries) -AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr(); tgoto("?", 0,0)], - cf_result=yes, - cf_result=no) -AC_MSG_RESULT($cf_result) - -if test "$cf_result" = no ; then -case $host_os in #(vi -freebsd*) #(vi - AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) - ;; -hpux10.*) #(vi - AC_CHECK_LIB(cur_colr,initscr,[ - LIBS="-lcur_colr $LIBS" - ac_cv_func_initscr=yes - ],[ - AC_CHECK_LIB(Hcurses,initscr,[ - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" - CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" - ac_cv_func_initscr=yes - ])]) - ;; -linux*) # Suse Linux does not follow /usr/lib convention - LIBS="$LIBS -L/lib" - ;; -sunos3*|sunos4*) - test -d /usr/5lib && \ - LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap" - ac_cv_func_initscr=yes - ;; -esac - -if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" - - if test ".${cf_cv_ncurses_version-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi - - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in $cf_check_list termcap termlib unknown - do - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) - done - ]) - - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses unknown - do - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) - done - test $cf_curs_lib = unknown && AC_ERROR(no curses library found) - - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=no]) - AC_MSG_RESULT($cf_result) - test $cf_result = no && AC_ERROR(Cannot link curses library) - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr(); tgoto((char *)0, 0, 0);], - [cf_result=no], - [ - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=error]) - ]) - AC_MSG_RESULT($cf_result) - fi -fi -fi - -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 -dnl ---------- -dnl "dirname" is not portable, so we fake it with a shell script. -AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ENABLE_WARNINGS version: 3 updated: 2003/05/24 14:24:29 -dnl ------------------ -dnl Configure-option to enable gcc warnings -AC_DEFUN([CF_ENABLE_WARNINGS],[ -if ( test "$GCC" = yes || test "$GXX" = yes ) -then -AC_MSG_CHECKING(if you want to turn on gcc warnings) -CF_ARG_ENABLE(warnings, - [ --enable-warnings test: turn on gcc compiler warnings], - [with_warnings=yes], - [with_warnings=no]) -AC_MSG_RESULT($with_warnings) -if test "$with_warnings" = "yes" -then - CF_GCC_WARNINGS -fi -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_FIND_LIBRARY version: 8 updated: 2004/11/23 20:14:58 -dnl --------------- -dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We -dnl prefer a standard location, and use -L options only if we do not find the -dnl library in the standard library location(s). -dnl $1 = library name -dnl $2 = library class, usually the same as library name -dnl $3 = includes -dnl $4 = code fragment to compile/link -dnl $5 = corresponding function-name -dnl $6 = flag, nonnull if failure should not cause an error-exit -dnl -dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had -dnl to use a -L option. -AC_DEFUN([CF_FIND_LIBRARY], -[ - eval 'cf_cv_have_lib_'$1'=no' - cf_libdir="" - AC_CHECK_FUNC($5, - eval 'cf_cv_have_lib_'$1'=yes',[ - cf_save_LIBS="$LIBS" - AC_MSG_CHECKING(for $5 in -l$1) - LIBS="-l$1 $LIBS" - AC_TRY_LINK([$3],[$4], - [AC_MSG_RESULT(yes) - eval 'cf_cv_have_lib_'$1'=yes' - ], - [AC_MSG_RESULT(no) - CF_LIBRARY_PATH(cf_search,$2) - for cf_libdir in $cf_search - do - AC_MSG_CHECKING(for -l$1 in $cf_libdir) - LIBS="-L$cf_libdir -l$1 $cf_save_LIBS" - AC_TRY_LINK([$3],[$4], - [AC_MSG_RESULT(yes) - eval 'cf_cv_have_lib_'$1'=yes' - break], - [AC_MSG_RESULT(no) - LIBS="$cf_save_LIBS"]) - done - ]) - ]) -eval 'cf_found_library=[$]cf_cv_have_lib_'$1 -ifelse($6,,[ -if test $cf_found_library = no ; then - AC_ERROR(Cannot link $1 library) -fi -]) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28 -dnl ----------------- -dnl Test for availability of useful gcc __attribute__ directives to quiet -dnl compiler warnings. Though useful, not all are supported -- and contrary -dnl to documentation, unrecognized directives cause older compilers to barf. -AC_DEFUN([CF_GCC_ATTRIBUTES], -[ -if test "$GCC" = yes -then -cat > conftest.i < conftest.$ac_ext <&AC_FD_CC - case $cf_attribute in - scanf|printf) - cat >conftest.h <conftest.h <>confdefs.h - fi - done -else - fgrep define conftest.i >>confdefs.h -fi -rm -rf conftest* -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42 -dnl -------------- -dnl Find version of gcc -AC_DEFUN([CF_GCC_VERSION],[ -AC_REQUIRE([AC_PROG_CC]) -GCC_VERSION=none -if test "$GCC" = yes ; then - AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" - test -z "$GCC_VERSION" && GCC_VERSION=unknown - AC_MSG_RESULT($GCC_VERSION) -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29 -dnl --------------- -dnl Check if the compiler supports useful warning options. There's a few that -dnl we don't use, simply because they're too noisy: -dnl -dnl -Wconversion (useful in older versions of gcc, but not in gcc 2.7.x) -dnl -Wredundant-decls (system headers make this too noisy) -dnl -Wtraditional (combines too many unrelated messages, only a few useful) -dnl -Wwrite-strings (too noisy, but should review occasionally). This -dnl is enabled for ncurses using "--enable-const". -dnl -pedantic -dnl -dnl Parameter: -dnl $1 is an optional list of gcc warning flags that a particular -dnl application might want to use, e.g., "no-unused" for -dnl -Wno-unused -dnl Special: -dnl If $with_ext_const is "yes", add a check for -Wwrite-strings -dnl -AC_DEFUN([CF_GCC_WARNINGS], -[ -AC_REQUIRE([CF_GCC_VERSION]) -CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) - -cat > conftest.$ac_ext <],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_gnu_source=no], - [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - AC_TRY_COMPILE([#include ],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_gnu_source=no], - [cf_cv_gnu_source=yes]) - CPPFLAGS="$cf_save" - ]) -]) -test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59 -dnl -------------- -dnl Construct a search-list for a nonstandard header-file -AC_DEFUN([CF_HEADER_PATH], -[CF_SUBDIR_PATH($1,$2,include) -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && $1="[$]$1 $includedir" - test -d $includedir/$2 && $1="[$]$1 $includedir/$2" -} - -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && $1="[$]$1 $oldincludedir" - test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2" -} - -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_INHERIT_SCRIPT version: 2 updated: 2003/03/01 23:50:42 -dnl ----------------- -dnl If we do not have a given script, look for it in the parent directory. -AC_DEFUN([CF_INHERIT_SCRIPT], -[ -test -f $1 || ( test -f ../$1 && cp ../$1 ./ ) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29 -dnl ----------------- -dnl Check if the given compiler is really the Intel compiler for Linux. It -dnl tries to imitate gcc, but does not return an error when it finds a mismatch -dnl between prototypes, e.g., as exercised by CF_MISSING_CHECK. -dnl -dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to -dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from -dnl the wrappers for gcc and g++ warnings. -dnl -dnl $1 = GCC (default) or GXX -dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS -dnl $3 = CFLAGS (default) or CXXFLAGS -AC_DEFUN([CF_INTEL_COMPILER],[ -ifelse($2,,INTEL_COMPILER,[$2])=no - -if test "$ifelse($1,,[$1],GCC)" = yes ; then - case $host_os in - linux*|gnu*) - AC_MSG_CHECKING(if this is really Intel ifelse($1,GXX,C++,C) compiler) - cf_save_CFLAGS="$ifelse($3,,CFLAGS,[$3])" - ifelse($3,,CFLAGS,[$3])="$ifelse($3,,CFLAGS,[$3]) -no-gcc" - AC_TRY_COMPILE([],[ -#ifdef __INTEL_COMPILER -#else -make an error -#endif -],[ifelse($2,,INTEL_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" -],[]) - ifelse($3,,CFLAGS,[$3])="$cf_save_CFLAGS" - AC_MSG_RESULT($ifelse($2,,INTEL_COMPILER,[$2])) - ;; - esac -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59 -dnl --------------- -dnl Construct a search-list for a nonstandard library-file -AC_DEFUN([CF_LIBRARY_PATH], -[CF_SUBDIR_PATH($1,$2,lib)])dnl -dnl --------------------------------------------------------------------------- -dnl CF_MAKE_TAGS version: 2 updated: 2000/10/04 09:18:40 -dnl ------------ -dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have -dnl a monocase filesystem. -AC_DEFUN([CF_MAKE_TAGS],[ -AC_REQUIRE([CF_MIXEDCASE_FILENAMES]) -AC_CHECK_PROG(MAKE_LOWER_TAGS, ctags, yes, no) - -if test "$cf_cv_mixedcase" = yes ; then - AC_CHECK_PROG(MAKE_UPPER_TAGS, etags, yes, no) -else - MAKE_UPPER_TAGS=no -fi - -if test "$MAKE_UPPER_TAGS" = yes ; then - MAKE_UPPER_TAGS= -else - MAKE_UPPER_TAGS="#" -fi -AC_SUBST(MAKE_UPPER_TAGS) - -if test "$MAKE_LOWER_TAGS" = yes ; then - MAKE_LOWER_TAGS= -else - MAKE_LOWER_TAGS="#" -fi -AC_SUBST(MAKE_LOWER_TAGS) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55 -dnl ---------------------- -dnl Check if the file-system supports mixed-case filenames. If we're able to -dnl create a lowercase name and see it as uppercase, it doesn't support that. -AC_DEFUN([CF_MIXEDCASE_FILENAMES], -[ -AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ -if test "$cross_compiling" = yes ; then - case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi - cf_cv_mixedcase=no - ;; - *) - cf_cv_mixedcase=yes - ;; - esac -else - rm -f conftest CONFTEST - echo test >conftest - if test -f CONFTEST ; then - cf_cv_mixedcase=no - else - cf_cv_mixedcase=yes - fi - rm -f conftest CONFTEST -fi -]) -test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52 -dnl ---------- -dnl Write a debug message to config.log, along with the line number in the -dnl configure script. -AC_DEFUN([CF_MSG_LOG],[ -echo "(line __oline__) testing $* ..." 1>&AC_FD_CC -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CC_CHECK version: 3 updated: 2003/01/12 18:59:28 -dnl ------------------- -dnl Check if we can compile with ncurses' header file -dnl $1 is the cache variable to set -dnl $2 is the header-file to include -dnl $3 is the root name (ncurses or ncursesw) -AC_DEFUN([CF_NCURSES_CC_CHECK],[ - AC_TRY_COMPILE([ -]ifelse($3,ncursesw,[ -#define _XOPEN_SOURCE_EXTENDED -#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ -#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ -])[ -#include <$2>],[ -#ifdef NCURSES_VERSION -]ifelse($3,ncursesw,[ -#ifndef WACS_BSSB - make an error -#endif -])[ -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - ] - ,[$1=$cf_header] - ,[$1=no]) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 4 updated: 2006/10/28 14:36:12 -dnl ----------------- -dnl Tie together the configure-script macros for ncurses. -dnl Prefer the "-config" script from ncurses 5.6, to simplify analysis. -dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. -dnl -dnl $1 is the root library name (default: "ncurses") -AC_DEFUN([CF_NCURSES_CONFIG], -[ -cf_ncuconfig_root=ifelse($1,,ncurses,$1) - -echo "Looking for ${cf_ncuconfig_root}-config" -AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) - -if test "$NCURSES_CONFIG" != none ; then - -cf_cv_ncurses_header=curses.h - -CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS" -LIBS="`$NCURSES_CONFIG --libs` $LIBS" - -dnl like CF_NCURSES_CPPFLAGS -AC_DEFINE(NCURSES) - -dnl like CF_NCURSES_LIBS -CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) -AC_DEFINE_UNQUOTED($cf_nculib_ROOT) - -dnl like CF_NCURSES_VERSION -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` - -else - -CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) -CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) - -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CPPFLAGS version: 18 updated: 2005/12/31 13:26:39 -dnl ------------------- -dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting -dnl the CPPFLAGS variable so we can include its header. -dnl -dnl The header files may be installed as either curses.h, or ncurses.h (would -dnl be obsolete, except that some packagers prefer this name to distinguish it -dnl from a "native" curses implementation). If not installed for overwrite, -dnl the curses.h file would be in an ncurses subdirectory (e.g., -dnl /usr/include/ncurses), but someone may have installed overwriting the -dnl vendor's curses. Only very old versions (pre-1.9.2d, the first autoconf'd -dnl version) of ncurses don't define either __NCURSES_H or NCURSES_VERSION in -dnl the header. -dnl -dnl If the installer has set $CFLAGS or $CPPFLAGS so that the ncurses header -dnl is already in the include-path, don't even bother with this, since we cannot -dnl easily determine which file it is. In this case, it has to be . -dnl -dnl The optional parameter gives the root name of the library, in case it is -dnl not installed as the default curses library. That is how the -dnl wide-character version of ncurses is installed. -AC_DEFUN([CF_NCURSES_CPPFLAGS], -[AC_REQUIRE([CF_WITH_CURSES_DIR]) - -AC_PROVIDE([CF_CURSES_CPPFLAGS])dnl -cf_ncuhdr_root=ifelse($1,,ncurses,$1) - -test -n "$cf_cv_curses_dir" && \ -test "$cf_cv_curses_dir" != "no" && \ -CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" - -AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[ - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1) - test "$cf_cv_ncurses_h" != no && break - done -]) - -CF_NCURSES_HEADER -CF_TERM_HEADER - -# some applications need this, but should check for NCURSES_VERSION -AC_DEFINE(NCURSES) - -CF_NCURSES_VERSION -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_HEADER version: 1 updated: 2005/12/31 13:28:37 -dnl ----------------- -dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common -dnl variations of ncurses' installs. -dnl -dnl See also CF_CURSES_HEADER, which sets the same cache variable. -AC_DEFUN([CF_NCURSES_HEADER],[ - -if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h -else - -AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[ - test -n "$verbose" && echo - CF_HEADER_PATH(cf_search,$cf_ncuhdr_root) - test -n "$verbose" && echo search path $cf_search - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search - do - CF_ADD_INCDIR($cf_incdir) - for cf_header in \ - ncurses.h \ - curses.h - do - CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1) - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&AC_FD_MSG - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && AC_ERROR(not found) - ]) - - CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2) - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header - fi - CF_ADD_INCDIR($cf_1st_incdir) - -fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case $cf_cv_ncurses_header in # (vi -*ncurses.h) - AC_DEFINE(HAVE_NCURSES_H) - ;; -esac - -case $cf_cv_ncurses_header in # (vi -ncurses/curses.h|ncurses/ncurses.h) - AC_DEFINE(HAVE_NCURSES_NCURSES_H) - ;; -ncursesw/curses.h|ncursesw/ncurses.h) - AC_DEFINE(HAVE_NCURSESW_NCURSES_H) - ;; -esac - -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 12 updated: 2004/04/27 16:26:05 -dnl --------------- -dnl Look for the ncurses library. This is a little complicated on Linux, -dnl because it may be linked with the gpm (general purpose mouse) library. -dnl Some distributions have gpm linked with (bsd) curses, which makes it -dnl unusable with ncurses. However, we don't want to link with gpm unless -dnl ncurses has a dependency, since gpm is normally set up as a shared library, -dnl and the linker will record a dependency. -dnl -dnl The optional parameter gives the root name of the library, in case it is -dnl not installed as the default curses library. That is how the -dnl wide-character version of ncurses is installed. -AC_DEFUN([CF_NCURSES_LIBS], -[AC_REQUIRE([CF_NCURSES_CPPFLAGS]) - -cf_nculib_root=ifelse($1,,ncurses,$1) - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -AC_CHECK_LIB(gpm,Gpm_Open, - [AC_CHECK_LIB(gpm,initscr, - [LIBS="$cf_ncurses_SAVE"], - [cf_ncurses_LIBS="-lgpm"])]) - -case $host_os in #(vi -freebsd*) - # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). - if test "$cf_nculib_root" = ncurses ; then - AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"]) - fi - ;; -esac - -LIBS="$cf_ncurses_LIBS $LIBS" - -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -then - LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS" -else - CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root, - [#include <${cf_cv_ncurses_header-curses.h}>], - [initscr()], - initscr) -fi - -if test -n "$cf_ncurses_LIBS" ; then - AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS) - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` - if test "$q" != "$LIBS" ; then - LIBS="$q" - fi - done - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], - [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no) - LIBS="$cf_ncurses_SAVE"]) -fi - -CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) -AC_DEFINE_UNQUOTED($cf_nculib_ROOT) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 11 updated: 2003/11/06 19:59:57 -dnl ------------------ -dnl Check for the version of ncurses, to aid in reporting bugs, etc. -dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use -dnl AC_REQUIRE since that does not work with the shell's if/then/else/fi. -AC_DEFUN([CF_NCURSES_VERSION], -[ -AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl -AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[ - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - AC_TRY_RUN([ -#include <${cf_cv_ncurses_header-curses.h}> -#include -int main() -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - exit(0); -}],[ - cf_cv_ncurses_version=`cat $cf_tempfile`],,[ - - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out" - AC_TRY_EVAL(cf_try) - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi -]) - rm -f $cf_tempfile -]) -test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46 -dnl -------------- -dnl Check the argument to see that it looks like a pathname. Rewrite it if it -dnl begins with one of the prefix/exec_prefix variables, and then again if the -dnl result begins with 'NONE'. This is necessary to work around autoconf's -dnl delayed evaluation of those symbols. -AC_DEFUN([CF_PATH_SYNTAX],[ -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -case ".[$]$1" in #(vi -.\[$]\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX - ;; -.\[$]{*prefix}*) #(vi - eval $1="[$]$1" - case ".[$]$1" in #(vi - .NONE/*) - $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2) - ;; -esac -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10 -dnl ----------------- -dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. -dnl -dnl POSIX.1-1990 _POSIX_SOURCE -dnl POSIX.1-1990 and _POSIX_SOURCE and -dnl POSIX.2-1992 C-Language _POSIX_C_SOURCE=2 -dnl Bindings Option -dnl POSIX.1b-1993 _POSIX_C_SOURCE=199309L -dnl POSIX.1c-1996 _POSIX_C_SOURCE=199506L -dnl X/Open 2000 _POSIX_C_SOURCE=200112L -dnl -dnl Parameters: -dnl $1 is the nominal value for _POSIX_C_SOURCE -AC_DEFUN([CF_POSIX_C_SOURCE], -[ -cf_POSIX_C_SOURCE=ifelse($1,,199506L,$1) - -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" - -CF_REMOVE_DEFINE(cf_trim_CFLAGS,$cf_save_CFLAGS,_POSIX_C_SOURCE) -CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE) - -AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ - CF_MSG_LOG(if the symbol is already defined go no further) - AC_TRY_COMPILE([#include ],[ -#ifndef _POSIX_C_SOURCE -make an error -#endif], - [cf_cv_posix_c_source=no], - [cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[[12]]??*) #(vi - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - ;; - .2) #(vi - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - cf_want_posix_source=yes - ;; - .*) - cf_want_posix_source=yes - ;; - esac - if test "$cf_want_posix_source" = yes ; then - AC_TRY_COMPILE([#include ],[ -#ifdef _POSIX_SOURCE -make an error -#endif],[], - cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") - fi - CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" - CF_MSG_LOG(if the second compile does not leave our definition intact error) - AC_TRY_COMPILE([#include ],[ -#ifndef _POSIX_C_SOURCE -make an error -#endif],, - [cf_cv_posix_c_source=no]) - CFLAGS="$cf_save_CFLAGS" - CPPFLAGS="$cf_save_CPPFLAGS" - ]) -]) - -if test "$cf_cv_posix_c_source" != no ; then - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS" - if test "$cf_cv_cc_u_d_options" = yes ; then - cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \ - sed -e 's/-D/-U/g' -e 's/=[[^ ]]*//g'` - CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source" - fi - CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" -fi - -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_PRG_RULES version: 1 updated: 2006/06/03 11:45:08 -dnl ------------ -dnl Append definitions and rules for the given programs to the subdirectory -dnl Makefiles, and the recursion rule for the top-level Makefile. -dnl -dnl parameters -dnl $1 = script to run -dnl $2 = list of subdirectories -dnl -dnl variables -dnl $AWK -AC_DEFUN([CF_PRG_RULES], -[ -for cf_dir in $2 -do - if test ! -d $srcdir/$cf_dir; then - continue - elif test -f $srcdir/$cf_dir/programs; then - $AWK -f $1 $srcdir/$cf_dir/programs >>$cf_dir/Makefile - fi -done - -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30 -dnl -------------- -dnl Check if C (preprocessor) -U and -D options are processed in the order -dnl given rather than by type of option. Some compilers insist on apply all -dnl of the -U options after all of the -D options. Others allow mixing them, -dnl and may predefine symbols that conflict with those we define. -AC_DEFUN([CF_PROG_CC_U_D], -[ -AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[ - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" - AC_TRY_COMPILE([],[ -#ifndef U_D_OPTIONS -make an undefined-error -#endif -#ifdef D_U_OPTIONS -make a defined-error -#endif - ],[ - cf_cv_cc_u_d_options=yes],[ - cf_cv_cc_u_d_options=no]) - CPPFLAGS="$cf_save_CPPFLAGS" -]) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 5 updated: 2002/12/21 22:46:07 -dnl --------------- -dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the -dnl misc/tabset install won't work properly. Usually this happens only when -dnl using the fallback mkinstalldirs script -AC_DEFUN([CF_PROG_INSTALL], -[AC_PROG_INSTALL -case $INSTALL in -/*) - ;; -*) - CF_DIRNAME(cf_dir,$INSTALL) - test -z "$cf_dir" && cf_dir=. - INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'` - ;; -esac -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18 -dnl ---------------- -dnl Remove all -U and -D options that refer to the given symbol from a list -dnl of C compiler options. This works around the problem that not all -dnl compilers process -U and -D options from left-to-right, so a -U option -dnl cannot be used to cancel the effect of a preceding -D option. -dnl -dnl $1 = target (which could be the same as the source variable) -dnl $2 = source (including '$') -dnl $3 = symbol to remove -define([CF_REMOVE_DEFINE], -[ -# remove $3 symbol from $2 -$1=`echo "$2" | \ - sed -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[[ ]]/ /g' \ - -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'` -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_SUBDIR_PATH version: 4 updated: 2006/11/18 17:13:19 -dnl -------------- -dnl Construct a search-list for a nonstandard header/lib-file -dnl $1 = the variable to return as result -dnl $2 = the package name -dnl $3 = the subdirectory, e.g., bin, include or lib -AC_DEFUN([CF_SUBDIR_PATH], -[$1="" - -test -d "[$]HOME" && { - test -n "$verbose" && echo " ... testing $3-directories under [$]HOME" - test -d "[$]HOME/$3" && $1="[$]$1 [$]HOME/$3" - test -d "[$]HOME/$3/$2" && $1="[$]$1 [$]HOME/$3/$2" - test -d "[$]HOME/$3/$2/$3" && $1="[$]$1 [$]HOME/$3/$2/$3" -} - -# For other stuff under the home directory, it should be sufficient to put -# a symbolic link for $HOME/$2 to the actual package location: -test -d "[$]HOME/$2" && { - test -n "$verbose" && echo " ... testing $3-directories under [$]HOME/$2" - test -d "[$]HOME/$2/$3" && $1="[$]$1 [$]HOME/$2/$3" - test -d "[$]HOME/$2/$3/$2" && $1="[$]$1 [$]HOME/$2/$3/$2" -} - -test "$prefix" != /usr/local && \ -test -d /usr/local && { - test -n "$verbose" && echo " ... testing $3-directories under /usr/local" - test -d /usr/local/$3 && $1="[$]$1 /usr/local/$3" - test -d /usr/local/$3/$2 && $1="[$]$1 /usr/local/$3/$2" - test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3" - test -d /usr/local/$2/$3 && $1="[$]$1 /usr/local/$2/$3" - test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2" -} - -test "$prefix" != NONE && \ -test -d $prefix && { - test -n "$verbose" && echo " ... testing $3-directories under $prefix" - test -d $prefix/$3 && $1="[$]$1 $prefix/$3" - test -d $prefix/$3/$2 && $1="[$]$1 $prefix/$3/$2" - test -d $prefix/$3/$2/$3 && $1="[$]$1 $prefix/$3/$2/$3" - test -d $prefix/$2/$3 && $1="[$]$1 $prefix/$2/$3" - test -d $prefix/$2/$3/$2 && $1="[$]$1 $prefix/$2/$3/$2" -} - -test "$prefix" != /opt && \ -test -d /opt && { - test -n "$verbose" && echo " ... testing $3-directories under /opt" - test -d /opt/$3 && $1="[$]$1 /opt/$3" - test -d /opt/$3/$2 && $1="[$]$1 /opt/$3/$2" - test -d /opt/$3/$2/$3 && $1="[$]$1 /opt/$3/$2/$3" - test -d /opt/$2/$3 && $1="[$]$1 /opt/$2/$3" - test -d /opt/$2/$3/$2 && $1="[$]$1 /opt/$2/$3/$2" -} - -test "$prefix" != /usr && \ -test -d /usr && { - test -n "$verbose" && echo " ... testing $3-directories under /usr" - test -d /usr/$3 && $1="[$]$1 /usr/$3" - test -d /usr/$3/$2 && $1="[$]$1 /usr/$3/$2" - test -d /usr/$3/$2/$3 && $1="[$]$1 /usr/$3/$2/$3" - test -d /usr/$2/$3 && $1="[$]$1 /usr/$2/$3" -} -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_SYS_TIME_SELECT version: 4 updated: 2000/10/04 09:18:40 -dnl ------------------ -dnl Check if we can include with ; this breaks on -dnl older SCO configurations. -AC_DEFUN([CF_SYS_TIME_SELECT], -[ -AC_MSG_CHECKING(if sys/time.h works with sys/select.h) -AC_CACHE_VAL(cf_cv_sys_time_select,[ -AC_TRY_COMPILE([ -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif -],[],[cf_cv_sys_time_select=yes], - [cf_cv_sys_time_select=no]) - ]) -AC_MSG_RESULT($cf_cv_sys_time_select) -test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39 -dnl -------------- -dnl Look for term.h, which is part of X/Open curses. It defines the interface -dnl to terminfo database. Usually it is in the same include-path as curses.h, -dnl but some packagers change this, breaking various applications. -AC_DEFUN([CF_TERM_HEADER],[ -AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[ -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'` - ;; -*) - cf_term_header=term.h - ;; -esac - -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do -AC_TRY_COMPILE([#include -#include <${cf_cv_ncurses_header-curses.h}> -#include <$cf_test> -],[int x = auto_left_margin],[ - cf_cv_term_header="$cf_test"],[ - cf_cv_term_header=unknown - ]) - test "$cf_cv_term_header" != unknown && break -done -]) - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case $cf_cv_term_header in # (vi -*term.h) - AC_DEFINE(HAVE_TERM_H) - ;; -esac - -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi - AC_DEFINE(HAVE_NCURSES_TERM_H) - ;; -ncursesw/term.h) - AC_DEFINE(HAVE_NCURSESW_TERM_H) - ;; -esac -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59 -dnl -------- -dnl Make an uppercase version of a variable -dnl $1=uppercase($2) -AC_DEFUN([CF_UPPER], -[ -$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14 -dnl ---------- -dnl Use AC_VERBOSE w/o the warnings -AC_DEFUN([CF_VERBOSE], -[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59 -dnl ------------------ -dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses -dnl libraries. -AC_DEFUN([CF_WITH_CURSES_DIR],[ -AC_ARG_WITH(curses-dir, - [ --with-curses-dir=DIR directory in which (n)curses is installed], - [CF_PATH_SYNTAX(withval) - cf_cv_curses_dir=$withval], - [cf_cv_curses_dir=no]) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09 -dnl --------------- -dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, -dnl or adapt to the vendor's definitions to get equivalent functionality, -dnl without losing the common non-POSIX features. -dnl -dnl Parameters: -dnl $1 is the nominal value for _XOPEN_SOURCE -dnl $2 is the nominal value for _POSIX_C_SOURCE -AC_DEFUN([CF_XOPEN_SOURCE],[ - -AC_REQUIRE([CF_PROG_CC_U_D]) - -cf_XOPEN_SOURCE=ifelse($1,,500,$1) -cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2) - -case $host_os in #(vi -aix[[45]]*) #(vi - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" - ;; -freebsd*) #(vi - # 5.x headers associate - # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L - # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L - cf_POSIX_C_SOURCE=200112L - cf_XOPEN_SOURCE=600 - CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -hpux*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" - ;; -irix[[56]].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" - ;; -linux*|gnu*) #(vi - CF_GNU_SOURCE - ;; -mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks - ;; -netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw - ;; -openbsd*) #(vi - # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw - ;; -osf[[45]]*) #(vi - CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" - ;; -nto-qnx*) #(vi - CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" - ;; -sco*) #(vi - # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer - ;; -solaris*) #(vi - CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" - ;; -*) - AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([#include ],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - AC_TRY_COMPILE([#include ],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" - ]) -]) - if test "$cf_cv_xopen_source" != no ; then - CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) - CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) - test "$cf_cv_cc_u_d_options" = yes && \ - CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" - fi - CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) - ;; -esac -]) diff --git a/tack/ansi.c b/tack/ansi.c deleted file mode 100644 index bdbd4337..00000000 --- a/tack/ansi.c +++ /dev/null @@ -1,854 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: ansi.c,v 1.10 2005/09/17 19:49:16 tom Exp $") - -/* - * Standalone tests for ANSI terminals. Three entry points: - * test_ansi_graphics(), test_ansi_reports() and test_ansi_sgr(). - */ - -/***************************************************************************** - * - * Test ANSI status reports - * - *****************************************************************************/ - -/* ASCII control characters */ -#define A_DC1 0x11 /* Control Q */ -#define A_DC3 0x13 /* Control S */ -#define A_ESC 0x1b -#define A_DCS 0x90 -#define A_CSI 0x9b -#define A_ST 0x9c - -#define MAX_MODES 256 - -static char default_bank[] = "\033(B\017"; -static int private_use, ape, terminal_class; -static short ansi_value[256]; -static unsigned char ansi_buf[512], pack_buf[512]; - -struct ansi_reports { - int lvl, final; - const char *text; - const char *request; -}; - -static struct ansi_reports report_list[] = { - {0, 'c', "(DA) Primary device attributes", "\033[0c"}, - {1, 0, "(DSR) Terminal status", "\033[5n"}, - {1, 'R', "(DSR) Cursor position", "\033[6n"}, - {62, 0, "(DA) Secondary device attributes", "\033[>0c"}, - {62, 0, "(DSR) Printer status", "\033[?15n"}, - {62, 0, "(DSR) Function key definition", "\033[?25n"}, - {62, 0, "(DSR) Keyboard language", "\033[?26n"}, - {63, 0, "(DECRQSS) Data destination", "\033P$q$}\033\\"}, - {63, 0, "(DECRQSS) Status line type", "\033P$q$~\033\\"}, - {63, 0, "(DECRQSS) Erase attribute", "\033P$q\"q\033\\"}, - {63, 0, "(DECRQSS) Personality", "\033P$q\"p\033\\"}, - {63, 0, "(DECRQSS) Top and bottom margins", "\033P$qr\033\\"}, - {63, 0, "(DECRQSS) Character attributes", "\033P$qm\033\\"}, - {63, 0, "(DECRQSS) Illegal request", "\033P$q@\033\\"}, - {63, 0, "(DECRQUPSS) User pref supplemental set", "\033[&u"}, - {63, 0, "(DECRQPSR) Cursor information", "\033[1$w"}, - {63, 0, "(DECRQPSR) Tab stop information", "\033[2$w"}, - {64, 0, "(DA) Tertiary device attributes", "\033[=0c"}, - {64, 0, "(DSR) Extended cursor position", "\033[?6n"}, - {64, 0, "(DSR) Macro space", "\033[?62n"}, - {64, 0, "(DSR) Memory checksum", "\033[?63n"}, - {64, 0, "(DSR) Data integrity", "\033[?75n"}, - {64, 0, "(DSR) Multiple session status", "\033[?85n"}, - {64, 0, "(DECRQSS) Attribute change extent", "\033P$q*x\033\\"}, - {64, 0, "(DECRQSS) Columns per page", "\033P$q$|\033\\"}, - {64, 0, "(DECRQSS) Lines per page", "\033P$qt\033\\"}, - {64, 0, "(DECRQSS) Lines per screen", "\033P$q*|\033\\"}, - {64, 0, "(DECRQSS) Left and right margins", "\033P$qs\033\\"}, - {64, 0, "(DECRQSS) Local functions", "\033P$q+q\033\\"}, - {64, 0, "(DECRQSS) Local function key control", "\033P$q=}\033\\"}, - {64, 0, "(DECRQSS) Select modifier key reporting", "\033P$q+r\033\\"}, - {64, 0, "(DECRQDE) Window report", "\033[\"v"}, - {0, 0, 0, 0} -}; - -struct request_control { - const char *text; - const char *expect; - const char *request; - const char *set_mode; - const char *reset_mode; -}; - -/* Request control function selection or setting */ -static const struct request_control rqss[] = { - {"Data sent to screen", "0", "$}", "\033[0$}", 0}, - {"Data sent to disabled status line", "0", "$}", 0, 0}, - {"\033[0$~\033[1$}", "\033[0$}", 0, 0, 0}, - {"Data sent to enabled status line", "1", "$}", 0, 0}, - {"\033[2$~\033[1$}", "\033[0$}", 0, 0, 0}, - {"Disable status line", "0", "$~", "\033[0$~", 0}, - {"Top status line", "1", "$~", "\033[1$~", 0}, - {"Bottom status line", "2", "$~", "\033[2$~", 0}, - {"Erasable character", "0", "\"q", "\033[0\"q", 0}, - {"Nonerasable character", "1", "\"q", "\033[1\"q", "\033[0\"q"}, - {"Top and bottom margins", "3;10", "r", "\0337\033[3;10r", 0}, - {"\033[r\0338", 0, 0, 0, 0}, - {"Top and bottom margins", "default", "r", "\0337\033[r", "\0338"}, - {"Character attributes, dim, bold", "1", "m", "\033[2;1m", "\033[m"}, - {"Character attributes, bold, dim", "2", "m", "\033[1;2m", "\033[m"}, - {"Character attributes, under, rev", "4;7", "m", "\033[4;7m", "\033[m"}, - {"Character attributes, color", "35;42", "m", "\033[35;42m", "\033[m"}, - {"All character attributes", "", "m", "\033[1;2;3;4;5;6;7;8;9m", 0}, - {"\033[m", 0, 0, 0, 0}, - {0, 0, 0, 0, 0} -}; - - -/* -** read_ansi() -** -** read an ANSI status report from terminal -*/ -static void -read_ansi(void) -{ - int ch, i, j, last_escape; - - fflush(stdout); - read_key((char *)ansi_buf, sizeof(ansi_buf)); - /* Throw away control characters inside CSI sequences. - Convert two character 7-bit sequences into 8-bit sequences. */ - for (i = j = last_escape = 0; (ch = ansi_buf[i]) != 0; i++) { - if (ch == A_ESC) { - if (last_escape == A_ESC) { - pack_buf[j++] = A_ESC; - } - last_escape = A_ESC; - } else - if (last_escape == A_ESC && ch >= '@' && ch <= '_') { - pack_buf[j++] = last_escape = ch + 0x40; - } else - if (last_escape != A_CSI || (ch > 0x20 && ch != 0x80)) { - if (last_escape == A_ESC) { - pack_buf[j++] = A_ESC; - } - if (ch > 0x80 && ch < 0xa0) { - last_escape = ch; - } - pack_buf[j++] = ch; - } - } - if (last_escape == A_ESC) { - pack_buf[j++] = A_ESC; - } - pack_buf[j] = '\0'; - return; -} - -/* -** valid_mode(expected) -** -** read a terminal mode status report and parse the result -** Return TRUE if we got the expected terminating character. -*/ -static int -valid_mode(int expected) -{ - unsigned char *s; - int ch, terminator; - - read_ansi(); - - ape = 0; - ch = UChar(pack_buf[0]); - ansi_value[0] = 0; - if (ch != A_CSI && ch != A_DCS) - return FALSE; - - s = pack_buf + 1; - private_use = 0; - if ((*s >= '<') & (*s <= '?')) { - private_use = *s++; - } - terminator = 0; - for (; (ch = *s); s++) { - if (ch >= '0' && ch <= '9') - ansi_value[ape] = ansi_value[ape] * 10 + ch - '0'; - else if (ch == ';' || ch == ':') - ansi_value[++ape] = 0; - else if (ch >= '<' && ch <= '?') - private_use = ch; - else if (ch >= ' ') - terminator = (terminator << 8) | ch; - else - break; - } - return terminator == expected; -} - -/* -** read_reports() -** -** read all the reports in the ANSI report structure -*/ -static int -read_reports(void) -{ - int i, j, k, tc, vcr, lc; - char *s; - const char *t; - - lc = 5; - terminal_class = tc = 0; - for (i = 0; report_list[i].text; i++, lc++) { - if (terminal_class < report_list[i].lvl && - tc < report_list[i].lvl) { - put_crlf(); - menu_prompt(); - ptext("/status [q] > "); - j = wait_here(); - if (j != 'n' && j != 'N') - return 0; - tc = report_list[i].lvl; - lc = 1; - } else if (lc + 2 >= lines) { - put_crlf(); - ptext("Hit any key to continue "); - (void) wait_here(); - lc = 1; - } - sprintf(temp, "%s (%s) ", report_list[i].text, - expand_command(report_list[i].request)); - ptext(temp); - for (j = strlen(temp); j < 49; j++) - putchp(' '); - tc_putp(report_list[i].request); - vcr = 0; - if (report_list[i].final == 0) { - read_ansi(); - } else if (valid_mode(report_list[i].final)) - switch (report_list[i].final) { - case 'c': - terminal_class = ansi_value[0]; - break; - case 'R': - vcr = TRUE; - break; - } - j = UChar(pack_buf[0]); - if (j != A_CSI && j != A_DCS) { - put_crlf(); - t = "*** The above request gives illegal response ***"; - ptext(t); - for (j = strlen(t); j < 49; j++) - putchp(' '); - } - s = expand((const char *)ansi_buf); - if (char_count + expand_chars >= columns) { - put_str("\r\n "); - lc++; - } - putln(s); - if (vcr) { /* find out how big the screen is */ - tc_putp(report_list[i].request); - if (!valid_mode('R')) - continue; - j = ansi_value[0]; - k = ansi_value[1]; - tc_putp("\033[255B\033[255C\033[6n"); - if (!valid_mode('R')) - continue; - sprintf(temp, "\033[%d;%dH", j, k); - tc_putp(temp); - ptext("(DSR) Screen size (CSI 6 n)"); - for (j = char_count; j < 50; j++) - putchp(' '); - sprintf(temp, "%d x %d", ansi_value[1], ansi_value[0]); - ptextln(temp); - - } - } - menu_prompt(); - ptext("/status r->repeat test, to continue > "); - return wait_here(); -} - -/* -** request_cfss() -** -** Request Control function selection or settings -*/ -static int -request_cfss(void) -{ - int i, j, k, l, ch; - char *s; - - put_clear(); - ptextln("Request Expected Received"); - put_crlf(); - for (i = 0; rqss[i].text; i++) { - ptext(rqss[i].text); - j = strlen(rqss[i].text) + strlen(rqss[i].expect); - putchp(' '); - for (j++; j < 40; j++) - putchp(' '); - ptext(rqss[i].expect); - putchp(' '); - tc_putp(rqss[i].set_mode); - sprintf(temp, "\033P$q%s\033\\", rqss[i].request); - tc_putp(temp); - read_ansi(); - tc_putp(rqss[i].reset_mode); - putchp(' '); - for (j = 0; ansi_buf[j]; j++) { - if (ansi_buf[j] == 'r') { - for (k = j++; (ch = UChar(ansi_buf[k])) != 0; k++) - if (ch == A_ESC) { - break; - } else if (ch == A_ST) { - break; - } - ansi_buf[k] = '\0'; - s = expand((const char *)&ansi_buf[j]); - if (char_count + expand_chars >= columns) - put_str("\r\n "); - put_str(s); - } - } - put_crlf(); - } - /* calculate the valid attributes */ - ptext("Valid attributes: 0"); - j = 0; - for (i = 1; i < 20; i++) { - sprintf(temp, "\033[0;%dm\033P$qm\033\\", i); - tc_putp(temp); - (void) valid_mode('m'); - if (ape > 0) { - j = i; - sprintf(temp, "\033[0m; %d", i); - tc_putp(temp); - } - } - put_crlf(); - /* calculate how many parameters can be sent */ - ptext("Max number of parameters: "); - sprintf(temp, "%dm\033P$qm\033\\", j); - l = -1; - if (j > 0) - for (l = 1; l < 33; l++) { - tc_putp("\033[0"); - for (ch = 1; ch <= l; ch++) - put_this(';'); - tc_putp(temp); - (void) valid_mode('m'); - if (ape == 0) - break; - } - tc_putp("\033[m"); - if (l >= 0) { - sprintf(temp, "%d", l); - ptext(temp); - } else - ptext("unknown"); - put_crlf(); - return wait_here(); -} - -/* -** mode_display(puc, mode, initial, set, reset) -** -** print the mode display entry -*/ -static void -mode_display(const char *p, int n, int c, char s, char r) -{ - int k; - - sprintf(temp, "%s%d (%c, %c, %c)", p, n, c, s, r); - k = strlen(temp); - if (char_count + k >= columns) - put_crlf(); - for (; k < 14; k++) - putchp(' '); - put_str(temp); -} - -/* -** terminal_state() -** -** test DECRQM status reports -*/ -static void -terminal_state(void) -{ - static const char *puc[] = {"", "<", "=", ">", "?", 0}; - - int i, j, k, l, modes_found; - char *s; - char buf[256], tms[256]; - int mode_puc[MAX_MODES], mode_number[MAX_MODES]; - char set_value[MAX_MODES], reset_value[MAX_MODES]; - char current_value[MAX_MODES]; - - ptext("Testing terminal mode status. (CSI 0 $ p)"); - tc_putp("\033[0$p"); - modes_found = 0; - tms[0] = '\0'; - if (valid_mode(('$' << 8) | 'y')) { - for (i = 0; puc[i]; i++) { - put_crlf(); - if (i) { - sprintf(temp, "Private use: %c", puc[i][0]); - } else { - strcpy(temp, "Standard modes:"); - } - k = strlen(temp); - ptext(temp); - for (j = 0; j < (int) sizeof(buf); buf[j++] = ' ') - ; - for (j = l = 0; j < 255 && j - l < 50; j++) { - sprintf(temp, "\033[%s%d$p", puc[i], j); - tc_putp(temp); - if (!valid_mode(('$' << 8) | 'y')) { - /* not valid, save terminating value */ - s = expand((const char *)ansi_buf); - sprintf(tms, "%s%s%d %s ", tms, - puc[i], j, s); - break; - } - if (private_use != puc[i][0]) - break; - if (ansi_value[0] != j) - break; - if (ansi_value[1]) { - l = j; - if (k > 70) { - buf[k] = '\0'; - put_crlf(); - ptextln(buf); - for (k = 0; k < (int) sizeof(buf);) { - buf[k++] = ' '; - } - k = 0; - } - sprintf(temp, " %d", j); - ptext(temp); - k += strlen(temp); - buf[k - 1] = ansi_value[1] + '0'; - if (modes_found >= MAX_MODES) - continue; - current_value[modes_found] = - ansi_value[1] + '0'; - /* some modes never return */ - if ((i == 0 && j == 13) /* control execution */ - || (puc[i][0] == '?' && j == 2)) /* VT52 */ - set_value[modes_found] = - reset_value[modes_found] = '-'; - else - set_value[modes_found] = - reset_value[modes_found] = ' '; - mode_puc[modes_found] = i; - mode_number[modes_found++] = j; - } - } - buf[k] = '\0'; - if (buf[k - 1] != ' ') { - put_crlf(); - ptext(buf); - } - } - - if ((i = modes_found) != 0) { - put_crlf(); - put_crlf(); - if (tms[0]) { - ptextln(tms); - } - ptext("Hit 'Y' to test mode set/reset states: "); - i = wait_here(); - } - if (i == 'y' || i == 'Y') - while (1) { -#ifdef STATUSFIX - FILE *fp; - -#ifdef TEDANSI - fp = fopen("ted.ansi", "w"); -#else - fp = fopen("/dev/console", "w"); -#endif -#endif - for (i = j = 0; j < modes_found; j = ++i >> 1) { - if (set_value[j] == '-') - continue; - k = (current_value[j] ^ i) & 1; - sprintf(temp, "\033[%s%d%c\033[%s%d$p", - puc[mode_puc[j]], mode_number[j], - k ? 'l' : 'h', - puc[mode_puc[j]], mode_number[j]); -#ifdef STATUSFIX - if (fp) { - fprintf(fp, "%s\n", expand(temp)); - fflush(fp); - } -#endif - tc_putp(temp); - if (!valid_mode(('$' << 8) | 'y')) - continue; - if (k) { - reset_value[j] = ansi_value[1] + '0'; - } else { - set_value[j] = ansi_value[1] + '0'; - } - } - put_str("\033[30l"); /* added for GORT bug - (WY-185) */ -#ifdef STATUSFIX - if (fp) - fclose(fp); -#endif - tty_set(); - /* print the results */ - put_clear(); - putln("mode (initial, set, reset)"); - for (j = 0; j < modes_found; j++) { - mode_display(puc[mode_puc[j]], mode_number[j], - current_value[j], set_value[j], reset_value[j]); - } - ptext("\n\nHit 'R' to repeat test. 'S' to sort results: "); - i = wait_here(); - if (i == 's' || i == 'S') { /* print the same stuff, - sorted by - current_value */ - put_crlf(); - for (i = '1'; i <= '4'; i++) { - for (j = 0; j < modes_found; j++) { - if (current_value[j] == i) - mode_display(puc[mode_puc[j]], - mode_number[j], current_value[j], - set_value[j], reset_value[j]); - } - } - ptext("\n\nHit 'R' to repeat test: "); - i = wait_here(); - } - if (i != 'r' && i != 'R') - break; - tty_raw(1, char_mask); - } - } else { - tty_set(); - } -} - - -/* -** ansi_report_help() -** -** Display the informational data for the ANSI report test. -*/ -static void -ansi_report_help(void) -{ - ptext("Begin ANSI status report testing. "); - ptext(" Parity bit set will be displayed in reverse video. "); - ptext(" If the terminal hangs, hit any alphabetic key. "); - ptextln(" Use n to continue testing. Use q to quit."); - put_crlf(); -} - -/* -** test_ansi_reports() -** -** Test the ANSI status report functions -*/ -void -tools_status( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - int i; - - put_clear(); - ansi_report_help(); - tty_raw(1, char_mask); - - do { - i = read_reports(); - if (i != 'r' && i != 'R') { - *ch = i; - return; - } - } while (i); - - if (terminal_class >= 63) { - do { - i = request_cfss(); - } while (i == 'r' || i == 'R'); - *ch = i; - terminal_state(); - } else { - tty_set(); - } -} - - -/* -** display_sgr() -** -** Test a range of ANSI sgr attributes -** puc -> Private Use Character -*/ -static void -display_sgr(int puc) -{ - int k; - - temp[0] = puc; - temp[1] = '\0'; - for (k = 0; k < 80; k++) { - if (char_count + 8 > 80) - put_crlf(); - else if (char_count + 8 > columns) - put_crlf(); - else if (k > 0) - printf(" "); - printf("\033[%s%dmMode %2d\033[0m", temp, k, k); - char_count += 8; - if (puc == '\0') { - if (k == 19) - printf("\033[10m"); - if (k == 39) - printf("\033[37m"); - if (k == 49) - printf("\033[40m"); - } - } - put_crlf(); - if (puc == '<') - printf("\033[<1m"); - else if (puc) - printf("\033[%s0m", temp); - set_attr(0); -} - -/* -** print_sgr20(on, off) -** -** print the sgr line for sgr20() -*/ -static void -print_sgr20(int on, int off) -{ - if (char_count > columns - 13) { - put_crlf(); - } else if (char_count) { - put_str(" "); - } - char_count += 11; - printf("%d/%d \033[%dmon\033[%dm off\033[0m", on, off, on, off); -} - -/* -** sgr20(void) -** -** display the enter/exit attributes 1-9 and 20-29 -*/ -static void -sgr20(void) -{ - int k; - - put_crlf(); - ptextln("Test enter/exit attributes 1-9 and 21-29."); - for (k = 1; k < 10; k++) { - print_sgr20(k, k + 20); - } - print_sgr20(1, 22); /* bold */ - print_sgr20(2, 22); /* dim */ - print_sgr20(8, 22); /* blank */ - printf("\033[0m"); - set_attr(0); -} - -/* -** tools_sgr(testlist, state, ch) -** -** Run the ANSI graphics rendition mode tool -** Return the last character typed. -*/ -void -tools_sgr( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - int k; - - put_clear(); - for (k = 0;;) { - display_sgr(k); - put_crlf(); - menu_prompt(); - ptext("/sgr Enter =>] > "); - k = wait_here(); - if ((k == 'r') || (k == 'R')) { - k = 0; - } else if ((k < '<') || (k > '?')) { - break; - } - } - sgr20(); - - put_newlines(2); - *ch = REQUEST_PROMPT; -} - -/***************************************************************************** - * - * Test ANSI graphics - * - *****************************************************************************/ -/* -** select_bank(bank) -** -** select a graphics character set for ANSI terminals -*/ -static void -select_bank(char *bank) -{ - tc_putp(bank); - switch (bank[1] & 3) { - case 0: - putchp('O' & 0x1f); /* control O */ - break; - case 1: - putchp('N' & 0x1f); /* control N */ - tc_putp("\033~"); - break; - case 2: - tc_putp("\033n\033}"); - break; - case 3: - tc_putp("\033o\033|"); - break; - } -} - -/* -** show_characters(bank, bias) -** -** print the ANSI graphics characters -*/ -static void -show_characters(char *bank, int bias) -{ - int i; - - sprintf(temp, "G%d GL ", bank[1] & 3); - ptext(temp); - select_bank(bank); - for (i = ' '; i < 0x80; i++) { - if (char_count >= columns || - (i != ' ' && (i & 31) == 0)) - put_str("\n "); - putchp(i + bias); - } - select_bank(default_bank); - put_str(" DEL <"); - select_bank(bank); - putchp(0x7f + bias); - select_bank(default_bank); - putchp('>'); - put_crlf(); - put_crlf(); -} - - -/* ANSI graphics test - 94 96 character sets - G0 ( , - G1 ) - - G2 * . - G3 + / - -Standard Definitions - A UK - B US ASCII - -Dec extended definitions - 0 Special graphics - - */ - -/* -** tools_charset(testlist, state, ch) -** -** Run the ANSI alt-charset mode tool -*/ -void -tools_charset( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *chp GCC_UNUSED) -{ - int j, ch; - char bank[32]; - - put_clear(); - ptext("Enter the bank ()*+,-./ followed by the character set"); - ptext(" 0123456789:;<=>? for private use, and"); - ptextln(" @A...Z[\\]^_`a...z{|}~ for standard sets."); - strcpy(bank, "\033)0"); - for (; bank[0];) { - put_crlf(); - show_characters(bank, 0); - - /* G0 will not print in GR */ - if (bank[1] & 3) { - show_characters(bank, 0x80); - } - ptext("bank+set> "); - for (j = 1; (ch = getchp(char_mask)); j++) { - if (ch == EOF) - break; - putchp(ch); - if (j == 1 && ch > '/') - j++; - bank[j] = ch; - if (ch < ' ' || ch > '/') - break; - if (j + 1 >= (int) sizeof(bank)) - break; - } - if (j == 1) - break; - if (bank[j] < '0' || bank[j] > '~') - break; - bank[j + 1] = '\0'; - } - put_crlf(); -} diff --git a/tack/charset.c b/tack/charset.c deleted file mode 100644 index 9783792a..00000000 --- a/tack/charset.c +++ /dev/null @@ -1,711 +0,0 @@ -/* -** Copyright (C) 1991, 1997-2000 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: charset.c,v 1.11 2006/11/26 00:13:36 tom Exp $") - -/* - Menu definitions for alternate character set and SGR tests. -*/ - -static void charset_bel(struct test_list *t, int *state, int *ch); -static void charset_flash(struct test_list *t, int *state, int *ch); -static void charset_civis(struct test_list *t, int *state, int *ch); -static void charset_cvvis(struct test_list *t, int *state, int *ch); -static void charset_cnorm(struct test_list *t, int *state, int *ch); -static void charset_hs(struct test_list *t, int *state, int *ch); -static void charset_status(struct test_list *t, int *state, int *ch); -static void charset_dsl(struct test_list *t, int *state, int *ch); -static void charset_enacs(struct test_list *t, int *state, int *ch); -static void charset_smacs(struct test_list *t, int *state, int *ch); -static void charset_attributes(struct test_list *t, int *state, int *ch); -static void charset_sgr(struct test_list *t, int *state, int *ch); - -struct test_list acs_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_NEXT, 3, "bel", 0, 0, charset_bel, 0}, - {MENU_NEXT, 3, "flash", 0, 0, charset_flash, 0}, - {MENU_NEXT, 3, "civis", 0, 0, charset_civis, 0}, - {MENU_NEXT, 3, "cvvis", 0, 0, charset_cvvis, 0}, - {MENU_NEXT, 3, "cnorm", 0, 0, charset_cnorm, 0}, - {MENU_NEXT, 3, "hs", 0, 0, charset_hs, 0}, - {MENU_NEXT, 3, "tsl) (fsl) (wsl", "hs", 0, charset_status, 0}, - {MENU_NEXT, 3, "dsl", "hs", 0, charset_dsl, 0}, - {MENU_NEXT, 0, "acsc) (enacs) (smacs) (rmacs", 0, 0, charset_enacs, 0}, - {MENU_NEXT, 0, "smacs) (rmacs", 0, 0, charset_smacs, 0}, - {MENU_NEXT, 11, 0, 0, 0, charset_attributes, 0}, - {MENU_NEXT, 11, "sgr) (sgr0", "ma", 0, charset_sgr, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -const struct mode_list alt_modes[] = { - {"normal", "(sgr0)", "(sgr0)", 1}, - {"standout", "(smso)", "(rmso)", 2}, - {"underline", "(smul)", "(rmul)", 4}, - {"reverse", "(rev)", "(sgr0)", 8}, - {"blink", "(blink)", "(sgr0)", 16}, - {"dim", "(dim)", "(sgr0)", 32}, - {"bold", "(bold)", "(sgr0)", 64}, - {"invis", "(invis)", "(sgr0)", 128}, - {"protect", "(prot)", "(sgr0)", 256}, - {"altcharset", "(smacs)", "(rmacs)", 512} -}; - -/* On many terminals the underline attribute is the last scan line. - This is OK unless the following line is reverse video. - Then the underline attribute does not show up. The following map - will reorder the display so that the underline attribute will - show up. */ -const int mode_map[10] = {0, 1, 3, 4, 5, 6, 7, 8, 9, 2}; - -struct graphics_pair { - unsigned char c; - const char *name; -}; - -static struct graphics_pair glyph[] = { - {'+', "arrow pointing right"}, - {',', "arrow pointing left"}, - {'.', "arrow pointing down"}, - {'0', "solid square block"}, - {'i', "lantern symbol"}, - {'-', "arrow pointing up"}, - {'`', "diamond"}, - {'a', "checker board (stipple)"}, - {'f', "degree symbol"}, - {'g', "plus/minus"}, - {'h', "board of squares"}, - {'j', "lower right corner"}, - {'k', "upper right corner"}, - {'l', "upper left corner"}, - {'m', "lower left corner"}, - {'n', "plus"}, - {'o', "scan line 1"}, - {'p', "scan line 3"}, - {'q', "horizontal line"}, - {'r', "scan line 7"}, - {'s', "scan line 9"}, - {'t', "left tee (|-)"}, - {'u', "right tee (-|)"}, - {'v', "bottom tee(_|_)"}, - {'w', "top tee (T)"}, - {'x', "vertical line"}, - {'y', "less/equal"}, - {'z', "greater/equal"}, - {'{', "Pi"}, - {'|', "not equal"}, - {'}', "UK pound sign"}, - {'~', "bullet"}, - {'\0', "\0"} -}; - -/* -** charset_hs(test_list, status, ch) -** -** (hs) test Has status line -*/ -static void -charset_hs( - struct test_list *t, - int *state, - int *ch) -{ - if (has_status_line != 1) { - ptext("(hs) Has-status line is not defined. "); - generic_done_message(t, state, ch); - } -} - -/* -** charset_status(test_list, status, ch) -** -** (tsl) (fsl) (wsl) test Status line -*/ -static void -charset_status( - struct test_list *t, - int *state, - int *ch) -{ - int i, max; - char *s; - static char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789."; - - if (has_status_line != 1) { - return; - } - put_clear(); - max = width_status_line == -1 ? columns : width_status_line; - sprintf(temp, "Terminal has status line of %d characters", max); - ptextln(temp); - - put_str("This line s"); - s = TPARM_1(to_status_line, 0); - tc_putp(s); - for (i = 0; i < max; i++) - putchp(m[i]); - tc_putp(from_status_line); - putln("hould not be broken."); - ptextln("If the previous line is not a complete sentence then (tsl) to-status-line, (fsl) from-status-line, or (wsl) width-of-status-line is incorrect." ); - generic_done_message(t, state, ch); -} - -/* -** charset_dsl(test_list, status, ch) -** -** (dsl) test Disable status line -*/ -static void -charset_dsl( - struct test_list *t, - int *state, - int *ch) -{ - if (has_status_line != 1) { - return; - } - if (dis_status_line) { - ptextln("Disable status line (dsl)"); - tc_putp(dis_status_line); - ptext("If you can still see the status line then (dsl) disable-status-line has failed. "); - } else { - ptext("(dsl) Disable-status-line is not defined. "); - } - generic_done_message(t, state, ch); -} - - -void -eat_cookie(void) -{ /* put a blank if this is not a magic cookie - terminal */ - if (magic_cookie_glitch < 1) - putchp(' '); -} - - -void -put_mode(char *s) -{ /* send the attribute string (with or without - % execution) */ - tc_putp(TPARM_0(s)); /* allow % execution */ -} - - -void -set_attr(int a) -{ /* set the attribute from the bits in a */ - int i, b[32]; - - if (magic_cookie_glitch > 0) { - char_count += magic_cookie_glitch; - } - if (a == 0 && exit_attribute_mode) { - put_mode(exit_attribute_mode); - return; - } - for (i = 0; i < 31; i++) { - b[i] = (a >> i) & 1; - } - tc_putp(TPARM_9(set_attributes, b[1], b[2], b[3], b[4], b[5], - b[6], b[7], b[8], b[9])); -} - -/* -** charset_sgr(test_list, status, ch) -** -** (sgr) test Set Graphics Rendition -*/ -static void -charset_sgr( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!set_attributes) { - ptext("(sgr) Set-graphics-rendition is not defined. "); - generic_done_message(t, state, ch); - return; - } - if (!exit_attribute_mode) { - ptextln("(sgr0) Set-graphics-rendition-zero is not defined."); - /* go ahead and test anyway */ - } - ptext("Test video attributes (sgr)"); - - for (i = 0; i < (int) (sizeof(alt_modes) / sizeof(struct mode_list)); - i++) { - put_crlf(); - sprintf(temp, "%d %-20s", i, alt_modes[i].name); - put_str(temp); - set_attr(alt_modes[i].number); - sprintf(temp, "%s", alt_modes[i].name); - put_str(temp); - set_attr(0); - } - - putln("\n\nDouble mode test"); - for (i = 0; i <= 9; i++) { - sprintf(temp, " %2d ", mode_map[i]); - put_str(temp); - } - for (i = 0; i <= 9; i++) { - put_crlf(); - sprintf(temp, "%d", mode_map[i]); - put_str(temp); - for (j = 0; j <= 9; j++) { - eat_cookie(); - set_attr((1 << mode_map[i]) | (1 << mode_map[j])); - put_str("Aa"); - set_attr(0); - if (j < 9) - eat_cookie(); - } - } - put_crlf(); - -#ifdef max_attributes - if (max_attributes >= 0) { - sprintf(temp, "(ma) Maximum attributes %d ", max_attributes); - ptext(temp); - } -#endif - generic_done_message(t, state, ch); -} - -/* -** test_one_attr(mode-number, begin-string, end-string) -** -** Display one attribute line. -*/ -static void -test_one_attr( - int n, - char *begin_mode, - char *end_mode) -{ - int i; - - sprintf(temp, "%-10s %s ", alt_modes[n].name, alt_modes[n].begin_mode); - ptext(temp); - for (; char_count < 19;) { - putchp(' '); - } - if (begin_mode) { - putchp('.'); - put_mode(begin_mode); - put_str(alt_modes[n].name); - for (i = strlen(alt_modes[n].name); i < 13; i++) { - putchp(' '); - } - if (end_mode) { - put_mode(end_mode); - sprintf(temp, ". %s", alt_modes[n].end_mode); - } else { - set_attr(0); - strcpy(temp, ". (sgr)"); - } - ptextln(temp); - } else { - for (i = 0; i < magic_cookie_glitch; i++) - putchp('*'); - put_str("*** missing ***"); - for (i = 0; i < magic_cookie_glitch; i++) - putchp('*'); - put_crlf(); - } -} - -/* -** charset_attributes(test_list, status, ch) -** -** Test SGR -*/ -static void -charset_attributes( - struct test_list *t, - int *state, - int *ch) -{ - putln("Test video attributes"); - test_one_attr(1, enter_standout_mode, exit_standout_mode); - test_one_attr(2, enter_underline_mode, exit_underline_mode); - test_one_attr(9, enter_alt_charset_mode, exit_alt_charset_mode); - if (!exit_attribute_mode && !set_attributes) { - ptextln("(sgr0) exit attribute mode is not defined."); - generic_done_message(t, state, ch); - return; - } - test_one_attr(3, enter_reverse_mode, exit_attribute_mode); - test_one_attr(4, enter_blink_mode, exit_attribute_mode); - test_one_attr(5, enter_dim_mode, exit_attribute_mode); - test_one_attr(6, enter_bold_mode, exit_attribute_mode); - test_one_attr(7, enter_secure_mode, exit_attribute_mode); - test_one_attr(8, enter_protected_mode, exit_attribute_mode); - generic_done_message(t, state, ch); -} - -#define GLYPHS 256 - -/* -** charset_smacs(test_list, status, ch) -** -** display all possible acs characters -** (smacs) (rmacs) -*/ -static void -charset_smacs( - struct test_list *t, - int *state, - int *ch) -{ - int i, c; - - if (enter_alt_charset_mode) { - put_clear(); - ptextln("The following characters are available. (smacs) (rmacs)"); - for (i = ' '; i <= '`'; i += 32) { - put_crlf(); - put_mode(exit_alt_charset_mode); - for (c = 0; c < 32; c++) { - putchp(c + i); - } - put_crlf(); - put_mode(enter_alt_charset_mode); - for (c = 0; c < 32; c++) { - putchp(c + i); - } - put_mode(exit_alt_charset_mode); - put_crlf(); - } - put_mode(exit_alt_charset_mode); - put_crlf(); - generic_done_message(t, state, ch); - } -} - - -static void -test_acs( - int attr) -{ /* alternate character set */ - int i, j; - char valid_glyph[GLYPHS]; - char acs_table[GLYPHS]; - static unsigned char vt100[] = "`afgjklmnopqrstuvwxyz{|}~"; - - line_count = 0; - for (i = 0; i < GLYPHS; i++) { - valid_glyph[i] = FALSE; - acs_table[i] = i; - } - if (acs_chars) { - sprintf(temp, "Alternate character set map: %s", - expand(acs_chars)); - putln(temp); - for (i = 0; acs_chars[i]; i += 2) { - if (acs_chars[i + 1] == 0) { - break; - } - for (j = 0;; j++) { - if (glyph[j].c == (unsigned char) acs_chars[i]) { - acs_table[glyph[j].c] = acs_chars[i + 1]; - valid_glyph[glyph[j].c] = TRUE; - break; - } - if (glyph[j].name[0] == '\0') { - if (isgraph(UChar(acs_chars[i]))) { - sprintf(temp, " %c", - acs_chars[i]); - } else { - sprintf(temp, " 0x%02x", - UChar(acs_chars[i])); - } - strcpy(&temp[5], " *** has no mapping ***"); - putln(temp); - break; - } - } - } - } else { - ptextln("acs_chars not defined (acsc)"); - /* enable the VT-100 graphics characters (default) */ - for (i = 0; vt100[i]; i++) { - valid_glyph[vt100[i]] = TRUE; - } - } - if (attr) { - set_attr(attr); - } - _nc_init_acs(); /* puts 'ena_acs' and incidentally links acs_map[] */ - for (i = 0; glyph[i].name[0]; i++) { - if (valid_glyph[glyph[i].c]) { - put_mode(enter_alt_charset_mode); - put_this(acs_table[glyph[i].c]); - char_count++; - put_mode(exit_alt_charset_mode); - if (magic_cookie_glitch >= 1) { - sprintf(temp, " %-30.30s", glyph[i].name); - put_str(temp); - if (char_count + 33 >= columns) - put_crlf(); - } else { - sprintf(temp, " %-24.24s", glyph[i].name); - put_str(temp); - if (char_count + 26 >= columns) - put_crlf(); - } - if (line_count >= lines) { - (void) wait_here(); - put_clear(); - } - } - } - if (char_count > 1) { - put_crlf(); - } -#ifdef ACS_ULCORNER - maybe_wait(5); - put_mode(enter_alt_charset_mode); - put_that(ACS_ULCORNER); - put_that(ACS_TTEE); - put_that(ACS_URCORNER); - put_that(ACS_ULCORNER); - put_that(ACS_HLINE); - put_that(ACS_URCORNER); - char_count += 6; - put_mode(exit_alt_charset_mode); - put_crlf(); - put_mode(enter_alt_charset_mode); - put_that(ACS_LTEE); - put_that(ACS_PLUS); - put_that(ACS_RTEE); - put_that(ACS_VLINE); - if (magic_cookie_glitch >= 1) - put_this(' '); - else { - put_mode(exit_alt_charset_mode); - put_this(' '); - put_mode(enter_alt_charset_mode); - } - put_that(ACS_VLINE); - char_count += 6; - put_mode(exit_alt_charset_mode); - put_str(" Here are 2 boxes"); - put_crlf(); - put_mode(enter_alt_charset_mode); - put_that(ACS_LLCORNER); - put_that(ACS_BTEE); - put_that(ACS_LRCORNER); - put_that(ACS_LLCORNER); - put_that(ACS_HLINE); - put_that(ACS_LRCORNER); - char_count += 6; - put_mode(exit_alt_charset_mode); - put_crlf(); -#endif -} - -/* -** charset_bel(test_list, status, ch) -** -** (bel) test Bell -*/ -static void -charset_bel( - struct test_list *t, - int *state, - int *ch) -{ - if (bell) { - ptextln("Testing bell (bel)"); - tc_putp(bell); - ptext("If you did not hear the Bell then (bel) has failed. "); - } else { - ptext("(bel) Bell is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** charset_flash(test_list, status, ch) -** -** (flash) test Visual bell -*/ -static void -charset_flash( - struct test_list *t, - int *state, - int *ch) -{ - if (flash_screen) { - ptextln("Testing visual bell (flash)"); - tc_putp(flash_screen); - ptext("If you did not see the screen flash then (flash) has failed. "); - } else { - ptext("(flash) Flash is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** charset_civis(test_list, status, ch) -** -** (civis) test Cursor invisible -*/ -static void -charset_civis( - struct test_list *t, - int *state, - int *ch) -{ - if (cursor_normal) { - if (cursor_invisible) { - ptext("(civis) Turn off the cursor. "); - tc_putp(cursor_invisible); - ptext("If you can still see the cursor then (civis) has failed. "); - } else { - ptext("(civis) Cursor-invisible is not defined. "); - } - generic_done_message(t, state, ch); - tc_putp(cursor_normal); - } -} - -/* -** charset_cvvis(test_list, status, ch) -** -** (cvvis) test Cursor very visible -*/ -static void -charset_cvvis( - struct test_list *t, - int *state, - int *ch) -{ - if (cursor_normal) { - if (cursor_visible) { - ptext("(cvvis) Make cursor very visible. "); - tc_putp(cursor_visible); - ptext("If the cursor is not very visible then (cvvis) has failed. "); - } else { - ptext("(cvvis) Cursor-very-visible is not defined. "); - } - generic_done_message(t, state, ch); - tc_putp(cursor_normal); - } -} - -/* -** charset_cnorm(test_list, status, ch) -** -** (cnorm) test Cursor normal -*/ -static void -charset_cnorm( - struct test_list *t, - int *state, - int *ch) -{ - if (cursor_normal) { - ptext("(cnorm) Normal cursor. "); - tc_putp(cursor_normal); - ptext("If the cursor is not normal then (cnorm) has failed. "); - } else { - ptext("(cnorm) Cursor-normal is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** charset_enacs(test_list, status, ch) -** -** test Alternate character set mode and alternate characters -** (acsc) (enacs) (smacs) (rmacs) -*/ -static void -charset_enacs( - struct test_list *t, - int *state, - int *ch) -{ - int c, i; - - if (enter_alt_charset_mode || acs_chars) { - c = 0; - while (1) { - put_clear(); - /* - for terminals that use separate fonts for - attributes (such as X windows) the line - drawing characters must be checked for - each font. - */ - if (c >= '0' && c <= '9') { - test_acs(alt_modes[c - '0'].number); - set_attr(0); - } else { - test_acs(0); - } - - while (1) { - ptextln("[r] to repeat, [012345789] to test with attributes on, [?] for a list of attributes, anything else to go to next test. "); - generic_done_message(t, state, ch); - if (*ch != '?') { - break; - } - for (i = 0; i <= 9; i++) { - sprintf(temp, " %d %s %s", i, alt_modes[i].begin_mode, - alt_modes[i].name); - ptextln(temp); - } - } - if (*ch >= '0' && *ch <= '9') { - c = *ch; - } else - if (*ch != 'r') { - break; - } - } - } else { - ptext("(smacs) Enter-alt-char-set-mode and (acsc) Alternate-char-set are not defined. "); - generic_done_message(t, state, ch); - } -} - -/* -** charset_can_test() -** -** Initialize the can_test data base -*/ -void -charset_can_test(void) -{ - int i; - - for (i = 0; i < 9; i++) { - can_test(alt_modes[i].begin_mode, FLAG_CAN_TEST); - can_test(alt_modes[i].end_mode, FLAG_CAN_TEST); - } -} diff --git a/tack/color.c b/tack/color.c deleted file mode 100644 index 6fea231e..00000000 --- a/tack/color.c +++ /dev/null @@ -1,769 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: color.c,v 1.7 2006/11/26 00:14:25 tom Exp $") - -/* - * Color terminal tests. Has only one entry point: test_color(). - */ - -static void color_check(struct test_list *, int *, int *); -static void color_setf(struct test_list *, int *, int *); -static void color_matrix(struct test_list *, int *, int *); -static void color_ncv(struct test_list *, int *, int *); -static void color_ccc(struct test_list *, int *, int *); -static void color_bce(struct test_list *, int *, int *); - -struct test_list color_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_NEXT, 2, "colors) (pairs", 0, 0, color_check, 0}, - {MENU_NEXT, 12, "setf) (setb) (scp", 0, 0, color_setf, 0}, - {MENU_NEXT, 24, "op", 0, 0, color_matrix, 0}, - {MENU_NEXT, 16, "ncv", 0, 0, color_ncv, 0}, - {MENU_NEXT, 0, "bce", 0, 0, color_bce, 0}, - {MENU_NEXT | MENU_CLEAR, 0, "ccc) (initc) (initp", "hls op oc", 0, color_ccc, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -#ifndef COLOR_BLACK -#define COLOR_BLACK 0 -#define COLOR_BLUE 1 -#define COLOR_GREEN 2 -#define COLOR_CYAN 3 -#define COLOR_RED 4 -#define COLOR_MAGENTA 5 -#define COLOR_YELLOW 6 -#define COLOR_WHITE 7 -#endif - -struct color_table { - const char *name; - int index; - int r, g, b; - int h, l, s; -}; - -static struct color_table def_colors[8] = { - {"black ", COLOR_BLACK, 0, 0, 0, 0, 0, 0}, - {"blue ", COLOR_BLUE, 0, 0, 1000, 330, 50, 100}, - {"green ", COLOR_GREEN, 0, 1000, 0, 240, 50, 100}, - {"cyan ", COLOR_CYAN, 0, 1000, 1000, 300, 50, 100}, - {"red ", COLOR_RED, 1000, 0, 0, 120, 50, 100}, - {"magenta", COLOR_MAGENTA, 1000, 0, 1000, 60, 50, 100}, - {"yellow ", COLOR_YELLOW, 1000, 1000, 0, 180, 50, 100}, - {"white ", COLOR_WHITE, 1000, 1000, 1000, 0, 100, 0} -}; - -#define MAX_PAIR 256 -static int fg_color[MAX_PAIR] = {COLOR_BLACK, COLOR_BLUE, COLOR_GREEN, -COLOR_CYAN, COLOR_RED, COLOR_MAGENTA, COLOR_YELLOW, COLOR_WHITE}; -static int bg_color[MAX_PAIR] = {COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, -COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, COLOR_BLACK}; -static int pairs_used = 8; -static int a_bright_color, bright_value; -static int cookie_monster, color_step, colors_per_line; -static int R, G, B; - -static void reset_colors(void) -{ - tc_putp(orig_colors); - tc_putp(TPARM_0(orig_pair)); -} - -static int -color_trans(int c) -{ /* translate or load the color */ - int i; - - for (i = 0; i < pairs_used; i++) { - if (fg_color[i] == c) { - return i; - } - } - if (!can_change) { - return 0; - } - if (pairs_used > max_colors || pairs_used >= MAX_PAIR) { - pairs_used = 0; - ptextln("Ran out of colors"); - } - fg_color[pairs_used] = c; - bg_color[pairs_used] = c; - if (hue_lightness_saturation) { - tc_putp(TPARM_4(initialize_color, pairs_used, - def_colors[c].h, def_colors[c].l, def_colors[c].s)); - } else { - tc_putp(TPARM_4(initialize_color, pairs_used, - def_colors[c].r, def_colors[c].g, def_colors[c].b)); - } - return pairs_used++; -} - -static void -new_color( - int fg, - int bg, - int hungry) -{ /* change the color to fg and bg. */ - int i; - - if (hungry) { - eat_cookie(); - } - if (set_a_foreground) { - /* set ANSI color (setaf) (setab) */ - tc_putp(TPARM_1(set_a_foreground, fg)); - tc_putp(TPARM_1(set_a_background, bg)); - } else if (set_foreground) { - /* make sure black is zero */ - (void) color_trans(COLOR_BLACK); - tc_putp(TPARM_1(set_foreground, color_trans(fg))); - tc_putp(TPARM_1(set_background, color_trans(bg))); - } else { /* set color pair */ - for (i = 0; i < pairs_used; i++) { - if (fg_color[i] == fg && bg_color[i] == bg) { - tc_putp(TPARM_1(set_color_pair, i)); - if (hungry) { - eat_cookie(); - } - return; - } - } - if (!can_change) { - /* try to set just the foreground */ - for (i = pairs_used - 1; i; i--) { - if (fg_color[i] == fg) - break; - } - tc_putp(TPARM_1(set_color_pair, i)); - if (hungry) { - eat_cookie(); - } - return; - } - if (pairs_used > max_pairs || pairs_used >= MAX_PAIR) { - pairs_used = 0; - ptextln("Ran out of color pairs"); - } - fg_color[pairs_used] = fg; - bg_color[pairs_used] = bg; - if (hue_lightness_saturation) { - tc_putp(TPARM_7(initialize_pair, pairs_used, - def_colors[fg].h, def_colors[fg].l, def_colors[fg].s, - def_colors[bg].h, def_colors[bg].l, def_colors[bg].s)); - } else { - tc_putp(TPARM_7(initialize_pair, pairs_used, - def_colors[fg].r, def_colors[fg].g, def_colors[fg].b, - def_colors[bg].r, def_colors[bg].g, def_colors[bg].b)); - } - tc_putp(TPARM_1(set_color_pair, pairs_used)); - pairs_used++; - } - if (hungry) { - eat_cookie(); - } -} - - -static void -set_color_step(void) -{ /* set the color_step for the (ccc) display */ - int i; - - for (i = 2; i < 1000; i++) { - if ((i * i * i) >= max_colors) { - break; - } - } - color_step = 1000 / (i - 1); -} - - -static void -rgb_2_hls(int r, int g, int b, int *h, int *l, int *s) -{ /* convert RGB to HLS system */ - int min, max, t; - - if ((min = g < r ? g : r) > b) { - min = b; - } - if ((max = g > r ? g : r) < b) { - max = b; - } - - /* calculate lightness */ - *l = (min + max) / 20; - - if (min == max) { /* black, white and all shades of gray */ - *h = 0; - *s = 0; - return; - } - /* calculate saturation */ - if (*l < 50) { - *s = ((max - min) * 100) / (max + min); - } else { - *s = ((max - min) * 100) / (2000 - max - min); - } - - /* calculate hue */ - if (r == max) { - t = 120 + ((g - b) * 60) / (max - min); - } else if (g == max) { - t = 240 + ((b - r) * 60) / (max - min); - } else { - t = 360 + ((r - g) * 60) / (max - min); - } - *h = t % 360; -} - - -static void -send_color(int p, int r, int g, int b) -{ /* send the initialize_color (initc) command */ - int h, l, s; - - if (hue_lightness_saturation) { - rgb_2_hls(r, g, b, &h, &l, &s); - tc_putp(TPARM_4(initialize_color, p, h, l, s)); - } else { - tc_putp(TPARM_4(initialize_color, p, r, g, b)); - } -} - - -static void -send_pair(int p, int fr, int fg, int fb, int br, int bg, int bb) -{ /* send the initialize_pair (initp) command */ - int fh, fl, fs, bh, bl, bs; - - if (hue_lightness_saturation) { - rgb_2_hls(fr, fg, fb, &fh, &fl, &fs); - rgb_2_hls(br, bg, bb, &bh, &bl, &bs); - tc_putp(TPARM_7(initialize_pair, p, fh, fl, fs, bh, bl, bs)); - } else { - tc_putp(TPARM_7(initialize_pair, p, fr, fg, fb, bb, bg, bb)); - } -} - - -static int -load_palette(int n) -{ /* load the color palette */ - int rgb; - - for (;;) { - if (pairs_used >= n) { - return FALSE; - } - if (set_a_foreground || set_foreground) { - if (pairs_used >= max_colors) { - return FALSE; - } - send_color(pairs_used, R, G, B); - rgb = R + G + B; - if (rgb > bright_value) { - bright_value = rgb; - a_bright_color = pairs_used; - } - } else { - if (pairs_used >= max_pairs) { - return FALSE; - } - if (pairs_used == 0) { - send_pair(pairs_used, 1000, 1000, 1000, R, G, B); - } else { - send_pair(pairs_used, R, G, B, R, G, B); - } - } - pairs_used++; - if ((B += color_step) > 1000) { - B = 0; - if ((G += color_step) > 1000) { - G = 0; - if ((R += color_step) > 1000) { - return TRUE; - } - } - } - } -} - - -static int -rainbow(int n) -{ /* print the programmable color display */ - int i, c, d, palette_full, initial_pair; - static const struct { - const char *name; - char ch; - } splat[] = { - {"Bg normal", ' '}, - {"Fg normal", ' '}, - {0, 0} - }; - - if ((set_a_foreground || set_foreground) - ? pairs_used >= max_colors - : pairs_used >= max_pairs) { - ptext("New palette: "); - (void) wait_here(); - initial_pair = pairs_used = 1; - bright_value = 0; - } else if (line_count + 3 >= lines) { - ptext("Go: "); - (void) wait_here(); - put_clear(); - initial_pair = pairs_used = 1; - bright_value = 0; - n++; - } else { - initial_pair = pairs_used; - n += initial_pair; - } - palette_full = load_palette(n); - for (d = 0; splat[d].name; d++) { - c = splat[d].ch; - if (d == 1) { - put_mode(enter_reverse_mode); - } - for (i = initial_pair; i < n; i++) { - if (i >= pairs_used) { - break; - } - if (set_a_foreground) { - if (i >= max_colors) { - break; - } - tc_putp(TPARM_1(set_a_foreground, i)); - tc_putp(TPARM_1(set_a_background, i)); - } else if (set_foreground) { - if (i >= max_colors) { - break; - } - tc_putp(TPARM_1(set_foreground, i)); - tc_putp(TPARM_1(set_background, i)); - } else { - if (i >= max_pairs) { - break; - } - tc_putp(TPARM_1(set_color_pair, i)); - } - putchp(c); - } - if (d == 1) { - put_mode(exit_attribute_mode); - } - if (set_a_foreground) { - tc_putp(TPARM_1(set_a_foreground, a_bright_color)); - tc_putp(TPARM_1(set_a_background, 0)); - } else if (set_foreground) { - tc_putp(TPARM_1(set_foreground, a_bright_color)); - tc_putp(TPARM_1(set_background, 0)); - } else { - tc_putp(TPARM_1(set_color_pair, 0)); - } - put_str(" "); - put_str(splat[d].name); - put_crlf(); - } - return palette_full; -} - - -static void -ncv_display(int m) -{ /* print the no_color_video (ncv) test line */ - putchp('0' + m); - putchp(' '); - eat_cookie(); - set_attr(1 << m); - sprintf(temp, "%-11s", alt_modes[m].name); - put_str(temp); - - new_color(COLOR_BLUE, COLOR_BLACK, TRUE); - put_str("blue"); - - new_color(COLOR_BLACK, COLOR_GREEN, TRUE); - put_str("green"); - - new_color(COLOR_WHITE, COLOR_BLACK, TRUE); - put_str(alt_modes[m].name); - eat_cookie(); - set_attr(0); - reset_colors(); - put_crlf(); -} - - -static void -dump_colors(void) -{ /* display the colors in some esthetic - pattern */ - static int xmap[8] = {0, 3, 4, 7, 1, 2, 5, 6}; - int i, j, k, xi, xj, width, p, cs; - int found_one; - - cs = color_step <= 125 ? 125 : color_step; - width = (1000 / cs) + 1; - for (xi = 0; xi < 16; xi++) { - i = (xi & 8) ? xi ^ 15 : xi; - R = i * cs; - if (R <= 1000) { - found_one = FALSE; - for (xj = 0; xj < 32; xj++) { - j = ((xj & 8) ? xj ^ 15 : xj) & 7; - k = xmap[((xi >> 1) & 4) + (xj >> 3)]; - G = j * cs; - B = k * cs; - if (G <= 1000 && B <= 1000) { - p = (k * width + j) * width + i; - if (set_a_background) { - if (p >= max_colors) { - continue; - } - send_color(p, R, G, B); - tc_putp(TPARM_1(set_a_background, p)); - } else if (set_background) { - if (p >= max_colors) { - continue; - } - send_color(p, R, G, B); - tc_putp(TPARM_1(set_background, p)); - } else { - if (p >= max_pairs) { - continue; - } - send_pair(p, R, G, B, R, G, B); - tc_putp(TPARM_1(set_color_pair, p)); - } - found_one = TRUE; - putchp(' '); - putchp(' '); - } - } - if (found_one) { - put_crlf(); - } - } - } -} - -/* -** color_check(test_list, status, ch) -** -** test (colors) and (pairs) -*/ -static void -color_check( - struct test_list *t, - int *state, - int *ch) -{ - if (max_colors <= 0 && max_pairs <= 0) { - ptext("This is not a color terminal; (colors) and (pairs) are missing. "); - *state |= MENU_STOP; - } else { - sprintf(temp, "This terminal can display %d colors and %d color pairs. (colors) (pairs)", - max_colors, max_pairs); - ptextln(temp); - } - generic_done_message(t, state, ch); -} - -/* -** color_setf(test_list, status, ch) -** -** test (setf) (setb) and (scp) -*/ -static void -color_setf( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (max_colors <= 0 && max_pairs <= 0) { - ptext("This is not a color terminal; (colors) and (pairs) are missing. "); - generic_done_message(t, state, ch); - *state |= MENU_STOP; - return; - } - if ((set_a_foreground == NULL || set_a_background == NULL) - && (set_foreground == NULL || set_background == NULL) - && set_color_pair == NULL) { - ptextln("Both set foreground (setaf/setf) and set color pair (scp) are not present."); - if (!set_a_background || !set_background) { - ptextln("(setab/setb) set background not present"); - } - ptext("These must be defined for color testing. "); - generic_done_message(t, state, ch); - *state |= MENU_STOP; - return; - } - /* initialize the color palette */ - pairs_used = max_colors >= 8 ? 8 : max_colors; - reset_colors(); - new_color(COLOR_WHITE, COLOR_BLACK, FALSE); - - ptextln("(setf) (setb) (scp) The following colors are predefined:"); - ptextln("\n Foreground Background"); - put_crlf(); - j = max_colors > 8 ? 8 : max_colors; - /* - * the black on white test is the same as the white on black test. - */ - for (i = 1; i < j; i++) { - putchp('0' + def_colors[i].index); - putchp(' '); - sprintf(temp, " %s ", def_colors[i].name); - - new_color(def_colors[i].index, COLOR_BLACK, TRUE); - put_str(temp); - - new_color(COLOR_BLACK, COLOR_BLACK, TRUE); - put_str(" "); - - new_color(COLOR_BLACK, def_colors[i].index, TRUE); - put_str(temp); - - new_color(COLOR_WHITE, COLOR_BLACK, FALSE); - put_crlf(); - } - reset_colors(); - put_crlf(); - generic_done_message(t, state, ch); -} - -/* -** color_matrix(test_list, status, ch) -** -** test (pairs) (op) -*/ -static void -color_matrix( - struct test_list *t, - int *state, - int *ch) -{ - int i, j, matrix_size, matrix_area, brightness; - - matrix_size = max_colors > 8 ? 8 : max_colors; - - sprintf(temp, "(pairs) There are %d color pairs.", max_pairs); - ptextln(temp); - - for ( ; matrix_size; matrix_size--) { - if (matrix_size * matrix_size <= max_pairs) { - break; - } - } - matrix_area = matrix_size * matrix_size; - for (brightness = 0; brightness < 2; brightness++) { - put_crlf(); - sprintf(temp, - "%dx%d matrix of foreground/background colors, bright *o%s*", - matrix_size, matrix_size, brightness ? "n" : "ff"); - put_str(temp); - - put_str("\n "); - for (i = 0; i < matrix_size; i++) { - (void) sprintf(temp, "%-8s", def_colors[i].name); - put_str(temp); - } - for (j = 0; j < matrix_area; j++) { - if (j % matrix_size == 0) { - reset_colors(); - put_crlf(); - if (brightness) { - tc_putp(exit_attribute_mode); - } - (void) sprintf(temp, "%-8s", def_colors[j / matrix_size].name); - put_str(temp); - if (brightness) { - put_mode(enter_bold_mode); - } - } - new_color(def_colors[j % matrix_size].index, - def_colors[j / matrix_size].index, - FALSE); - put_str(" Hello "); - } - reset_colors(); - if (brightness) { - tc_putp(exit_attribute_mode); - } - put_crlf(); - } - generic_done_message(t, state, ch); -} - -/* -** color_ncv(test_list, status, ch) -** -** test (ncv) -*/ -static void -color_ncv( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (no_color_video == -1) { - /* I have no idea what this means */ - return; - } - sprintf(temp, "According to no_color_video (ncv) which is %d, the following attributes should work correctly with color.", no_color_video); - ptextln(temp); - put_crlf(); - set_attr(0); - ncv_display(0); - for (i = 1; i <= 9; i++) { - if (((no_color_video >> (mode_map[i] - 1)) & 1) == 0) { - ncv_display(mode_map[i]); - } - } - if (no_color_video & 0x3ff) { - ptextln("\nThe following attributes should not work correctly with color. (ncv)\n"); - for (i = 1; i <= 9; i++) { - if ((no_color_video >> (mode_map[i] - 1)) & 1) { - ncv_display(mode_map[i]); - } - } - } - reset_colors(); - put_crlf(); - generic_done_message(t, state, ch); -} - -/* -** color_bce(test_list, status, ch) -** -** test (bce) background color erase -*/ -static void -color_bce( - struct test_list *t, - int *state, - int *ch) -{ - new_color(COLOR_CYAN, COLOR_BLUE, FALSE); - put_clear(); - put_newlines(2); - reset_colors(); - ptextln("If the two lines above are blue then back_color_erase (bce) should be true."); - sprintf(temp, "(bce) is %s in the data base.", back_color_erase ? "true" : "false"); - ptextln(temp); - generic_done_message(t, state, ch); -} - -/* -** color_ccc(test_list, status, ch) -** -** test (ccc) color palette test (oc) (op) (initc) (initp) -*/ -static void -color_ccc( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!can_change) { - ptextln("Terminal can not change colors (ccc)"); - generic_done_message(t, state, ch); - return; - } - reset_colors(); - pairs_used = 0; - new_color(COLOR_WHITE, COLOR_BLACK, FALSE); - sprintf(temp, "Reloading colors (init%c) using %s method", - set_foreground ? 'c' : 'p', - hue_lightness_saturation ? "HLS" : "RGB"); - ptextln(temp); - put_crlf(); - j = max_colors > 7 ? 7 : max_colors; - /* redisplay the above test with reinitialized colors */ - /* If these colors don't look right to you... */ - for (i = 0; i < j; i++) { - sprintf(temp, " %s ", def_colors[i ^ 7].name); - - new_color(i ^ 7, COLOR_BLACK, TRUE); - put_str(temp); - - new_color(COLOR_BLACK, COLOR_BLACK, TRUE); - put_str(" "); - - new_color(COLOR_BLACK, i ^ 7, TRUE); - put_str(temp); - - new_color(COLOR_WHITE, COLOR_BLACK, FALSE); - put_crlf(); - } - generic_done_message(t, state, ch); - if (*ch != 0 && *ch != 'n') { - reset_colors(); - return; - } - - pairs_used = 0; - cookie_monster = 0; - if (magic_cookie_glitch > 0) { - cookie_monster = - ((set_a_foreground || set_foreground) - ? magic_cookie_glitch : 0) + - ((set_a_background || set_background) - ? magic_cookie_glitch : 0) + - (set_color_pair ? magic_cookie_glitch : 0); - } - set_color_step(); - colors_per_line = max_colors > max_pairs - ? max_pairs : max_colors; - j = (columns - 14) / (cookie_monster + 1); - if (colors_per_line > j) { - colors_per_line = (j / i) * i; - } - sprintf(temp, "RGB color step %d, cookies %d", color_step, - cookie_monster); - ptextln(temp); - - R = G = B = 0; - pairs_used = 0; - for (;;) { - if (rainbow(colors_per_line)) { - break; - } - } - generic_done_message(t, state, ch); - if (*ch != 0 && *ch != 'n') { - reset_colors(); - return; - } - dump_colors(); - reset_colors(); - generic_done_message(t, state, ch); -} diff --git a/tack/configure b/tack/configure deleted file mode 100644 index c2e26efc..00000000 --- a/tack/configure +++ /dev/null @@ -1,5414 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.20030927 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF -cat <<\EOF ---enable and --with options recognized: - --enable-warnings test: turn on gcc compiler warnings - --with-curses-dir=DIR directory in which (n)curses is installed - --with-5lib use SunOS sysv-libraries - --with-ncursesw use wide ncurses-libraries (installed) - --with-ncurses use ncurses-libraries (installed) - --with-pdcurses compile/link with pdcurses X11 library -EOF - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.20030927" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=tack.c - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - - - -test -f config.guess || ( test -f ../config.guess && cp ../config.guess ./ ) - - -test -f config.sub || ( test -f ../config.sub && cp ../config.sub ./ ) - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:567: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - - system_name="$host_os" -else - system_name="`(uname -s -r) 2>/dev/null`" - if test -z "$system_name" ; then - system_name="`(hostname) 2>/dev/null`" - fi -fi -test -n "$system_name" && cat >> confdefs.h <&6 -else - cf_cv_system_name="$system_name" -fi - - -test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$ac_t""Configuring for $cf_cv_system_name" 1>&6 - -if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$ac_t""Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" 1>&6 - { echo "configure: error: "Please remove config.cache and try again."" 1>&2; exit 1; } -fi - - -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:615: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftestmake <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' -EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 - SET_MAKE= -else - echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:644: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:674: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:725: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 768 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:799: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:804: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:832: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:864: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -for ac_prog in mawk gawk nawk awk -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:948: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AWK="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AWK="$ac_cv_prog_AWK" -if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AWK" && break -done - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:989: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -case $INSTALL in -/*) - ;; -*) - cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'` - test -z "$cf_dir" && cf_dir=. - INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'` - ;; -esac - -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1052: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -echo $ac_n "checking if filesystem supports mixed-case filenames""... $ac_c" 1>&6 -echo "configure:1074: checking if filesystem supports mixed-case filenames" >&5 -if eval "test \"`echo '$''{'cf_cv_mixedcase'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -if test "$cross_compiling" = yes ; then - case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi - cf_cv_mixedcase=no - ;; - *) - cf_cv_mixedcase=yes - ;; - esac -else - rm -f conftest CONFTEST - echo test >conftest - if test -f CONFTEST ; then - cf_cv_mixedcase=no - else - cf_cv_mixedcase=yes - fi - rm -f conftest CONFTEST -fi - -fi - -echo "$ac_t""$cf_cv_mixedcase" 1>&6 -test "$cf_cv_mixedcase" = yes && cat >> confdefs.h <<\EOF -#define MIXEDCASE_FILENAMES 1 -EOF - - - - -# Extract the first word of "ctags", so it can be a program name with args. -set dummy ctags; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1112: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MAKE_LOWER_TAGS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$MAKE_LOWER_TAGS"; then - ac_cv_prog_MAKE_LOWER_TAGS="$MAKE_LOWER_TAGS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAKE_LOWER_TAGS="yes" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_MAKE_LOWER_TAGS" && ac_cv_prog_MAKE_LOWER_TAGS="no" -fi -fi -MAKE_LOWER_TAGS="$ac_cv_prog_MAKE_LOWER_TAGS" -if test -n "$MAKE_LOWER_TAGS"; then - echo "$ac_t""$MAKE_LOWER_TAGS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -if test "$cf_cv_mixedcase" = yes ; then - # Extract the first word of "etags", so it can be a program name with args. -set dummy etags; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1144: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MAKE_UPPER_TAGS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$MAKE_UPPER_TAGS"; then - ac_cv_prog_MAKE_UPPER_TAGS="$MAKE_UPPER_TAGS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAKE_UPPER_TAGS="yes" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_MAKE_UPPER_TAGS" && ac_cv_prog_MAKE_UPPER_TAGS="no" -fi -fi -MAKE_UPPER_TAGS="$ac_cv_prog_MAKE_UPPER_TAGS" -if test -n "$MAKE_UPPER_TAGS"; then - echo "$ac_t""$MAKE_UPPER_TAGS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -else - MAKE_UPPER_TAGS=no -fi - -if test "$MAKE_UPPER_TAGS" = yes ; then - MAKE_UPPER_TAGS= -else - MAKE_UPPER_TAGS="#" -fi - - -if test "$MAKE_LOWER_TAGS" = yes ; then - MAKE_LOWER_TAGS= -else - MAKE_LOWER_TAGS="#" -fi - - - -CC_G_OPT="-g" -CC_SHARED_OPTS=unknown -CPPFLAGS="$CPPFLAGS" -DESTDIR="" -DFT_DEP_SUFFIX="" -DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'` -DFT_UPR_MODEL="NORMAL" -ECHO_LINK='@ echo linking $@ ... ;' -EXTRA_LDFLAGS="" -LD="ld" -LDFLAGS_SHARED="" -LD_MODEL="" -LD_SHARED_OPTS="" -LIBTOOL="" -LIB_CLEAN="" -LIB_COMPILE="" -LIB_INSTALL="" -LIB_LINK="" -LIB_SUFFIX="" -LIB_UNINSTALL="" -LINK_PROGS="" -LINT=lint -LINT_OPTS="" -LOCAL_LDFLAGS="" -MATH_LIB="-lm" -TICS_ARGS="" -TINFO_ARGS='$(LIBS_CURSES)' -cf_cv_abi_version="" -cf_cv_rel_version="" - -NCURSES_TREE="#" - - -cf_cv_screen=curses -cf_cv_libtype= - -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1227: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1260: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1291: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1322: checking for object suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done -else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - - - -echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1348: checking for ${CC-cc} option to accept ANSI C" >&5 -if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cf_cv_ansi_cc=no -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) -for cf_arg in "-DCC_HAS_PROTOS" \ - "" \ - -qlanglvl=ansi \ - -std1 \ - -Ae \ - "-Aa -D_HPUX_SOURCE" \ - -Xc -do - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_arg -do -case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case $cf_add_cflags in - -D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - fi - ;; - esac - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac - ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" -fi - -if test -n "$cf_new_extra_cppflags" ; then - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" -fi - - - - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ansi_cc="$cf_arg"; break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -CFLAGS="$cf_save_CFLAGS" -CPPFLAGS="$cf_save_CPPFLAGS" - -fi - -echo "$ac_t""$cf_cv_ansi_cc" 1>&6 - -if test "$cf_cv_ansi_cc" != "no"; then -if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_cv_ansi_cc -do -case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case $cf_add_cflags in - -D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - fi - ;; - esac - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac - ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" -fi - -if test -n "$cf_new_extra_cppflags" ; then - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" -fi - - - - -else - cat >> confdefs.h <<\EOF -#define CC_HAS_PROTOS 1 -EOF - -fi -fi - - -if test "$cf_cv_ansi_cc" = "no"; then - { echo "configure: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" 1>&2; exit 1; } -fi - - - -GCC_VERSION=none -if test "$GCC" = yes ; then - echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:1572: checking version of $CC" >&5 - GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" - test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$ac_t""$GCC_VERSION" 1>&6 -fi - - -if ( test "$GCC" = yes || test "$GXX" = yes ) -then -echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:1582: checking if you want to turn on gcc warnings" >&5 - -# Check whether --enable-warnings or --disable-warnings was given. -if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - with_warnings=yes - else - with_warnings=no - fi -else - enableval=no - with_warnings=no - -fi - -echo "$ac_t""$with_warnings" 1>&6 -if test "$with_warnings" = "yes" -then - - - -INTEL_COMPILER=no - -if test "$GCC" = yes ; then - case $host_os in - linux*|gnu*) - echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 -echo "configure:1611: checking if this is really Intel C compiler" >&5 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -no-gcc" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - CFLAGS="$cf_save_CFLAGS" - echo "$ac_t""$INTEL_COMPILER" 1>&6 - ;; - esac -fi - - -cat > conftest.$ac_ext <&6 -echo "configure:1664: checking for $CC warning options" >&5 - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" - for cf_opt in \ - wd1419 \ - wd1682 \ - wd1683 \ - wd1684 \ - wd193 \ - wd279 \ - wd593 \ - wd810 \ - wd869 \ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi - done - CFLAGS="$cf_save_CFLAGS" - -elif test "$GCC" = yes -then - echo "checking for $CC warning options" 1>&6 -echo "configure:1690: checking for $CC warning options" >&5 - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-W -Wall" - cf_warn_CONST="" - test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" - for cf_opt in \ - Wbad-function-cast \ - Wcast-align \ - Wcast-qual \ - Winline \ - Wmissing-declarations \ - Wmissing-prototypes \ - Wnested-externs \ - Wpointer-arith \ - Wshadow \ - Wstrict-prototypes \ - Wundef $cf_warn_CONST - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 - case $cf_opt in #(vi - Wcast-qual) #(vi - CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" - ;; - Winline) #(vi - case $GCC_VERSION in - 3.3*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - - continue;; - esac - ;; - esac - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi - done - CFLAGS="$cf_save_CFLAGS" -fi -rm -f conftest* - - - -fi -fi - - -if test "$GCC" = yes -then -cat > conftest.i <&6 -echo "configure:1756: checking for $CC __attribute__ directives" >&5 -cat > conftest.$ac_ext <&5 - case $cf_attribute in - scanf|printf) - cat >conftest.h <conftest.h <&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 - cat conftest.h >>confdefs.h - fi - done -else - fgrep define conftest.i >>confdefs.h -fi -rm -rf conftest* -fi - - -echo $ac_n "checking if $CC -U and -D options work together""... $ac_c" 1>&6 -echo "configure:1809: checking if $CC -U and -D options work together" >&5 -if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cf_cv_cc_u_d_options=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cf_cv_cc_u_d_options=no -fi -rm -f conftest* - CPPFLAGS="$cf_save_CPPFLAGS" - -fi - -echo "$ac_t""$cf_cv_cc_u_d_options" 1>&6 - - - - - -cf_XOPEN_SOURCE=500 -cf_POSIX_C_SOURCE=199506L - -case $host_os in #(vi -aix[45]*) #(vi - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" - ;; -freebsd*) #(vi - # 5.x headers associate - # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L - # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L - cf_POSIX_C_SOURCE=200112L - cf_XOPEN_SOURCE=600 - CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -hpux*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" - ;; -irix[56].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" - ;; -linux*|gnu*) #(vi - -echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1877: checking if we must define _GNU_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext < -int main() { - -#ifndef _XOPEN_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_gnu_source=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat > conftest.$ac_ext < -int main() { - -#ifdef _XOPEN_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_gnu_source=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_gnu_source=yes -fi -rm -f conftest* - CPPFLAGS="$cf_save" - -fi -rm -f conftest* - -fi - -echo "$ac_t""$cf_cv_gnu_source" 1>&6 -test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - - ;; -mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks - ;; -netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw - ;; -openbsd*) #(vi - # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw - ;; -osf[45]*) #(vi - CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" - ;; -nto-qnx*) #(vi - CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" - ;; -sco*) #(vi - # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer - ;; -solaris*) #(vi - CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" - ;; -*) - echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:1957: checking if we should define _XOPEN_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -int main() { - -#ifndef _XOPEN_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:1973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_xopen_source=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat > conftest.$ac_ext < -int main() { - -#ifdef _XOPEN_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:1993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_xopen_source=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_xopen_source=$cf_XOPEN_SOURCE -fi -rm -f conftest* - CPPFLAGS="$cf_save" - -fi -rm -f conftest* - -fi - -echo "$ac_t""$cf_cv_xopen_source" 1>&6 - if test "$cf_cv_xopen_source" != no ; then - -# remove _XOPEN_SOURCE symbol from $CFLAGS -CFLAGS=`echo "$CFLAGS" | \ - sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` - - -# remove _XOPEN_SOURCE symbol from $CPPFLAGS -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` - - test "$cf_cv_cc_u_d_options" = yes && \ - CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" - fi - -cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE - -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" - - -# remove _POSIX_C_SOURCE symbol from $cf_save_CFLAGS -cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ - sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` - - -# remove _POSIX_C_SOURCE symbol from $cf_save_CPPFLAGS -cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ - sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` - - -echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:2048: checking if we should define _POSIX_C_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - -echo "(line 2054) testing if the symbol is already defined go no further ..." 1>&5 - - cat > conftest.$ac_ext < -int main() { - -#ifndef _POSIX_C_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_posix_c_source=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[12]??*) #(vi - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - ;; - .2) #(vi - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - cf_want_posix_source=yes - ;; - .*) - cf_want_posix_source=yes - ;; - esac - if test "$cf_want_posix_source" = yes ; then - cat > conftest.$ac_ext < -int main() { - -#ifdef _POSIX_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" -fi -rm -f conftest* - fi - -echo "(line 2110) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 - - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" - -echo "(line 2115) testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat > conftest.$ac_ext < -int main() { - -#ifndef _POSIX_C_SOURCE -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source=no -fi -rm -f conftest* - CFLAGS="$cf_save_CFLAGS" - CPPFLAGS="$cf_save_CPPFLAGS" - -fi -rm -f conftest* - -fi - -echo "$ac_t""$cf_cv_posix_c_source" 1>&6 - -if test "$cf_cv_posix_c_source" != no ; then - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS" - if test "$cf_cv_cc_u_d_options" = yes ; then - cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \ - sed -e 's/-D/-U/g' -e 's/=[^ ]*//g'` - CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source" - fi - CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" -fi - - - ;; -esac - - - - -# Check whether --with-curses-dir or --without-curses-dir was given. -if test "${with_curses_dir+set}" = set; then - withval="$with_curses_dir" - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; -esac - - cf_cv_curses_dir=$withval -else - cf_cv_curses_dir=no -fi - - - - -# Check whether --with-5lib or --without-5lib was given. -if test "${with_5lib+set}" = set; then - withval="$with_5lib" - LIBS="-L/usr/5lib $LIBS" - CPPFLAGS="$CPPFLAGS -I/usr/5include" -fi - - - -# Check whether --with-ncursesw or --without-ncursesw was given. -if test "${with_ncursesw+set}" = set; then - withval="$with_ncursesw" - cf_cv_screen=ncursesw -else - - - -# Check whether --with-ncurses or --without-ncurses was given. -if test "${with_ncurses+set}" = set; then - withval="$with_ncurses" - cf_cv_screen=ncurses -else - - - -# Check whether --with-pdcurses or --without-pdcurses was given. -if test "${with_pdcurses+set}" = set; then - withval="$with_pdcurses" - cf_cv_screen=pdcurses -fi - -fi - -fi - - -case $cf_cv_screen in -curses) - - -echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:2247: checking for extra include directories" >&5 -if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cf_cv_curses_incdir=no -case $host_os in #(vi -hpux10.*) #(vi - test -d /usr/include/curses_colr && \ - cf_cv_curses_incdir="-I/usr/include/curses_colr" - ;; -sunos3*|sunos4*) - test -d /usr/5lib && \ - test -d /usr/5include && \ - cf_cv_curses_incdir="-I/usr/5include" - ;; -esac - -fi - -echo "$ac_t""$cf_cv_curses_incdir" 1>&6 -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" - - -echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:2272: checking if we have identified curses headers" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cf_cv_ncurses_header=none -for cf_header in \ - curses.h \ - ncurses.h \ - ncurses/curses.h \ - ncurses/ncurses.h -do -cat > conftest.$ac_ext < -int main() { -initscr(); tgoto("?", 0,0) -; return 0; } -EOF -if { (eval echo configure:2292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ncurses_header=$cf_header; break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done - -fi - -echo "$ac_t""$cf_cv_ncurses_header" 1>&6 - -if test "$cf_cv_ncurses_header" = none ; then - { echo "configure: error: No curses header-files found" 1>&2; exit 1; } -fi - -# cheat, to get the right #define's for HAVE_NCURSES_H, etc. -for ac_hdr in $cf_cv_ncurses_header -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2315: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:2354: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` - ;; -*) - cf_term_header=term.h - ;; -esac - -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do -cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> -#include <$cf_test> - -int main() { -int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cf_cv_term_header="$cf_test" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cf_cv_term_header=unknown - -fi -rm -f conftest* - test "$cf_cv_term_header" != unknown && break -done - -fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case $cf_cv_term_header in # (vi -*term.h) - cat >> confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -ncursesw/term.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF - - ;; -esac - - - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:2430: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then - - - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:2456: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi - -else - cat > conftest.$ac_ext < -#include -int main() -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - exit(0); -} -EOF -if { (eval echo configure:2489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -fr conftest* -fi - - rm -f $cf_tempfile - -fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - - - - -echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:2513: checking if we have identified curses libraries" >&5 -cat > conftest.$ac_ext < -int main() { -initscr(); tgoto("?", 0,0) -; return 0; } -EOF -if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_result=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=no -fi -rm -f conftest* -echo "$ac_t""$cf_result" 1>&6 - -if test "$cf_result" = no ; then -case $host_os in #(vi -freebsd*) #(vi - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:2538: checking for tgoto in -lmytinfo" >&5 -ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="-lmytinfo $LIBS" -else - echo "$ac_t""no" 1>&6 -fi - - ;; -hpux10.*) #(vi - echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:2580: checking for initscr in -lcur_colr" >&5 -ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lcur_colr $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - LIBS="-lcur_colr $LIBS" - ac_cv_func_initscr=yes - -else - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:2622: checking for initscr in -lHcurses" >&5 -ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lHcurses $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" - CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" - ac_cv_func_initscr=yes - -else - echo "$ac_t""no" 1>&6 -fi - -fi - - ;; -linux*) # Suse Linux does not follow /usr/lib convention - LIBS="$LIBS -L/lib" - ;; -sunos3*|sunos4*) - test -d /usr/5lib && \ - LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap" - ac_cv_func_initscr=yes - ;; -esac - -if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" - - if test ".${cf_cv_ncurses_version-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi - - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:2694: checking for tgoto" >&5 -if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_tgoto) || defined (__stub___tgoto) -choke me -#else -tgoto(); -#endif - -; return 0; } -EOF -if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_tgoto=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_tgoto=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'tgoto`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_term_lib=predefined -else - echo "$ac_t""no" 1>&6 - - for cf_term_lib in $cf_check_list termcap termlib unknown - do - echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:2743: checking for tgoto in -l$cf_term_lib" >&5 -ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l$cf_term_lib $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - break -else - echo "$ac_t""no" 1>&6 -fi - - done - -fi - - - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses unknown - do - echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:2792: checking for initscr in -l$cf_curs_lib" >&5 -ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l$cf_curs_lib $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - break -else - echo "$ac_t""no" 1>&6 -fi - - done - test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; } - - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:2837: checking if we can link with $cf_curs_lib library" >&5 - cat > conftest.$ac_ext < -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_result=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=no -fi -rm -f conftest* - echo "$ac_t""$cf_result" 1>&6 - test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:2862: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 - cat > conftest.$ac_ext < -int main() { -initscr(); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:2871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_result=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat > conftest.$ac_ext < -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_result=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=error -fi -rm -f conftest* - -fi -rm -f conftest* - echo "$ac_t""$cf_result" 1>&6 - fi -fi -fi - - - ;; -ncurses) - - -cf_ncuhdr_root=ncurses - -test -n "$cf_cv_curses_dir" && \ -test "$cf_cv_curses_dir" != "no" && \ -CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" - -echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:2918: checking for $cf_ncuhdr_root header in include-path" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - - cat > conftest.$ac_ext < -int main() { - -#ifdef NCURSES_VERSION - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - - -; return 0; } -EOF -if { (eval echo configure:2950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ncurses_h=$cf_header - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h=no -fi -rm -f conftest* - - test "$cf_cv_ncurses_h" != no && break - done - -fi - -echo "$ac_t""$cf_cv_ncurses_h" 1>&6 - - - -if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h -else - -echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:2976: checking for $cf_ncuhdr_root include-path" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - test -n "$verbose" && echo - cf_search="" - -test -d "$HOME" && { - test -n "$verbose" && echo " ... testing include-directories under $HOME" - test -d "$HOME/include" && cf_search="$cf_search $HOME/include" - test -d "$HOME/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" - test -d "$HOME/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" -} - -# For other stuff under the home directory, it should be sufficient to put -# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location: -test -d "$HOME/$cf_ncuhdr_root" && { - test -n "$verbose" && echo " ... testing include-directories under $HOME/$cf_ncuhdr_root" - test -d "$HOME/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" - test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != /usr/local && \ -test -d /usr/local && { - test -n "$verbose" && echo " ... testing include-directories under /usr/local" - test -d /usr/local/include && cf_search="$cf_search /usr/local/include" - test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != NONE && \ -test -d $prefix && { - test -n "$verbose" && echo " ... testing include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != /opt && \ -test -d /opt && { - test -n "$verbose" && echo " ... testing include-directories under /opt" - test -d /opt/include && cf_search="$cf_search /opt/include" - test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != /usr && \ -test -d /usr && { - test -n "$verbose" && echo " ... testing include-directories under /usr" - test -d /usr/include && cf_search="$cf_search /usr/include" - test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" -} - -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" -} - -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" -} - - - test -n "$verbose" && echo search path $cf_search - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search - do - -for cf_add_incdir in $cf_incdir -do - while true - do - case $cf_add_incdir in - /usr/include) # (vi - ;; - /usr/local/include) # (vi - if test "$GCC" = yes - then - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext < -int main() { -printf("Hello") -; return 0; } -EOF -if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" -fi -rm -f conftest* - fi - ;; - *) # (vi - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - ;; - esac - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - done -done - - for cf_header in \ - ncurses.h \ - curses.h - do - - cat > conftest.$ac_ext < -int main() { - -#ifdef NCURSES_VERSION - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - - -; return 0; } -EOF -if { (eval echo configure:3126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ncurses_h2=$cf_header - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h2=no -fi -rm -f conftest* - - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; } - -fi - -echo "$ac_t""$cf_cv_ncurses_h2" 1>&6 - - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header - fi - -for cf_add_incdir in $cf_1st_incdir -do - while true - do - case $cf_add_incdir in - /usr/include) # (vi - ;; - /usr/local/include) # (vi - if test "$GCC" = yes - then - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext < -int main() { -printf("Hello") -; return 0; } -EOF -if { (eval echo configure:3180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" -fi -rm -f conftest* - fi - ;; - *) # (vi - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - ;; - esac - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - done -done - - -fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case $cf_cv_ncurses_header in # (vi -*ncurses.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF - - ;; -esac - -case $cf_cv_ncurses_header in # (vi -ncurses/curses.h|ncurses/ncurses.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_NCURSES_H 1 -EOF - - ;; -ncursesw/curses.h|ncursesw/ncurses.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSESW_NCURSES_H 1 -EOF - - ;; -esac - - - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:3233: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` - ;; -*) - cf_term_header=term.h - ;; -esac - -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do -cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> -#include <$cf_test> - -int main() { -int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:3260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cf_cv_term_header="$cf_test" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cf_cv_term_header=unknown - -fi -rm -f conftest* - test "$cf_cv_term_header" != unknown && break -done - -fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case $cf_cv_term_header in # (vi -*term.h) - cat >> confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -ncursesw/term.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF - - ;; -esac - - -# some applications need this, but should check for NCURSES_VERSION -cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - - - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:3315: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then - - - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:3341: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi - -else - cat > conftest.$ac_ext < -#include -int main() -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - exit(0); -} -EOF -if { (eval echo configure:3374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -fr conftest* -fi - - rm -f $cf_tempfile - -fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - - - - - -cf_nculib_root=ncurses - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:3405: checking for Gpm_Open in -lgpm" >&5 -ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:3440: checking for initscr in -lgpm" >&5 -ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$cf_ncurses_SAVE" -else - echo "$ac_t""no" 1>&6 -cf_ncurses_LIBS="-lgpm" -fi - -else - echo "$ac_t""no" 1>&6 -fi - - -case $host_os in #(vi -freebsd*) - # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). - if test "$cf_nculib_root" = ncurses ; then - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:3491: checking for tgoto in -lmytinfo" >&5 -ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" -else - echo "$ac_t""no" 1>&6 -fi - - fi - ;; -esac - -LIBS="$cf_ncurses_LIBS $LIBS" - -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -then - LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS" -else - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" - echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:3544: checking for initscr" >&5 -if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -initscr(); -#endif - -; return 0; } -EOF -if { (eval echo configure:3572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_initscr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_initscr=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then - echo "$ac_t""yes" 1>&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' -else - echo "$ac_t""no" 1>&6 - - cf_save_LIBS="$LIBS" - echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:3592: checking for initscr in -l$cf_nculib_root" >&5 - LIBS="-l$cf_nculib_root $LIBS" - cat > conftest.$ac_ext < -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:3602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 - cf_search="" - -test -d "$HOME" && { - test -n "$verbose" && echo " ... testing lib-directories under $HOME" - test -d "$HOME/lib" && cf_search="$cf_search $HOME/lib" - test -d "$HOME/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/lib/$cf_nculib_root" - test -d "$HOME/lib/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" -} - -# For other stuff under the home directory, it should be sufficient to put -# a symbolic link for $HOME/$cf_nculib_root to the actual package location: -test -d "$HOME/$cf_nculib_root" && { - test -n "$verbose" && echo " ... testing lib-directories under $HOME/$cf_nculib_root" - test -d "$HOME/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/$cf_nculib_root/lib" - test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != /usr/local && \ -test -d /usr/local && { - test -n "$verbose" && echo " ... testing lib-directories under /usr/local" - test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" - test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != NONE && \ -test -d $prefix && { - test -n "$verbose" && echo " ... testing lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != /opt && \ -test -d /opt && { - test -n "$verbose" && echo " ... testing lib-directories under /opt" - test -d /opt/lib && cf_search="$cf_search /opt/lib" - test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != /usr && \ -test -d /usr && { - test -n "$verbose" && echo " ... testing lib-directories under /usr" - test -d /usr/lib && cf_search="$cf_search /usr/lib" - test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" -} - - for cf_libdir in $cf_search - do - echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:3671: checking for -l$cf_nculib_root in $cf_libdir" >&5 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat > conftest.$ac_ext < -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:3681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 - LIBS="$cf_save_LIBS" -fi -rm -f conftest* - done - -fi -rm -f conftest* - -fi - -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - -if test $cf_found_library = no ; then - { echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; } -fi - - -fi - -if test -n "$cf_ncurses_LIBS" ; then - echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:3712: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` - if test "$q" != "$LIBS" ; then - LIBS="$q" - fi - done - cat > conftest.$ac_ext < -int main() { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 - LIBS="$cf_ncurses_SAVE" -fi -rm -f conftest* -fi - - -cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -cat >> confdefs.h <&6 -echo "configure:3761: checking for $cf_ncuhdr_root header in include-path" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - - cat > conftest.$ac_ext < -int main() { - -#ifdef NCURSES_VERSION - -#ifndef WACS_BSSB - make an error -#endif - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - - -; return 0; } -EOF -if { (eval echo configure:3801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ncurses_h=$cf_header - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h=no -fi -rm -f conftest* - - test "$cf_cv_ncurses_h" != no && break - done - -fi - -echo "$ac_t""$cf_cv_ncurses_h" 1>&6 - - - -if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h -else - -echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:3827: checking for $cf_ncuhdr_root include-path" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - test -n "$verbose" && echo - cf_search="" - -test -d "$HOME" && { - test -n "$verbose" && echo " ... testing include-directories under $HOME" - test -d "$HOME/include" && cf_search="$cf_search $HOME/include" - test -d "$HOME/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" - test -d "$HOME/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" -} - -# For other stuff under the home directory, it should be sufficient to put -# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location: -test -d "$HOME/$cf_ncuhdr_root" && { - test -n "$verbose" && echo " ... testing include-directories under $HOME/$cf_ncuhdr_root" - test -d "$HOME/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" - test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != /usr/local && \ -test -d /usr/local && { - test -n "$verbose" && echo " ... testing include-directories under /usr/local" - test -d /usr/local/include && cf_search="$cf_search /usr/local/include" - test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != NONE && \ -test -d $prefix && { - test -n "$verbose" && echo " ... testing include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != /opt && \ -test -d /opt && { - test -n "$verbose" && echo " ... testing include-directories under /opt" - test -d /opt/include && cf_search="$cf_search /opt/include" - test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -test "$prefix" != /usr && \ -test -d /usr && { - test -n "$verbose" && echo " ... testing include-directories under /usr" - test -d /usr/include && cf_search="$cf_search /usr/include" - test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" -} - -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" -} - -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" -} - - - test -n "$verbose" && echo search path $cf_search - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search - do - -for cf_add_incdir in $cf_incdir -do - while true - do - case $cf_add_incdir in - /usr/include) # (vi - ;; - /usr/local/include) # (vi - if test "$GCC" = yes - then - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext < -int main() { -printf("Hello") -; return 0; } -EOF -if { (eval echo configure:3929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" -fi -rm -f conftest* - fi - ;; - *) # (vi - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - ;; - esac - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - done -done - - for cf_header in \ - ncurses.h \ - curses.h - do - - cat > conftest.$ac_ext < -int main() { - -#ifdef NCURSES_VERSION - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - - -; return 0; } -EOF -if { (eval echo configure:3977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_ncurses_h2=$cf_header - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_ncurses_h2=no -fi -rm -f conftest* - - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; } - -fi - -echo "$ac_t""$cf_cv_ncurses_h2" 1>&6 - - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header - fi - -for cf_add_incdir in $cf_1st_incdir -do - while true - do - case $cf_add_incdir in - /usr/include) # (vi - ;; - /usr/local/include) # (vi - if test "$GCC" = yes - then - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat > conftest.$ac_ext < -int main() { -printf("Hello") -; return 0; } -EOF -if { (eval echo configure:4031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" -fi -rm -f conftest* - fi - ;; - *) # (vi - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - ;; - esac - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - done -done - - -fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case $cf_cv_ncurses_header in # (vi -*ncurses.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF - - ;; -esac - -case $cf_cv_ncurses_header in # (vi -ncurses/curses.h|ncurses/ncurses.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_NCURSES_H 1 -EOF - - ;; -ncursesw/curses.h|ncursesw/ncurses.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSESW_NCURSES_H 1 -EOF - - ;; -esac - - - -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:4084: checking for terminfo header" >&5 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` - ;; -*) - cf_term_header=term.h - ;; -esac - -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do -cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> -#include <$cf_test> - -int main() { -int x = auto_left_margin -; return 0; } -EOF -if { (eval echo configure:4111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cf_cv_term_header="$cf_test" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cf_cv_term_header=unknown - -fi -rm -f conftest* - test "$cf_cv_term_header" != unknown && break -done - -fi - -echo "$ac_t""$cf_cv_term_header" 1>&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case $cf_cv_term_header in # (vi -*term.h) - cat >> confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi - cat >> confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -ncursesw/term.h) - cat >> confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF - - ;; -esac - - -# some applications need this, but should check for NCURSES_VERSION -cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - - - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:4166: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then - - - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:4192: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi - -else - cat > conftest.$ac_ext < -#include -int main() -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - exit(0); -} -EOF -if { (eval echo configure:4225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -fr conftest* -fi - - rm -f $cf_tempfile - -fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - - - - - -cf_nculib_root=ncursesw - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:4256: checking for Gpm_Open in -lgpm" >&5 -ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:4291: checking for initscr in -lgpm" >&5 -ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgpm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$cf_ncurses_SAVE" -else - echo "$ac_t""no" 1>&6 -cf_ncurses_LIBS="-lgpm" -fi - -else - echo "$ac_t""no" 1>&6 -fi - - -case $host_os in #(vi -freebsd*) - # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). - if test "$cf_nculib_root" = ncurses ; then - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:4342: checking for tgoto in -lmytinfo" >&5 -ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" -else - echo "$ac_t""no" 1>&6 -fi - - fi - ;; -esac - -LIBS="$cf_ncurses_LIBS $LIBS" - -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -then - LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS" -else - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" - echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:4395: checking for initscr" >&5 -if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -initscr(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_initscr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_initscr=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then - echo "$ac_t""yes" 1>&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' -else - echo "$ac_t""no" 1>&6 - - cf_save_LIBS="$LIBS" - echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:4443: checking for initscr in -l$cf_nculib_root" >&5 - LIBS="-l$cf_nculib_root $LIBS" - cat > conftest.$ac_ext < -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:4453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 - cf_search="" - -test -d "$HOME" && { - test -n "$verbose" && echo " ... testing lib-directories under $HOME" - test -d "$HOME/lib" && cf_search="$cf_search $HOME/lib" - test -d "$HOME/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/lib/$cf_nculib_root" - test -d "$HOME/lib/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" -} - -# For other stuff under the home directory, it should be sufficient to put -# a symbolic link for $HOME/$cf_nculib_root to the actual package location: -test -d "$HOME/$cf_nculib_root" && { - test -n "$verbose" && echo " ... testing lib-directories under $HOME/$cf_nculib_root" - test -d "$HOME/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/$cf_nculib_root/lib" - test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != /usr/local && \ -test -d /usr/local && { - test -n "$verbose" && echo " ... testing lib-directories under /usr/local" - test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" - test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != NONE && \ -test -d $prefix && { - test -n "$verbose" && echo " ... testing lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != /opt && \ -test -d /opt && { - test -n "$verbose" && echo " ... testing lib-directories under /opt" - test -d /opt/lib && cf_search="$cf_search /opt/lib" - test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" -} - -test "$prefix" != /usr && \ -test -d /usr && { - test -n "$verbose" && echo " ... testing lib-directories under /usr" - test -d /usr/lib && cf_search="$cf_search /usr/lib" - test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" -} - - for cf_libdir in $cf_search - do - echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:4522: checking for -l$cf_nculib_root in $cf_libdir" >&5 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat > conftest.$ac_ext < -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 - LIBS="$cf_save_LIBS" -fi -rm -f conftest* - done - -fi -rm -f conftest* - -fi - -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - -if test $cf_found_library = no ; then - { echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; } -fi - - -fi - -if test -n "$cf_ncurses_LIBS" ; then - echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:4563: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` - if test "$q" != "$LIBS" ; then - LIBS="$q" - fi - done - cat > conftest.$ac_ext < -int main() { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 - LIBS="$cf_ncurses_SAVE" -fi -rm -f conftest* -fi - - -cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -cat >> confdefs.h <&6 -echo "configure:4613: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4651: checking return type of signal handlers" >&5 -if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -#ifdef signal -#undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int main() { -int i; -; return 0; } -EOF -if { (eval echo configure:4673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_type_signal=int -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_type_signal" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4693: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -#include -#include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then - : -else - cat > conftest.$ac_ext < -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } - -EOF -if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no -fi -rm -fr conftest* -fi - -fi -fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 -if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4797: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -#include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:4811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_time=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 -if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF -#define TIME_WITH_SYS_TIME 1 -EOF - -fi - -for ac_hdr in \ -getopt.h \ -locale.h \ -stdarg.h \ -sys/ioctl.h \ -sys/select.h \ -sys/time.h \ -termios.h \ -unistd.h \ - -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4844: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - -for ac_func in \ -tgetent \ -tigetnum \ -tigetstr \ -strstr \ - -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4889: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - - - -echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 -echo "configure:4944: checking if sys/time.h works with sys/select.h" >&5 -if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext < -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_sys_time_select=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_sys_time_select=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$cf_cv_sys_time_select" 1>&6 -test "$cf_cv_sys_time_select" = yes && cat >> confdefs.h <<\EOF -#define HAVE_SYS_TIME_SELECT 1 -EOF - - - -TICS_ARGS="$LIBS" -LIBS= - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -DEFS=-DHAVE_CONFIG_H - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13.20030927" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile ncurses_cfg.h:ncurses_tst.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@SET_MAKE@%$SET_MAKE%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@AWK@%$AWK%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@LN_S@%$LN_S%g -s%@MAKE_LOWER_TAGS@%$MAKE_LOWER_TAGS%g -s%@MAKE_UPPER_TAGS@%$MAKE_UPPER_TAGS%g -s%@CC_G_OPT@%$CC_G_OPT%g -s%@CC_SHARED_OPTS@%$CC_SHARED_OPTS%g -s%@DESTDIR@%$DESTDIR%g -s%@DFT_DEP_SUFFIX@%$DFT_DEP_SUFFIX%g -s%@DFT_OBJ_SUBDIR@%$DFT_OBJ_SUBDIR%g -s%@DFT_UPR_MODEL@%$DFT_UPR_MODEL%g -s%@ECHO_LINK@%$ECHO_LINK%g -s%@EXTRA_LDFLAGS@%$EXTRA_LDFLAGS%g -s%@LD@%$LD%g -s%@LDFLAGS_SHARED@%$LDFLAGS_SHARED%g -s%@LD_MODEL@%$LD_MODEL%g -s%@LD_SHARED_OPTS@%$LD_SHARED_OPTS%g -s%@LIBTOOL@%$LIBTOOL%g -s%@LIB_CLEAN@%$LIB_CLEAN%g -s%@LIB_COMPILE@%$LIB_COMPILE%g -s%@LIB_INSTALL@%$LIB_INSTALL%g -s%@LIB_LINK@%$LIB_LINK%g -s%@LIB_SUFFIX@%$LIB_SUFFIX%g -s%@LIB_UNINSTALL@%$LIB_UNINSTALL%g -s%@LINK_PROGS@%$LINK_PROGS%g -s%@LINT@%$LINT%g -s%@LINT_OPTS@%$LINT_OPTS%g -s%@LOCAL_LDFLAGS@%$LOCAL_LDFLAGS%g -s%@MATH_LIB@%$MATH_LIB%g -s%@TICS_ARGS@%$TICS_ARGS%g -s%@TINFO_ARGS@%$TINFO_ARGS%g -s%@cf_cv_abi_version@%$cf_cv_abi_version%g -s%@cf_cv_rel_version@%$cf_cv_rel_version%g -s%@NCURSES_TREE@%$NCURSES_TREE%g -s%@EXEEXT@%$EXEEXT%g -s%@OBJEXT@%$OBJEXT%g -s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g -s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - - -# Transform confdefs.h into a list of #define's. We won't use it as a sed -# script, but as data to insert where we see @DEFS@. We expect AC_SAVE_DEFS to -# be either 'cat' or 'sort'. -cat confdefs.h >conftest.vals - -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - -rm -f conftest.tail -echo ' rm -f conftest.frag' >> $CONFIG_STATUS -while : -do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write chunks of a limited-size here document to conftest.frag. - echo ' cat >> conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS - echo 'CEOF' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -# Run sed to substitute the contents of conftest.frag into conftest.in at the -# marker @DEFS@. -echo ' cat >> conftest.edit < conftest.out -rm -f conftest.in -mv conftest.out conftest.in -rm -f conftest.edit conftest.frag -' >> $CONFIG_STATUS - - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -# Extra commands, if any - - -for cf_dir in . -do - if test ! -d $srcdir/$cf_dir; then - continue - elif test -f $srcdir/$cf_dir/programs; then - $AWK -f $srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK" $srcdir/$cf_dir/programs >>$cf_dir/Makefile - fi -done - - - cat >>Makefile <>Makefile <>Makefile <>Makefile < - -#if HAVE_SYS_TIME_H -#include -#endif - -MODULE_ID("$Id: control.c,v 1.9 2006/06/24 21:27:53 tom Exp $") - -/* terminfo test program control subroutines */ - -#if HAVE_GETTIMEOFDAY -#define MY_TIMER struct timeval -#else -#define MY_TIMER time_t -#endif - -/* globals */ -int test_complete; /* counts number of tests completed */ - -char txt_longer_test_time[80]; /* +) use longer time */ -char txt_shorter_test_time[80]; /* -) use shorter time */ -static int pad_test_duration = 1; /* number of seconds for a pad test */ -int auto_pad_mode; /* run the time tests */ -int no_alarm_event; /* TRUE if the alarm has not gone off yet */ -unsigned long usec_run_time; /* length of last test in microseconds */ -static MY_TIMER stop_watch[MAX_TIMERS]; /* Hold the start timers */ - -char txt_longer_augment[80]; /* >) use bigger augment */ -char txt_shorter_augment[80]; /* <) use smaller augment */ - -/* caps under test data base */ -int tt_delay_max; /* max number of milliseconds we can delay */ -int tt_delay_used; /* number of milliseconds consumed in delay */ -const char *tt_cap[TT_MAX]; /* value of string */ -int tt_affected[TT_MAX]; /* lines or columns effected (repetition factor) */ -int tt_count[TT_MAX]; /* Number of times sent */ -int tt_delay[TT_MAX]; /* Number of milliseconds delay */ -int ttp; /* number of entries used */ - -/* Saved value of the above data base */ -const char *tx_cap[TT_MAX]; /* value of string */ -int tx_affected[TT_MAX]; /* lines or columns effected (repetition factor) */ -int tx_count[TT_MAX]; /* Number of times sent */ -int tx_index[TT_MAX]; /* String index */ -int tx_delay[TT_MAX]; /* Number of milliseconds delay */ -int txp; /* number of entries used */ -int tx_characters; /* printing characters sent by test */ -unsigned long tx_cps; /* characters per second */ -static struct test_list *tx_source; /* The test that generated this data */ - -#define RESULT_BLOCK 1024 -static int blocks; /* number of result blocks available */ -static struct test_results *results; /* pointer to next available */ -static struct test_results **pads; /* save pad results here */ - -static void -alloc_arrays(void) -{ - if (pads == 0) { - pads = (struct test_results **)calloc(MAX_STRINGS, sizeof(struct test_results *)); - } -} - -/* -** event_start(number) -** -** Begin the stopwatch at the current time-of-day. -*/ -void -event_start(int n) -{ -#if HAVE_GETTIMEOFDAY - (void) gettimeofday(&stop_watch[n], (struct timezone *)0); -#else - stop_watch[n] = time((time_t *)0); -#endif -} - -/* -** event_time(number) -** -** Return the number of milliseconds since this stop watch began. -*/ -long -event_time(int n) -{ -#if HAVE_GETTIMEOFDAY - MY_TIMER current_time; - - (void) gettimeofday(¤t_time, (struct timezone *)0); - return ((current_time.tv_sec - stop_watch[n].tv_sec) * 1000000) - + current_time.tv_usec - stop_watch[n].tv_usec; -#else - return (time((time_t *)0) - stop_watch[n]) * 1000; -#endif -} - -/***************************************************************************** - * - * Execution control for string capability tests - * - *****************************************************************************/ - -/* -** get_next_block() -** -** Get a results block for pad test data. -*/ -static struct test_results * -get_next_block(void) -{ - if (blocks <= 0) { - results = (struct test_results *) - malloc(sizeof(struct test_results) * RESULT_BLOCK); - if (!results) { - ptextln("Malloc failed"); - return (struct test_results *) 0; - } - blocks = RESULT_BLOCK; - } - blocks--; - return results++; -} - -/* -** set_augment_txt() -** -** Initialize the augment menu selections -*/ -void -set_augment_txt(void) -{ - sprintf(txt_longer_augment, - ">) Change lines/characters effected to %d", augment << 1); - sprintf(txt_shorter_augment, - "<) Change lines/characters effected to %d", augment >> 1); -} - -void -control_init(void) -{ - sprintf(txt_longer_test_time, "+) Change test time to %d seconds", - pad_test_duration + 1); - sprintf(txt_shorter_test_time, "-) Change test time to %d seconds", - pad_test_duration - 1); - set_augment_txt(); -} - -/* -** msec_cost(cap, affected-count) -** -** Return the number of milliseconds delay needed by the cap. -*/ -int -msec_cost( - const char *const cap, - int affcnt) -{ - int dec, value, total, star, ch; - const char *cp; - - if (!cap) { - return 0; - } - total = 0; - for (cp = cap; *cp; cp++) { - if (*cp == '$' && cp[1] == '<') { - star = 1; - value = dec = 0; - for (cp += 2; (ch = *cp); cp++) { - if (ch >= '0' && ch <= '9') { - value = value * 10 + (ch - '0'); - dec *= 10; - } else - if (ch == '.') { - dec = 1; - } else - if (ch == '*') { - star = affcnt; - } else - if (ch == '>') { - break; - } - } - if (dec > 1) { - total += (value * star) / dec; - } else { - total += (value * star); - } - } - } - return total; -} - -/* -** liberated(cap) -** -** Return the cap without padding -*/ -char * -liberated(char *cap) -{ - static char cb[1024]; - char *ts, *ls; - - cb[0] = '\0'; - ls = NULL; - if (cap) { - for (ts = cb; (*ts = *cap); ++cap) { - if (*cap == '$' && cap[1] == '<') { - ls = ts; - } - ++ts; - if (*cap == '>') { - if (ls) { - ts = ls; - ls = NULL; - } - } - } - } - return cb; -} - -/* -** page_loop() -** -** send CR/LF or go home and bump letter -*/ -void -page_loop(void) -{ - if (line_count + 2 >= lines) { - NEXT_LETTER; - go_home(); - } else { - put_crlf(); - } -} - -/* -** skip_pad_test(test-list-entry, state, ch, text) -** -** Print the start test line. Handle start up commands. -** Return TRUE if a return is requested. -*/ -int -skip_pad_test( - struct test_list *test, - int *state, - int *ch, - const char *text) -{ - char rep_text[16]; - - while(1) { - if (text) { - ptext(text); - } - if ((test->flags & MENU_LC_MASK)) { - sprintf(rep_text, " *%d", augment); - ptext(rep_text); - } - ptext(" [n] > "); - *ch = wait_here(); - if (*ch == 's') { - /* Skip is converted to next */ - *ch = 'n'; - return TRUE; - } - if (*ch == 'q') { - /* Quit is converted to help */ - *ch = '?'; - return TRUE; - } - if (*ch == '\r' || *ch == '\n' || *ch == 'n' || *ch == 'r') { - /* this is the only response that allows the test to run */ - *ch = 0; - } - if (subtest_menu(pad_test_list, state, ch)) { - continue; - } - return (*ch != 0); - } -} - -/* -** pad_done_message(test_list) -** -** Print the Done message and request input. -*/ -void -pad_done_message( - struct test_list *test, - int *state, - int *ch) -{ - int default_action = 0; - char done_message[128]; - char rep_text[16]; - - while (1) { - if ((test->flags & MENU_LC_MASK)) { - sprintf(rep_text, "*%d", augment); - } else { - rep_text[0] = '\0'; - } - if (test->caps_done) { - sprintf(done_message, "(%s)%s Done ", test->caps_done, - rep_text); - ptext(done_message); - } else { - if (rep_text[0]) { - ptext(rep_text); - ptext(" "); - } - ptext("Done "); - } - if (debug_level & 2) { - dump_test_stats(test, state, ch); - } else { - *ch = wait_here(); - } - if (*ch == '\r' || *ch == '\n') { - *ch = default_action; - return; - } - if (*ch == 's' || *ch == 'n') { - *ch = 0; - return; - } - if (strchr(pad_repeat_test, *ch)) { - /* default action is now repeat */ - default_action = 'r'; - } - if (subtest_menu(pad_test_list, state, ch)) { - continue; - } - return; - } -} - -/* -** sliding_scale(dividend, factor, divisor) -** -** Return (dividend * factor) / divisor -*/ -int -sliding_scale( - int dividend, - int factor, - unsigned long divisor) -{ - double d = dividend; - - if (divisor) { - d = (d * (double) factor) / (double) divisor; - return (int) (d + 0.5); - } - return 0; -} - -/* -** pad_test_startup() -** -** Do the stuff needed to begin a test. -*/ -void -pad_test_startup( - int do_clear) -{ - if (do_clear) { - put_clear(); - } - repeats = augment; - raw_characters_sent = 0; - test_complete = ttp = char_count = tt_delay_used = 0; - letter = letters[letter_number = 0]; - if (pad_test_duration <= 0) { - pad_test_duration = 1; - } - tt_delay_max = pad_test_duration * 1000; - set_alarm_clock(pad_test_duration); - event_start(TIME_TEST); -} - -/* -** still_testing() -** -** This function is called to see if the test loop should be terminated. -*/ -int -still_testing(void) -{ - fflush(stdout); - test_complete++; - return EXIT_CONDITION; -} - -/* -** pad_test_shutdown() -** -** Do the stuff needed to end a test. -*/ -void -pad_test_shutdown( - struct test_list *t, - int crlf) -{ - int i; - int counts; /* total counts */ - int ss; /* Save string index */ - int cpo; /* characters per operation */ - int delta; /* difference in characters */ - int bogus; /* Time is inaccurate */ - struct test_results *r; /* Results of current test */ - int ss_index[TT_MAX]; /* String index */ - - alloc_arrays(); - if (tty_can_sync == SYNC_TESTED) { - bogus = tty_sync_error(); - } else { - bogus = 1; - } - usec_run_time = event_time(TIME_TEST); - tx_source = t; - tx_characters = raw_characters_sent; - tx_cps = sliding_scale(tx_characters, 1000000, usec_run_time); - - /* save the data base */ - for (txp = ss = counts = 0; txp < ttp; txp++) { - tx_cap[txp] = tt_cap[txp]; - tx_count[txp] = tt_count[txp]; - tx_delay[txp] = tt_delay[txp]; - tx_affected[txp] = tt_affected[txp]; - tx_index[txp] = get_string_cap_byvalue(tt_cap[txp]); - if (tx_index[txp] >= 0) { - if (cap_match(t->caps_done, strnames[tx_index[txp]])) { - ss_index[ss++] = txp; - counts += tx_count[txp]; - } - } - } - - if (crlf) { - put_crlf(); - } - if (counts == 0 || tty_cps == 0 || bogus) { - /* nothing to do */ - return; - } - /* calculate the suggested pad times */ - delta = usec_run_time - sliding_scale(tx_characters, 1000000, tty_cps); - if (delta < 0) { - /* probably should bump tx_characters */ - delta = 0; - } - cpo = delta / counts; - for (i = 0; i < ss; i++) { - if (!(r = get_next_block())) { - return; - } - r->next = pads[tx_index[ss_index[i]]]; - pads[tx_index[ss_index[i]]] = r; - r->test = t; - r->reps = tx_affected[ss_index[i]]; - r->delay = cpo; - } -} - -/* -** show_cap_results(index) -** -** Display the previous results -*/ -static void -show_cap_results( - int x) -{ - struct test_results *r; /* a result */ - int delay; - - alloc_arrays(); - if ((r = pads[x])) { - sprintf(temp, "(%s)", strnames[x]); - ptext(temp); - while (r) { - sprintf(temp, "$<%d>", r->delay / 1000); - put_columns(temp, (int) strlen(temp), 10); - r = r->next; - } - r = pads[x]; - while (r) { - if (r->reps > 1) { - delay = r->delay / (r->reps * 100); - sprintf(temp, "$<%d.%d*>", delay / 10, delay % 10); - put_columns(temp, (int) strlen(temp), 10); - } - r = r->next; - } - put_crlf(); - } -} - -/* -** dump_test_stats(test_list, status, ch) -** -** Dump the statistics about the last test -*/ -void -dump_test_stats( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - char tbuf[32]; - int x[32]; - - put_crlf(); - if (tx_source && tx_source->caps_done) { - cap_index(tx_source->caps_done, x); - if (x[0] >= 0) { - sprintf(temp, "Caps summary for (%s)", - tx_source->caps_done); - ptextln(temp); - for (i = 0; x[i] >= 0; i++) { - show_cap_results(x[i]); - } - put_crlf(); - } - } - sprintf(tbuf, "%011lu", usec_run_time); - sprintf(temp, "Test time: %lu.%s, characters per second %lu, characters %d", - usec_run_time / 1000000UL, &tbuf[5], tx_cps, tx_characters); - ptextln(temp); - for (i = 0; i < txp; i++) { - if ((j = get_string_cap_byvalue(tx_cap[i])) >= 0) { - sprintf(tbuf, "(%s)", strnames[j]); - } else { - strcpy(tbuf, "(?)"); - } - sprintf(temp, "%8d %3d $<%3d> %8s %s", - tx_count[i], tx_affected[i], tx_delay[i], - tbuf, expand(tx_cap[i])); - putln(temp); - } - generic_done_message(t, state, ch); -} - -/* -** longer_test_time(test_list, status, ch) -** -** Extend the number of seconds for each test. -*/ -void -longer_test_time( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - pad_test_duration += 1; - sprintf(txt_longer_test_time, "+) Change test time to %d seconds", - pad_test_duration + 1); - sprintf(txt_shorter_test_time, "-) Change test time to %d seconds", - pad_test_duration - 1); - sprintf(temp, "Tests will run for %d seconds", pad_test_duration); - ptext(temp); - *ch = REQUEST_PROMPT; -} - -/* -** shorter_test_time(test_list, status, ch) -** -** Shorten the number of seconds for each test. -*/ -void -shorter_test_time( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - if (pad_test_duration > 1) { - pad_test_duration -= 1; - sprintf(txt_longer_test_time, "+) Change test time to %d seconds", - pad_test_duration + 1); - sprintf(txt_shorter_test_time, "-) Change test time to %d seconds", - pad_test_duration - 1); - } - sprintf(temp, "Tests will run for %d second%s", pad_test_duration, - pad_test_duration > 1 ? "s" : ""); - ptext(temp); - *ch = REQUEST_PROMPT; -} - -/* -** longer_augment(test_list, status, ch) -** -** Lengthen the number of lines/characters effected -*/ -void -longer_augment( - struct test_list *t, - int *state GCC_UNUSED, - int *ch) -{ - augment <<= 1; - set_augment_txt(); - if (augment_test) { - t = augment_test; - } - sprintf(temp, "The pad tests will effect %d %s.", augment, - ((t->flags & MENU_LC_MASK) == MENU_lines) ? - "lines" : "characters"); - ptextln(temp); - *ch = REQUEST_PROMPT; -} - -/* -** shorter_augment(test_list, status, ch) -** -** Shorten the number of lines/characters effected -*/ -void -shorter_augment( - struct test_list *t, - int *state GCC_UNUSED, - int *ch) -{ - if (augment > 1) { - /* don't let the augment go to zero */ - augment >>= 1; - } - set_augment_txt(); - if (augment_test) { - t = augment_test; - } - sprintf(temp, "The pad tests will effect %d %s.", augment, - ((t->flags & MENU_LC_MASK) == MENU_lines) ? - "lines" : "characters"); - ptextln(temp); - *ch = REQUEST_PROMPT; -} diff --git a/tack/crum.c b/tack/crum.c deleted file mode 100644 index 8cd40690..00000000 --- a/tack/crum.c +++ /dev/null @@ -1,426 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: crum.c,v 1.5 2006/11/26 00:15:02 tom Exp $") - -/* - * Test cursor movement. - */ - -static void crum_clear(struct test_list *t, int *state, int *ch); -static void crum_home(struct test_list *t, int *state, int *ch); -static void crum_ll(struct test_list *t, int *state, int *ch); -static void crum_move(struct test_list *t, int *state, int *ch); -static void crum_os(struct test_list *t, int *state, int *ch); - -static char crum_text[5][80]; - -struct test_list crum_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_NEXT, 0, "clear", 0, 0, crum_clear, 0}, - {MENU_NEXT, 0, "home", 0, 0, crum_home, 0}, - {MENU_NEXT, 0, "ll", 0, 0, crum_ll, 0}, - {MENU_NEXT, 0, crum_text[0], "home cuu1", 0, crum_move, 0}, - {MENU_NEXT + 1, 0, crum_text[1], "cub1 cud1 cuf1 cuu1", 0, crum_move, 0}, - {MENU_NEXT + 2, 0, crum_text[2], "cub cud cuf cuu", 0, crum_move, 0}, - {MENU_NEXT + 3, 0, crum_text[3], "vpa hpa", 0, crum_move, 0}, - {MENU_NEXT + 4, 0, crum_text[4], "cup", 0, crum_move, 0}, - {MENU_NEXT, 0, "cup", "os", 0, crum_os, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -/* -** move_to(from-row, from-column, to-row, to-column, selection) -** -** move the cursor from (rf, cf) to (rt, ct) using sel -*/ -static void -move_to( - int rf, - int cf, - int rt, - int ct, - int sel) -{ - char *s; - - if (sel & 16) { /* use (cup) */ - s = TPARM_2(cursor_address, rt, ct); - tputs(s, lines, tc_putch); - return; - } - if (sel & 8) { /* use (hpa) (vpa) */ - if (column_address) { - s = TPARM_1(column_address, ct); - tputs(s, 1, tc_putch); - cf = ct; - } - if (row_address) { - s = TPARM_1(row_address, rt); - tputs(s, 1, tc_putch); - rf = rt; - } - } - if (sel & 4) { /* parameterized relative cursor movement */ - if (parm_right_cursor) - if (cf < ct) { - s = TPARM_1(parm_right_cursor, ct - cf); - tputs(s, ct - cf, tc_putch); - cf = ct; - } - if (parm_left_cursor) - if (cf > ct) { - s = TPARM_1(parm_left_cursor, cf - ct); - tputs(s, cf - ct, tc_putch); - cf = ct; - } - if (parm_down_cursor) - if (rf < rt) { - s = TPARM_1(parm_down_cursor, rt - rf); - tputs(s, rt - rf, tc_putch); - rf = rt; - } - if (parm_up_cursor) - if (rf > rt) { - s = TPARM_1(parm_up_cursor, rf - rt); - tputs(s, rf - rt, tc_putch); - rf = rt; - } - } - if (sel & 2) { - if (cursor_left) - while (cf > ct) { - tc_putp(cursor_left); - cf--; - } - /* - do vertical motion next. Just in case cursor_down has a - side effect of changing the column. This could happen if - the tty handler translates NL to CRNL. - */ - if (cursor_down) - while (rf < rt) { - tc_putp(cursor_down); - rf++; - } - if (cursor_up) - while (rf > rt) { - tc_putp(cursor_up); - rf--; - } - if (cursor_right) - while (cf < ct) { - tc_putp(cursor_right); - cf++; - } - } - /* last chance */ - if (rf > rt) { - if (can_go_home) { /* a bit drastic but ... */ - go_home(); - cf = 0; - rf = 0; - } else if (cursor_up) { - while (rf > rt) { - tc_putp(cursor_up); - rf--; - } - } - } - if (ct == 0 && rt > rf) { - put_crlf(); - cf = 0; - rf++; - } - if (ct == 0 && cf != 0) { - put_cr(); - cf = 0; - } - while (rf < rt) { - put_lf(); - rf++; - } - while (cf > ct) { - put_str("\b"); - cf--; - } - if (cursor_right) { - while (cf < ct) { - tc_putp(cursor_right); - cf++; - } - } else { - /* go ahead and trash my display */ - while (cf < ct) { - putchp(' '); - cf++; - } - } -} - -/* -** display_it(selection, text) -** -** print the display using sel -*/ -static void -display_it( - int sel, - char *txt) -{ - int i, done_line; - - put_clear(); - go_home(); - put_newlines(2); - ptextln(" The top line should be alternating <'s and >'s"); - ptextln(" The left side should be alternating A's and V's"); - ptext(" Testing "); - ptext(txt); - put_cr(); - - /* horizontal */ - move_to(done_line = line_count, 0, 0, 2, sel); - for (i = 4; i < columns - 2; i += 2) { - putchp('>'); - move_to(0, i - 1, 0, i, sel); - } - putchp('>'); - i -= 2; - move_to(0, i + 1, 0, i - 1, sel); - for (; i > 2; i -= 2) { - putchp('<'); - move_to(0, i, 0, i - 3, sel); - } - putchp('<'); - - /* vertical */ - move_to(0, 2, 0, 0, sel); - for (i = 2; i < lines - 1; i += 2) { - putchp('V'); - move_to(i - 2, 1, i, 0, sel); - } - putchp('V'); - i -= 2; - move_to(i, 1, i + 1, 0, sel); - for (; i > 0; i -= 2) { - putchp('A'); - move_to(i + 1, 1, i - 1, 0, sel); - } - putchp('A'); - move_to(i + 1, 1, 0, 0, sel); /* go home first */ - move_to(0, 0, done_line + 1, 3, sel); - put_str(txt); - put_str(" Done. "); -} - -/* -** crum_clear(test_list, status, ch) -** -** (clear) test Clear screen -*/ -static void -crum_clear( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (clear_screen) { - for (i = lines; i > 1; i--) { - putln("garbage"); - } - put_clear(); - ptextln("This line should start in the home position."); - ptext("The rest of the screen should be clear. "); - } else { - ptextln("(clear) Clear screen is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** crum_home(test_list, status, ch) -** -** (home) test Home cursor -*/ -static void -crum_home( - struct test_list *t, - int *state, - int *ch) -{ - if (cursor_home) { - put_clear(); - put_newlines(lines / 2); - go_home(); - put_crlf(); - ptext("The bottom line should have text."); - go_home(); - put_newlines(lines - 1); - ptext("This line is on the bottom."); - go_home(); - ptextln("This line starts in the home position."); - put_crlf(); - } else { - ptextln("(home) Home cursor is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** crum_ll(test_list, status, ch) -** -** (ll) test Last line -*/ -static void -crum_ll( - struct test_list *t, - int *state, - int *ch) -{ - /* - (ll) may be simulated with (cup). Don't complain if (cup) is present. - */ - if (cursor_to_ll) { - put_clear(); - put_str("This line could be anywhere."); - tc_putp(cursor_to_ll); - ptext("This line should be on the bottom"); - go_home(); - put_crlf(); - } else - if (cursor_address) { - return; - } else { - ptextln("(ll) Move to last line is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** crum_move(test_list, status, ch) -** -** (*) test all cursor move commands -*/ -static void -crum_move( - struct test_list *t, - int *state, - int *ch) -{ - char buf[80]; - int n; - - switch (n = (t->flags & 15)) { - case 0: - sprintf(buf, " (cr) (nel) (cub1)%s", - cursor_home ? " (home)" : (cursor_up ? " (cuu1)" : "")); - break; - case 1: - sprintf(buf, "%s%s%s%s", cursor_left ? " (cub1)" : "", - cursor_down ? " (cud1)" : "", cursor_right ? " (cuf1)" : "", - cursor_up ? " (cuu1)" : ""); - if (buf[0] == '\0') { - ptext(" (cub1) (cud1) (cuf1) (cuu1) not defined."); - } - break; - case 2: - sprintf(buf, "%s%s%s%s", parm_left_cursor ? " (cub)" : "", - parm_down_cursor ? " (cud)" : "", - parm_right_cursor ? " (cuf)" : "", - parm_up_cursor ? " (cuu)" : ""); - if (buf[0] == '\0') { - ptext(" (cub) (cud) (cuf) (cuu) not defined."); - } - break; - case 3: - sprintf(buf, "%s%s", row_address ? " (vpa)" : "", - column_address ? " (hpa)" : ""); - if (buf[0] == '\0') { - ptext(" (vpa) (hpa) not defined."); - } - break; - case 4: - if (!cursor_address) { - ptext(" (cup) not defined. "); - generic_done_message(t, state, ch); - return; - } - strcpy(buf, " (cup)"); - break; - } - if (buf[0] == '\0') { - put_str(" Done. "); - } else { - can_test(buf, FLAG_TESTED); - strcpy(crum_text[n], &buf[2]); - crum_text[n][strlen(buf) - 3] = '\0'; - - display_it(1 << n, buf); - } - *ch = wait_here(); - if (*ch != 'r') { - put_clear(); - } -} - -/* -** crum_os(test_list, status, ch) -** -** (cup) test Cursor position on overstrike terminals -*/ -static void -crum_os( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (cursor_address && over_strike) { - put_clear(); - for (i = 0; i < columns - 2; i++) { - tc_putch('|'); - } - for (i = 1; i < lines - 2; i++) { - put_crlf(); - tc_putch('_'); - } - for (i = 0; i < columns - 2; i++) { - tputs(TPARM_2(cursor_address, 0, i), lines, tc_putch); - tc_putch('+'); - } - for (i = 0; i < lines - 2; i++) { - tputs(TPARM_2(cursor_address, i, 0), lines, tc_putch); - tc_putch(']'); - tc_putch('_'); - } - go_home(); - put_newlines(3); - ptext(" All the characters should look the same. "); - generic_done_message(t, state, ch); - put_clear(); - } -} diff --git a/tack/edit.c b/tack/edit.c deleted file mode 100644 index b23f3ab0..00000000 --- a/tack/edit.c +++ /dev/null @@ -1,992 +0,0 @@ -/* -** Copyright (C) 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include -#include -#include - -MODULE_ID("$Id: edit.c,v 1.11 2006/06/24 21:22:42 tom Exp $") - -/* - * Terminfo edit features - */ -static void show_info(struct test_list *, int *, int *); -static void show_value(struct test_list *, int *, int *); -static void show_untested(struct test_list *, int *, int *); -static void show_changed(struct test_list *, int *, int *); - -#define SHOW_VALUE 1 -#define SHOW_EDIT 2 -#define SHOW_DELETE 3 - -struct test_list edit_test_list[] = { - {MENU_CLEAR, 0, 0, 0, "i) display current terminfo", show_info, 0}, - {0, 0, 0, 0, "w) write the current terminfo to a file", save_info, 0}, - {SHOW_VALUE, 3, 0, 0, "v) show value of a selected cap", show_value, 0}, - {SHOW_EDIT, 4, 0, 0, "e) edit value of a selected cap", show_value, 0}, - {SHOW_DELETE, 3, 0, 0, "d) delete string", show_value, 0}, - {0, 3, 0, 0, "m) show caps that have been modified", show_changed, 0}, - {MENU_CLEAR + FLAG_CAN_TEST, 0, 0, 0, "c) show caps that can be tested", show_report, 0}, - {MENU_CLEAR + FLAG_TESTED, 0, 0, 0, "t) show caps that have been tested", show_report, 0}, - {MENU_CLEAR + FLAG_FUNCTION_KEY, 0, 0, 0, "f) show a list of function keys", show_report, 0}, - {MENU_CLEAR, 0, 0, 0, "u) show caps defined that can not be tested", show_untested, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -static char change_pad_text[MAX_CHANGES][80]; -static struct test_list change_pad_list[MAX_CHANGES] = { - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -static void build_change_menu(struct test_menu *); -static void change_one_entry(struct test_list *, int *, int *); - -struct test_menu change_pad_menu = { - 0, 'q', 0, - "Select cap name", "change", 0, - build_change_menu, change_pad_list, 0, 0, 0 -}; - -static TERMTYPE original_term; /* terminal type description */ - -static char flag_boolean[BOOLCOUNT]; /* flags for booleans */ -static char flag_numerics[NUMCOUNT]; /* flags for numerics */ -static char *flag_strings; /* flags for strings */ -static int *label_strings; -static int xon_index; /* Subscript for (xon) */ -static int xon_shadow; - -static int start_display; /* the display has just started */ -static int display_lines; /* number of lines displayed */ - -static void -alloc_arrays(void) -{ - if (flag_strings == 0) { - label_strings = (int *)calloc(MAX_STRINGS, sizeof(int)); - flag_strings = (char *)calloc(MAX_STRINGS, sizeof(char)); - } -} - -/* -** send_info_string(str) -** -** Return the terminfo string prefixed by the correct separator -*/ -static void -send_info_string( - const char *str, - int *ch) -{ - int len; - - if (display_lines == -1) { - return; - } - len = strlen(str); - if (len + char_count + 3 >= columns) { - if (start_display == 0) { - put_str(","); - } - put_crlf(); - if (++display_lines > lines) { - ptext("-- more -- "); - *ch = wait_here(); - if (*ch == 'q') { - display_lines = -1; - return; - } - display_lines = 0; - } - if (len >= columns) { - /* if the terminal does not (am) then this loses */ - if (columns) { - display_lines += ((strlen(str) + 3) / columns) + 1; - } - put_str(" "); - put_str(str); - start_display = 0; - return; - } - ptext(" "); - } else - if (start_display == 0) { - ptext(", "); - } else { - ptext(" "); - } - ptext(str); - start_display = 0; -} - -/* -** show_info(test_list, status, ch) -** -** Display the current terminfo -*/ -static void -show_info( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - int i; - char buf[1024]; - - display_lines = 1; - start_display = 1; - for (i = 0; i < BOOLCOUNT; i++) { - if ((i == xon_index) ? xon_shadow : CUR Booleans[i]) { - send_info_string(boolnames[i], ch); - } - } - for (i = 0; i < NUMCOUNT; i++) { - if (CUR Numbers[i] >= 0) { - sprintf(buf, "%s#%d", numnames[i], CUR Numbers[i]); - send_info_string(buf, ch); - } - } - for (i = 0; i < MAX_STRINGS; i++) { - if (CUR Strings[i]) { - sprintf(buf, "%s=%s", STR_NAME(i), - print_expand(CUR Strings[i])); - send_info_string(buf, ch); - } - } - put_newlines(2); - *ch = REQUEST_PROMPT; -} - -/* -** save_info_string(str, fp) -** -** Write the terminfo string prefixed by the correct separator -*/ -static void -save_info_string( - const char *str, - FILE *fp) -{ - int len; - - len = strlen(str); - if (len + display_lines >= 77) { - if (display_lines > 0) { - (void) fprintf(fp, "\n\t"); - } - display_lines = 8; - } else - if (display_lines > 0) { - (void) fprintf(fp, " "); - display_lines++; - } else { - (void) fprintf(fp, "\t"); - display_lines = 8; - } - (void) fprintf(fp, "%s,", str); - display_lines += len + 1; -} - -/* -** save_info(test_list, status, ch) -** -** Write the current terminfo to a file -*/ -void -save_info( - struct test_list *t, - int *state, - int *ch) -{ - int i; - FILE *fp; - time_t now; - char buf[1024]; - - if ((fp = fopen(tty_basename, "w")) == (FILE *) NULL) { - (void) sprintf(temp, "can't open: %s", tty_basename); - ptextln(temp); - generic_done_message(t, state, ch); - return; - } - time(&now); - /* Note: ctime() returns a newline at the end of the string */ - (void) fprintf(fp, "# Terminfo created by TACK for TERM=%s on %s", - tty_basename, ctime(&now)); - (void) fprintf(fp, "%s|%s,\n", tty_basename, longname()); - - display_lines = 0; - for (i = 0; i < BOOLCOUNT; i++) { - if (i == xon_index ? xon_shadow : CUR Booleans[i]) { - save_info_string(boolnames[i], fp); - } - } - for (i = 0; i < NUMCOUNT; i++) { - if (CUR Numbers[i] >= 0) { - sprintf(buf, "%s#%d", numnames[i], CUR Numbers[i]); - save_info_string(buf, fp); - } - } - for (i = 0; i < MAX_STRINGS; i++) { - if (CUR Strings[i]) { - sprintf(buf, "%s=%s", STR_NAME(i), - _nc_tic_expand(CUR Strings[i], TRUE, TRUE)); - save_info_string(buf, fp); - } - } - (void) fprintf(fp, "\n"); - (void) fclose(fp); - sprintf(temp, "Terminfo saved as file: %s", tty_basename); - ptextln(temp); -} - -/* -** show_value(test_list, status, ch) -** -** Display the value of a selected cap -*/ -static void -show_value( - struct test_list *t, - int *state GCC_UNUSED, - int *ch) -{ - struct name_table_entry const *nt; - char *s; - int n, op, b; - char buf[1024]; - char tmp[1024]; - - ptext("enter name: "); - read_string(buf, 80); - if (buf[0] == '\0' || buf[1] == '\0') { - *ch = buf[0]; - return; - } - if (line_count + 2 >= lines) { - put_clear(); - } - op = t->flags & 255; - if ((nt = _nc_find_entry(buf, _nc_info_hash_table))) { - switch (nt->nte_type) { - case BOOLEAN: - if (op == SHOW_DELETE) { - if (nt->nte_index == xon_index) { - xon_shadow = 0; - } else { - CUR Booleans[nt->nte_index] = 0; - } - return; - } - b = nt->nte_index == xon_index ? xon_shadow : - CUR Booleans[nt->nte_index]; - sprintf(temp, "boolean %s %s", buf, - b ? "True" : "False"); - break; - case STRING: - if (op == SHOW_DELETE) { - CUR Strings[nt->nte_index] = (char *) 0; - return; - } - if (CUR Strings[nt->nte_index]) { - sprintf(temp, "string %s %s", buf, - expand(CUR Strings[nt->nte_index])); - } else { - sprintf(temp, "undefined string %s", buf); - } - break; - case NUMBER: - if (op == SHOW_DELETE) { - CUR Numbers[nt->nte_index] = -1; - return; - } - sprintf(temp, "numeric %s %d", buf, - CUR Numbers[nt->nte_index]); - break; - default: - sprintf(temp, "unknown"); - break; - } - ptextln(temp); - } else { - sprintf(temp, "Cap not found: %s", buf); - ptextln(temp); - return; - } - if (op != SHOW_EDIT) { - return; - } - if (nt->nte_type == BOOLEAN) { - ptextln("Value flipped"); - if (nt->nte_index == xon_index) { - xon_shadow = !xon_shadow; - } else { - CUR Booleans[nt->nte_index] = !CUR Booleans[nt->nte_index]; - } - return; - } - ptextln("Enter new value"); - read_string(buf, sizeof(buf)); - - switch (nt->nte_type) { - case STRING: - _nc_reset_input((FILE *) 0, buf); - _nc_trans_string(tmp, tmp + sizeof(tmp)); - s = (char *)malloc(strlen(tmp) + 1); - strcpy(s, tmp); - CUR Strings[nt->nte_index] = s; - sprintf(temp, "new string value %s", nt->nte_name); - ptextln(temp); - ptextln(expand(CUR Strings[nt->nte_index])); - break; - case NUMBER: - if (sscanf(buf, "%d", &n) == 1) { - CUR Numbers[nt->nte_index] = n; - sprintf(temp, "new numeric value %s %d", - nt->nte_name, n); - ptextln(temp); - } else { - sprintf(temp, "Illegal number: %s", buf); - ptextln(temp); - } - break; - default: - break; - } -} - -/* -** get_string_cap_byname(name, long_name) -** -** Given a cap name, find the value -** Errors are quietly ignored. -*/ -char * -get_string_cap_byname( - const char *name, - const char **long_name) -{ - struct name_table_entry const *nt; - - if ((nt = _nc_find_entry(name, _nc_info_hash_table))) { - if (nt->nte_type == STRING) { - *long_name = strfnames[nt->nte_index]; - return (CUR Strings[nt->nte_index]); - } - } - *long_name = "??"; - return (char *) 0; -} - -/* -** get_string_cap_byvalue(value) -** -** Given a capability string, find its position in the data base. -** Return the index or -1 if not found. -*/ -int -get_string_cap_byvalue( - const char *value) -{ - int i; - - if (value) { - for (i = 0; i < MAX_STRINGS; i++) { - if (CUR Strings[i] == value) { - return i; - } - } - /* search for translated strings */ - for (i = 0; i < TM_last; i++) { - if (TM_string[i].value == value) { - return TM_string[i].index; - } - } - } - return -1; -} - -/* -** show_changed(test_list, status, ch) -** -** Display a list of caps that have been changed. -*/ -static void -show_changed( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - int i, header = 1, v; - const char *a; - const char *b; - static char title[] = " old value cap new value"; - char abuf[1024]; - - for (i = 0; i < BOOLCOUNT; i++) { - v = (i == xon_index) ? xon_shadow : CUR Booleans[i]; - if (original_term.Booleans[i] != v) { - if (header) { - ptextln(title); - header = 0; - } - sprintf(temp, "%30d %6s %d", - original_term.Booleans[i], boolnames[i], v); - ptextln(temp); - } - } - for (i = 0; i < NUMCOUNT; i++) { - if (original_term.Numbers[i] != CUR Numbers[i]) { - if (header) { - ptextln(title); - header = 0; - } - sprintf(temp, "%30d %6s %d", - original_term.Numbers[i], numnames[i], - CUR Numbers[i]); - ptextln(temp); - } - } - for (i = 0; i < MAX_STRINGS; i++) { - a = original_term.Strings[i] ? original_term.Strings[i] : ""; - b = CUR Strings[i] ? CUR Strings[i] : ""; - if (strcmp(a, b)) { - if (header) { - ptextln(title); - header = 0; - } - strcpy(abuf, _nc_tic_expand(a, TRUE, TRUE)); - sprintf(temp, "%30s %6s %s", abuf, STR_NAME(i), - _nc_tic_expand(b, TRUE, TRUE)); - putln(temp); - } - } - if (header) { - ptextln("No changes"); - } - put_crlf(); - *ch = REQUEST_PROMPT; -} - -/* -** user_modified() -** -** Return TRUE if the user has modified the terminfo -*/ -int -user_modified(void) -{ - const char *a, *b; - int i, v; - - for (i = 0; i < BOOLCOUNT; i++) { - v = (i == xon_index) ? xon_shadow : CUR Booleans[i]; - if (original_term.Booleans[i] != v) { - return TRUE; - } - } - for (i = 0; i < NUMCOUNT; i++) { - if (original_term.Numbers[i] != CUR Numbers[i]) { - return TRUE; - } - } - for (i = 0; i < MAX_STRINGS; i++) { - a = original_term.Strings[i] ? original_term.Strings[i] : ""; - b = CUR Strings[i] ? CUR Strings[i] : ""; - if (strcmp(a, b)) { - return TRUE; - } - } - return FALSE; -} - -/***************************************************************************** - * - * Maintain the list of capabilities that can be tested - * - *****************************************************************************/ - -/* -** mark_cap(name, flag) -** -** Mark the cap data base with the flag provided. -*/ -static void -mark_cap( - char *name, - int flag) -{ - struct name_table_entry const *nt; - - alloc_arrays(); - if ((nt = _nc_find_entry(name, _nc_info_hash_table))) { - switch (nt->nte_type) { - case BOOLEAN: - flag_boolean[nt->nte_index] |= flag; - break; - case STRING: - flag_strings[nt->nte_index] |= flag; - break; - case NUMBER: - flag_numerics[nt->nte_index] |= flag; - break; - default: - sprintf(temp, "unknown cap type (%s)", name); - ptextln(temp); - break; - } - } else { - sprintf(temp, "Cap not found: %s", name); - ptextln(temp); - (void) wait_here(); - } -} - -/* -** can_test(name-list, flags) -** -** Scan the name list and get the names. -** Enter each name into the can-test data base. -** ( and ) may be used as separators. -*/ -void -can_test( - const char *s, - int flags) -{ - int ch, j; - char name[32]; - - if (s) { - for (j = 0; (name[j] = ch = *s); s++) { - if (ch == ' ' || ch == ')' || ch == '(') { - if (j) { - name[j] = '\0'; - mark_cap(name, flags); - } - j = 0; - } else { - j++; - } - } - if (j) { - mark_cap(name, flags); - } - } -} - -/* -** cap_index(name-list, index-list) -** -** Scan the name list and return a list of indexes. -** ( and ) may be used as separators. -** This list is terminated with -1. -*/ -void -cap_index( - const char *s, - int *inx) -{ - struct name_table_entry const *nt; - int ch, j; - char name[32]; - - if (s) { - for (j = 0; ; s++) { - name[j] = ch = *s; - if (ch == ' ' || ch == ')' || ch == '(' || ch == 0) { - if (j) { - name[j] = '\0'; - if ((nt = _nc_find_entry(name, - _nc_info_hash_table)) && - (nt->nte_type == STRING)) { - *inx++ = nt->nte_index; - } - } - if (ch == 0) { - break; - } - j = 0; - } else { - j++; - } - } - } - *inx = -1; -} - -/* -** cap_match(name-list, cap) -** -** Scan the name list and see if the cap is in the list. -** Return TRUE if we find an exact match. -** ( and ) may be used as separators. -*/ -int -cap_match( - const char *names, - const char *cap) -{ - char *s; - int c, l, t; - - if (names) { - l = strlen(cap); - while ((s = strstr(names, cap))) { - c = (names == s) ? 0 : *(s - 1); - t = s[l]; - if ((c == 0 || c == ' ' || c == '(') && - (t == 0 || t == ' ' || t == ')')) { - return TRUE; - } - if (t == 0) { - break; - } - names = s + l; - } - } - return FALSE; -} - -/* -** show_report(test_list, status, ch) -** -** Display a list of caps that can be tested -*/ -void -show_report( - struct test_list *t, - int *state GCC_UNUSED, - int *ch) -{ - int i, j, nc, flag; - const char *s; - const char **nx = malloc(BOOLCOUNT + NUMCOUNT + MAX_STRINGS); - - alloc_arrays(); - flag = t->flags & 255; - nc = 0; - for (i = 0; i < BOOLCOUNT; i++) { - if (flag_boolean[i] & flag) { - nx[nc++] = boolnames[i]; - } - } - for (i = 0; i < NUMCOUNT; i++) { - if (flag_numerics[i] & flag) { - nx[nc++] = numnames[i]; - } - } - for (i = 0; i < MAX_STRINGS; i++) { - if (flag_strings[i] & flag) { - nx[nc++] = STR_NAME(i); - } - } - /* sort */ - for (i = 0; i < nc - 1; i++) { - for (j = i + 1; j < nc; j++) { - if (strcmp(nx[i], nx[j]) > 0) { - s = nx[i]; - nx[i] = nx[j]; - nx[j] = s; - } - } - } - if (flag & FLAG_FUNCTION_KEY) { - ptextln("The following function keys can be tested:"); - } else - if (flag & FLAG_CAN_TEST) { - ptextln("The following capabilities can be tested:"); - } else - if (flag & FLAG_TESTED) { - ptextln("The following capabilities have been tested:"); - } - put_crlf(); - for (i = 0; i < nc; i++) { - sprintf(temp, "%s ", nx[i]); - ptext(temp); - } - put_newlines(1); - *ch = REQUEST_PROMPT; - free (nx); -} - -/* -** show_untested(test_list, status, ch) -** -** Display a list of caps that are defined but cannot be tested. -** Don't bother to sort this list. -*/ -static void -show_untested( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - int i; - - alloc_arrays(); - ptextln("Caps that are defined but cannot be tested:"); - for (i = 0; i < BOOLCOUNT; i++) { - if (flag_boolean[i] == 0 && CUR Booleans[i]) { - sprintf(temp, "%s ", boolnames[i]); - ptext(temp); - } - } - for (i = 0; i < NUMCOUNT; i++) { - if (flag_numerics[i] == 0 && CUR Numbers[i] >= 0) { - sprintf(temp, "%s ", numnames[i]); - ptext(temp); - } - } - for (i = 0; i < MAX_STRINGS; i++) { - if (flag_strings[i] == 0 && CUR Strings[i]) { - sprintf(temp, "%s ", STR_NAME(i)); - ptext(temp); - } - } - put_newlines(1); - *ch = REQUEST_PROMPT; -} - -/* -** edit_init() -** -** Initialize the function key data base -*/ -void -edit_init(void) -{ - int i, j, lc; - char *lab; - struct name_table_entry const *nt; - - alloc_arrays(); - - _nc_copy_termtype(&original_term, &cur_term->type); - for (i = 0; i < BOOLCOUNT; i++) { - original_term.Booleans[i] = CUR Booleans[i]; - } - for (i = 0; i < NUMCOUNT; i++) { - original_term.Numbers[i] = CUR Numbers[i]; - } - /* scan for labels */ - for (i = lc = 0; i < MAX_STRINGS; i++) { - original_term.Strings[i] = CUR Strings[i]; - if (strncmp(STR_NAME(i), "lf", 2) == 0) { - flag_strings[i] |= FLAG_LABEL; - if (CUR Strings[i]) { - label_strings[lc++] = i; - } - } - } - /* scan for function keys */ - for (i = 0; i < MAX_STRINGS; i++) { - const char *this_name = STR_NAME(i); - if ((this_name[0] == 'k') && strcmp(this_name, "kmous")) { - flag_strings[i] |= FLAG_FUNCTION_KEY; - lab = (char *) 0; - for (j = 0; j < lc; j++) { - if (!strcmp(this_name, - STR_NAME(label_strings[j]))) { - lab = CUR Strings[label_strings[j]]; - break; - } - } - enter_key(this_name, CUR Strings[i], lab); - } - } - /* Lookup the translated strings */ - for (i = 0; i < TM_last; i++) { - if ((nt = _nc_find_entry(TM_string[i].name, - _nc_info_hash_table)) && (nt->nte_type == STRING)) { - TM_string[i].index = nt->nte_index; - } else { - sprintf(temp, "TM_string lookup failed for: %s", - TM_string[i].name); - ptextln(temp); - } - } - if ((nt = _nc_find_entry("xon", _nc_info_hash_table)) != 0) { - xon_index = nt->nte_index; - } - xon_shadow = xon_xoff; - free(label_strings); -} - -/* -** change_one_entry(test_list, status, ch) -** -** Change the padding on the selected cap -*/ -static void -change_one_entry( - struct test_list *test, - int *state, - int *chp) -{ - struct name_table_entry const *nt; - int i, j, x, star, slash, v, dot, ch; - const char *s; - char *t, *p; - const char *current_string; - char buf[1024]; - char pad[1024]; - - i = test->flags & 255; - if (i == 255) { - /* read the cap name from the user */ - ptext("enter name: "); - read_string(pad, 32); - if (pad[0] == '\0' || pad[1] == '\0') { - *chp = pad[0]; - return; - } - if ((nt = _nc_find_entry(pad, _nc_info_hash_table)) && - (nt->nte_type == STRING)) { - x = nt->nte_index; - current_string = CUR Strings[x]; - } else { - sprintf(temp, "%s is not a string capability", pad); - ptext(temp); - generic_done_message(test, state, chp); - return; - } - } else { - x = tx_index[i]; - current_string = tx_cap[i]; - strcpy(pad, STR_NAME(x)); - } - if (!current_string) { - ptextln("That string is not currently defined. Please enter a new value, including the padding delay:"); - read_string(buf, sizeof(buf)); - _nc_reset_input((FILE *) 0, buf); - _nc_trans_string(pad, pad + sizeof(pad)); - t = (char *)malloc(strlen(pad) + 1); - strcpy(t, pad); - CUR Strings[x] = t; - sprintf(temp, "new string value %s", STR_NAME(x)); - ptextln(temp); - ptextln(expand(t)); - return; - } - sprintf(buf, "Current value: (%s) %s", pad, _nc_tic_expand(current_string, TRUE, TRUE)); - putln(buf); - ptextln("Enter new pad. 0 for no pad. CR for no change."); - read_string(buf, 32); - if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(UChar(buf[0])))) { - *chp = buf[0]; - return; - } - star = slash = FALSE; - for (j = v = dot = 0; (ch = buf[j]); j++) { - if (ch >= '0' && ch <= '9') { - v = ch - '0' + v * 10; - if (dot) { - dot++; - } - } else if (ch == '*') { - star = TRUE; - } else if (ch == '/') { - slash = TRUE; - } else if (ch == '.') { - dot = 1; - } else { - sprintf(temp, "Illegal character: %c", ch); - ptextln(temp); - ptext("General format: 99.9*/ "); - generic_done_message(test, state, chp); - return; - } - } - while (dot > 2) { - v /= 10; - dot--; - } - if (dot == 2) { - sprintf(pad, "%d.%d%s%s", v / 10, v % 10, - star ? "*" : "", slash ? "/" : ""); - } else { - sprintf(pad, "%d%s%s", - v, star ? "*" : "", slash ? "/" : ""); - } - s = current_string; - t = buf; - for (v = 0; (ch = *t = *s++); t++) { - if (v == '$' && ch == '<') { - while ((ch = *s++) && (ch != '>')); - for (p = pad; (*++t = *p++); ); - *t++ = '>'; - while ((*t++ = *s++)); - pad[0] = '\0'; - break; - } - v = ch; - } - if (pad[0]) { - sprintf(t, "$<%s>", pad); - } - if ((t = (char *)malloc(strlen(buf) + 1))) { - strcpy(t, buf); - CUR Strings[x] = t; - if (i != 255) { - tx_cap[i] = t; - } - } - generic_done_message(test, state, chp); -} - -/* -** build_change_menu(menu_list) -** -** Build the change pad menu list -*/ -static void -build_change_menu( - struct test_menu *m) -{ - int i, j, k; - char *s; - - for (i = j = 0; i < txp; i++) { - if ((k = tx_index[i]) >= 0) { - s = _nc_tic_expand(tx_cap[i], TRUE, TRUE); - s[40] = '\0'; - sprintf(change_pad_text[j], "%c) (%s) %s", - 'a' + j, STR_NAME(k), s); - change_pad_list[j].flags = i; - change_pad_list[j].lines_needed = 4; - change_pad_list[j].menu_entry = change_pad_text[j]; - change_pad_list[j].test_procedure = change_one_entry; - j++; - } - } - strcpy(change_pad_text[j], "z) enter name"); - change_pad_list[j].flags = 255; - change_pad_list[j].lines_needed = 4; - change_pad_list[j].menu_entry = change_pad_text[j]; - change_pad_list[j].test_procedure = change_one_entry; - j++; - change_pad_list[j].flags = MENU_LAST; - if (m->menu_title) { - put_crlf(); - ptextln(m->menu_title); - } -} diff --git a/tack/fun.c b/tack/fun.c deleted file mode 100644 index 37888721..00000000 --- a/tack/fun.c +++ /dev/null @@ -1,925 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: fun.c,v 1.9 2006/11/26 00:15:53 tom Exp $") - -/* - * Test the function keys on the terminal. The code for echo tests - * lives here too. - */ - -static void funkey_keys(struct test_list *, int *, int *); -static void funkey_meta(struct test_list *, int *, int *); -static void funkey_label(struct test_list *, int *, int *); -static void funkey_prog(struct test_list *, int *, int *); -static void funkey_local(struct test_list *, int *, int *); - -struct test_list funkey_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_CLEAR + FLAG_FUNCTION_KEY, 0, 0, 0, "f) show a list of function keys", show_report, 0}, - {MENU_NEXT | MENU_CLEAR, 0, "smkx) (rmkx", 0, - "k) test function keys", funkey_keys, 0}, - {MENU_NEXT, 10, "km", "smm rmm", 0, funkey_meta, 0}, - {MENU_NEXT, 8, "nlab) (smln) (pln) (rmln", "lw lh", 0, funkey_label, 0}, - {MENU_NEXT, 2, "pfx", 0, 0, funkey_prog, 0}, - {MENU_NEXT, 2, "pfloc", 0, 0, funkey_local, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -static void printer_on(struct test_list *, int *, int *); -static void printer_mc0(struct test_list *, int *, int *); - -struct test_list printer_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_NEXT | MENU_CLEAR, 0, "mc4) (mc5) (mc5i", 0, 0, printer_on, 0}, - {MENU_NEXT | MENU_CLEAR, 0, "mc0", 0, 0, printer_mc0, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -/* local definitions */ -static const char **fk_name; -static char **fkval; -static char **fk_label; /* function key labels (if any) */ -static int *fk_tested; -static int num_strings = 0; - -static int fkmax = 1; /* length of longest key */ -static int got_labels = 0; /* true if we have some labels */ -static int key_count = 0; -static int end_state; - -/* unknown function keys */ -#define MAX_FK_UNK 50 -static char *fk_unknown[MAX_FK_UNK]; -static int fk_length[MAX_FK_UNK]; -static int funk; - -/* - * Initialize arrays that depend on the actual number of strings. - */ -static void -alloc_strings(void) -{ - if (num_strings != MAX_STRINGS) { - num_strings = MAX_STRINGS; - fk_name = (const char **)calloc(num_strings, sizeof(const char *)); - fkval = (char **)calloc(num_strings, sizeof(char *)); - fk_label = (char **)calloc(num_strings, sizeof(char *)); - fk_tested = (int *)calloc(num_strings, sizeof(int)); - } -} - -/* -** keys_tested(first-time, show-help, hex-output) -** -** Display a list of the keys not tested. -*/ -static void -keys_tested( - int first_time, - int show_help, - int hex_output) -{ - int i, l; - char outbuf[256]; - - alloc_strings(); - put_clear(); - tty_set(); - flush_input(); - if (got_labels) { - putln("Function key labels:"); - for (i = 0; i < key_count; ++i) { - if (fk_label[i]) { - sprintf(outbuf, "%s %s", - fk_name[i] ? fk_name[i] : "??", fk_label[i]); - put_columns(outbuf, (int) strlen(outbuf), 16); - } - } - put_newlines(2); - } - if (funk) { - putln("The following keys are not defined:"); - for (i = 0; i < funk; ++i) { - put_columns(fk_unknown[i], fk_length[i], 16); - } - put_mode(exit_attribute_mode); - put_newlines(2); - } - if (first_time) { - putln("The following keys are defined:"); - } else { - putln("The following keys have not been tested:"); - } - if (scan_mode) { - for (i = 0; scan_down[i]; i++) { - if (!scan_tested[i]) { - if (hex_output) { - strcpy(outbuf, hex_expand_to(scan_down[i], 3)); - } else { - strcpy(outbuf, expand(scan_down[i])); - } - l = expand_chars; - if (hex_output) { - strcat(outbuf, hex_expand_to(scan_up[i], 3)); - } else { - strcat(outbuf, expand(scan_up[i])); - } - expand_chars += l; - l = strlen(scan_name[i]); - if (((char_count + 16) & ~15) + - ((expand_chars + 7) & ~7) + l >= columns) { - put_crlf(); - } else - if (char_count + 24 > columns) { - put_crlf(); - } else if (char_count) { - putchp(' '); - } - put_columns(outbuf, expand_chars, 16); - put_columns(scan_name[i], l, 8); - } - } - } else { - for (i = 0; i < key_count; i++) { - if (!fk_tested[i]) { - if (hex_output) { - strcpy(outbuf, hex_expand_to(fkval[i], 3)); - } else { - strcpy(outbuf, expand(fkval[i])); - } - l = strlen(fk_name[i]); - if (((char_count + 16) & ~15) + - ((expand_chars + 7) & ~7) + l >= columns) { - put_crlf(); - } else - if (char_count + 24 > columns) { - put_crlf(); - } else - if (char_count) { - putchp(' '); - } - put_columns(outbuf, expand_chars, 16); - put_columns(fk_name[i], l, 8); - } - } - } - put_newlines(2); - if (show_help) { - ptextln("Hit any function key. Type 'end' to quit. Type ? to update the display."); - put_crlf(); - } -} - -/* -** enter_key(name, value, label) -** -** Enter a function key into the data base -*/ -void -enter_key( - const char *name, - char *value, - char *lab) -{ - int j; - - alloc_strings(); - if (value) { - j = strlen(value); - fkmax = fkmax > j ? fkmax : j; - /* do not permit duplicates */ - for (j = 0; j < key_count; j++) { - if (!strcmp(fk_name[j], name)) { - return; - } - } - fkval[key_count] = value; - fk_tested[key_count] = 0; - fk_label[key_count] = lab; - fk_name[key_count++] = name; - if (lab) { - got_labels = TRUE; - } - } -} - - -static void -fresh_line(void) -{ /* clear the line for a new function key line */ - if (over_strike) { - put_crlf(); - } else { - put_cr(); - if (clr_eol) { - tc_putp(clr_eol); - } else { - put_str(" \r"); - } - } -} - - -static int -end_funky(int ch) -{ /* return true if this is the end */ - switch (ch) { - case 'e': - case 'E': - end_state = 'e'; - break; - case 'n': - case 'N': - if (end_state == 'e') { - end_state = 'n'; - } else { - end_state = 0; - } - break; - case 'd': - case 'D': - if (end_state == 'n') { - end_state = 'd'; - } else { - end_state = 0; - } - break; - case 'l': - case 'L': - if (end_state == 'l') { - end_state = '?'; - } else { - end_state = 'l'; - } - break; - default: - end_state = 0; - break; - } - return end_state == 'd'; -} - - -static int -found_match(char *s, int hx, int cc) -{ /* return true if this string is a match */ - int j, f; - char outbuf[256]; - - alloc_strings(); - if (!*s) { - return 0; - } - if (scan_mode) { - for (j = f = 0; scan_down[j]; j++) { - if (scan_length[j] == 0) { - continue; - } - if (!strncmp(s, scan_down[j], scan_length[j])) { - if (!f) { /* first match */ - put_cr(); - if (hx) { - put_str(hex_expand_to(s, 10)); - } else { - put_str(expand_to(s, 10)); - } - f = 1; - } - (void) end_funky(scan_name[j][0]); - put_str(" "); - put_str(scan_name[j]); - scan_tested[j] = 1; - s += scan_length[j]; - if (strncmp(s, scan_up[j], scan_length[j])) { - put_str(" scan down"); - } else { - s += scan_length[j]; - } - if (!*s) { - break; - } - j = -1; - } - if (!strncmp(s, scan_up[j], scan_length[j])) { - if (!f) { /* first match */ - put_cr(); - if (hx) { - put_str(hex_expand_to(s, 10)); - } else { - put_str(expand_to(s, 10)); - } - f = 1; - } - put_str(" "); - put_str(scan_name[j]); - put_str(" scan up"); - s += scan_length[j]; - if (!*s) { - break; - } - j = -1; - } - } - } else { - for (j = f = 0; j < key_count; j++) { - if (!strcmp(s, fkval[j])) { - if (!f) { /* first match */ - put_cr(); - if (hx) { - put_str(hex_expand_to(s, 10)); - } else { - put_str(expand_to(s, 10)); - } - f = 1; - } - sprintf(outbuf, " (%s)", fk_name[j]); - put_str(outbuf); - if (fk_label[j]) { - sprintf(outbuf, " <%s>", fk_label[j]); - put_str(outbuf); - } - fk_tested[j] = 1; - } - } - } - if (end_state == '?') { - keys_tested(0, 1, hx); - tty_raw(cc, char_mask); - end_state = 0; - } - return f; -} - - -static int -found_exit(char *keybuf, int hx, int cc) -{ /* return true if the user wants to exit */ - int j, k; - char *s; - - - if (scan_mode) { - if (*keybuf == '\0') { - return TRUE; - } - } else { - /* break is a special case */ - if (*keybuf == '\0') { - fresh_line(); - tty_set(); - ptext("Hit X to exit: "); - if (wait_here() == 'X') { - return TRUE; - } - keys_tested(0, 1, hx); - tty_raw(cc, char_mask); - return FALSE; - } - /* is this the end? */ - for (k = 0; (j = (keybuf[k] & STRIP_PARITY)); k++) { - if (end_funky(j)) { - return TRUE; - } - } - - j = TRUE; /* does he need an updated list? */ - for (k = 0; keybuf[k]; k++) { - j &= (keybuf[k] & STRIP_PARITY) == '?'; - } - if (j || end_state == '?') { - keys_tested(0, 1, hx); - tty_raw(cc, char_mask); - end_state = 0; - return FALSE; - } - } - - put_cr(); - if (hx) { - s = hex_expand_to(keybuf, 10); - } else { - s = expand_to(keybuf, 10); - } - sprintf(temp, "%s Unknown", s); - put_str(temp); - for (j = 0; j < MAX_FK_UNK; j++) { - if (j == funk) { - fk_length[funk] = expand_chars; - if ((fk_unknown[funk] = (char *)malloc(strlen(s) + 1))) { - strcpy(fk_unknown[funk++], s); - } - break; - } - if (fk_length[j] == expand_chars) { - if (!strcmp(fk_unknown[j], s)) { - break; - } - } - } - return FALSE; -} - -/* -** funkey_keys(test_list, status, ch) -** -** Test function keys -*/ -static void -funkey_keys( - struct test_list *t, - int *state, - int *ch) -{ - char keybuf[256]; - - if (keypad_xmit) { - tc_putp(keypad_xmit); - } - keys_tested(1, 1, hex_out); /* also clears screen */ - keybuf[0] = '\0'; - end_state = 0; - if (scan_mode) { - fkmax = scan_max; - } - tty_raw(0, char_mask); - while (end_state != 'd') { - read_key(keybuf, sizeof(keybuf)); - fresh_line(); - if (found_match(keybuf, hex_out, 0)) { - continue; - } - if (found_exit(keybuf, hex_out, 0)) { - break; - } - } - if (keypad_local) { - tc_putp(keypad_local); - } - keys_tested(0, 0, hex_out); - ptext("Function key test "); - generic_done_message(t, state, ch); -} - -int -tty_meta_prep(void) -{ /* print a warning before the meta key test */ - if (not_a_tty) { - return 0; - } - if (initial_stty_query(TTY_8_BIT)) { - return 0; - } - ptext("The meta key test must be run with the"); - ptext(" terminal set for 8 data bits. Two stop bits"); - ptext(" may also be needed for correct display. I will"); - ptext(" transmit 8 bit data but if the terminal is set for"); - ptextln(" 7 bit data, garbage may appear on the screen."); - return 1; -} - -/* -** funkey_meta(test_list, status, ch) -** -** Test meta key (km) (smm) (rmm) -*/ -static void -funkey_meta( - struct test_list *t, - int *state, - int *ch) -{ - int i, j, k, len; - char outbuf[256]; - - if (has_meta_key) { - put_crlf(); - if (char_mask != ALLOW_PARITY) { - if (tty_meta_prep()) { - ptext("\nHit any key to continue > "); - (void) wait_here(); - put_crlf(); - } - } - ptext("Begin meta key test. (km) (smm) (rmm) Hit any key"); - ptext(" with the meta key. The character will be"); - ptext(" displayed in hex. If the meta key is working"); - ptext(" then the most significant bit will be set. Type"); - ptextln(" 'end' to exit."); - tty_raw(1, ALLOW_PARITY); - tc_putp(meta_on); - - for (i = j = k = len = 0; i != 'e' || j != 'n' || k != 'd';) { - i = j; - j = k; - k = getchp(ALLOW_PARITY); - if (k == EOF) { - break; - } - if ((len += 3) >= columns) { - put_crlf(); - len = 3; - } - sprintf(outbuf, "%02X ", k); - put_str(outbuf); - k &= STRIP_PARITY; - } - tc_putp(meta_off); - put_crlf(); - tty_set(); - put_crlf(); - } else { - ptext("(km) Has-meta-key is not set. "); - } - generic_done_message(t, state, ch); -} - -/* -** funkey_label(test_list, status, ch) -** -** Test labels (nlab) (smln) (pln) (rmln) (lw) (lh) -*/ -static void -funkey_label( - struct test_list *t, - int *state, - int *ch) -{ - int i; - char outbuf[256]; - - if (num_labels == -1) { - ptextln("Your terminal has no labels. (nlab)"); - } else { - sprintf(temp, "Your terminal has %d labels (nlab) that are %d characters wide (lw) and %d lines high (lh)", - num_labels, label_width, label_height); - ptext(temp); - ptextln(" Testing (smln) (pln) (rmln)"); - if (label_on) { - tc_putp(label_on); - } - if (label_width <= 0) { - label_width = sizeof(outbuf) - 1; - } - for (i = 1; i <= num_labels; i++) { - sprintf(outbuf, "L%d..............................", i); - outbuf[label_width] = '\0'; - tc_putp(TPARM_2(plab_norm, i, outbuf)); - } - if (label_off) { - ptext("Hit any key to remove the labels: "); - (void) wait_here(); - tc_putp(label_off); - } - } - generic_done_message(t, state, ch); -} - -/* -** funkey_prog(test_list, status, ch) -** -** Test program function keys (pfx) -*/ -static void -funkey_prog( - struct test_list *t, - int *state, - int *ch) -{ - int i, fk; - char mm[256]; - - fk = 1; /* use function key 1 for now */ - if (pkey_xmit) { - /* test program function key */ - sprintf(temp, - "(pfx) Set function key %d to transmit abc\\n", fk); - ptextln(temp); - tc_putp(TPARM_2(pkey_xmit, fk, "abc\n")); - sprintf(temp, "Hit function key %d\n", fk); - ptextln(temp); - for (i = 0; i < 4; ++i) - mm[i] = getchp(STRIP_PARITY); - mm[i] = '\0'; - put_crlf(); - if (mm[0] != 'a' || mm[1] != 'b' || mm[2] != 'c') { - sprintf(temp, "Error string received was: %s", expand(mm)); - ptextln(temp); - } else { - putln("Thank you\n"); - } - flush_input(); - if (key_f1) { - tc_putp(TPARM_2(pkey_xmit, fk, key_f1)); - } - } else { - ptextln("Function key transmit (pfx), not present."); - } - generic_done_message(t, state, ch); -} - -/* -** funkey_local(test_list, status, ch) -** -** Test program local function keys (pfloc) -*/ -static void -funkey_local( - struct test_list *t, - int *state, - int *ch) -{ - int fk; - - fk = 1; - if (pkey_local) { - /* test local function key */ - sprintf(temp, - "(pfloc) Set function key %d to execute a clear and print \"Done!\"", fk); - ptextln(temp); - sprintf(temp, "%sDone!", liberated(clear_screen)); - tc_putp(TPARM_2(pkey_local, fk, temp)); - sprintf(temp, "Hit function key %d. Then hit return.", fk); - ptextln(temp); - (void) wait_here(); - flush_input(); - if (key_f1 && pkey_xmit) { - tc_putp(TPARM_2(pkey_xmit, fk, key_f1)); - } - } else { - ptextln("Function key execute local (pfloc), not present."); - } - - generic_done_message(t, state, ch); -} - -/* -** printer_on(test_list, status, ch) -** -** Test printer on/off (mc4) (mc5) (mc5i) -*/ -static void -printer_on( - struct test_list *t, - int *state, - int *ch) -{ - if (!prtr_on || !prtr_off) { - ptextln("Printer on/off missing. (mc5) (mc4)"); - } else if (prtr_silent) { - ptextln("Your printer is silent. (mc5i) is set."); - tc_putp(prtr_on); - ptextln("This line should be on the printer but not your screen. (mc5)"); - tc_putp(prtr_off); - ptextln("This line should be only on the screen. (mc4)"); - } else { - ptextln("Your printer is not silent. (mc5i) is reset."); - tc_putp(prtr_on); - ptextln("This line should be on the printer and the screen. (mc5)"); - tc_putp(prtr_off); - ptextln("This line should only be on the screen. (mc4)"); - } - generic_done_message(t, state, ch); -} - -/* -** printer_mc0(test_list, status, ch) -** -** Test screen print (mc0) -*/ -static void -printer_mc0( - struct test_list *t, - int *state, - int *ch) -{ - if (print_screen) { - ptext("I am going to send the contents of the screen to"); - ptext(" the printer, then wait for a keystroke from you."); - ptext(" All of the text that appears on the screen"); - ptextln(" should be printed. (mc0)"); - tc_putp(print_screen); - } else { - ptext("(mc0) Print-screen is not present. "); - } - generic_done_message(t, state, ch); -} - - -static void -line_pattern(void) -{ /* put up a pattern that will help count the - number of lines */ - int i, j; - - put_clear(); - if (over_strike) { - for (i = 0; i < 100; i++) { - if (i) { - put_crlf(); - } - for (j = i / 10; j; j--) { - put_this(' '); - } - put_this('0' + ((i + 1) % 10)); - } - } else /* I assume it will scroll */ { - for (i = 100; i; i--) { - sprintf(temp, "\r\n%d", i); - put_str(temp); - } - } -} - - -static void -column_pattern(void) -{ /* put up a pattern that will help count the - number of columns */ - int i, j; - - put_clear(); - for (i = 0; i < 20; i++) { - for (j = 1; j < 10; j++) { - put_this('0' + j); - } - put_this('.'); - } -} - -/* -** report_help() -** -** Print the help text for the echo tests -*/ -static void -report_help(int crx) -{ - ptextln("The following commands may also be entered:"); - ptextln(" clear clear screen."); - ptextln(" columns print a test pattern to help count screen width."); - ptextln(" lines print a test pattern to help count screen length."); - ptextln(" end exit."); - ptextln(" echo redisplay last report."); - if (crx) { - ptextln(" hex redisplay last report in hex."); - } else { - ptextln(" hex toggle hex display mode."); - } - ptextln(" help display this list."); - ptextln(" high toggle forced high bit (0x80)."); - ptextln(" scan toggle scan mode."); - ptextln(" one echo one character after or as is. (report mode)"); - ptextln(" two echo two characters after or as is."); - ptextln(" all echo all characters after or as is. (echo mode)"); -} - -/* -** tools_report(testlist, state, ch) -** -** Run the echo tool and report tool -*/ -void -tools_report( - struct test_list *t, - int *state GCC_UNUSED, - int *pch GCC_UNUSED) -{ - int i, j, ch, crp, crx, high_bit, save_scan_mode, hex_display; - char buf[1024]; - char txt[8]; - - hex_display = hex_out; - put_clear(); - if ((crx = (t->flags & 255)) == 1) { - ptext("Characters after a CR or LF will be echoed as"); - ptextln(" is. All other characters will be expanded."); - report_help(crx); - } else { /* echo test */ - ptextln("Begin echo test."); - report_help(crx); - } - memset(txt, 0, sizeof(txt)); - save_scan_mode = scan_mode; - tty_raw(1, char_mask); - for (i = crp = high_bit = 0;;) { - ch = getchp(char_mask); - if (ch == EOF) { - break; - } - if (i >= (int) sizeof(buf) - 1) { - i = 0; - } - buf[i++] = ch; - buf[i] = '\0'; - for (j = 0; j < (int) sizeof(txt) - 1; j++) { - txt[j] = txt[j + 1]; - } - txt[sizeof(txt) - 1] = ch & STRIP_PARITY; - if (crx == 0) { /* echo test */ - if (hex_display) { - ptext(hex_expand_to(&buf[i - 1], 3)); - } else { - tc_putch(ch | high_bit); - } - } else /* status report test */ - if (ch == '\n' || ch == '\r') { - put_crlf(); - crp = 0; - } else if (crp++ < crx) { - tc_putch(ch | high_bit); - } else { - put_str(expand(&buf[i - 1])); - } - if (!strncmp(&txt[sizeof(txt) - 7], "columns", 7)) { - column_pattern(); - buf[i = 0] = '\0'; - crp = 0; - } - if (!strncmp(&txt[sizeof(txt) - 5], "lines", 5)) { - line_pattern(); - buf[i = 0] = '\0'; - crp = 0; - } - if (!strncmp(&txt[sizeof(txt) - 5], "clear", 5)) { - put_clear(); - buf[i = 0] = '\0'; - crp = 0; - } - if (!strncmp(&txt[sizeof(txt) - 4], "high", 4)) { - high_bit ^= 0x80; - if (high_bit) { - ptextln("\nParity bit set"); - } else { - ptextln("\nParity bit reset"); - } - } - if (!strncmp(&txt[sizeof(txt) - 4], "help", 4)) { - put_crlf(); - report_help(crx); - } - if (!strncmp(&txt[sizeof(txt) - 4], "echo", 4)) { - /* display the last status report */ - /* clear bypass condition on Tek terminals */ - put_crlf(); - if (i >= 4) { - buf[i -= 4] = '\0'; - } - put_str(expand(buf)); - } - if (save_scan_mode && - !strncmp(&txt[sizeof(txt) - 4], "scan", 4)) { - /* toggle scan mode */ - scan_mode = !scan_mode; - } - if (!strncmp(&txt[sizeof(txt) - 3], "end", 3)) - break; - if (!strncmp(&txt[sizeof(txt) - 3], "hex", 3)) { - if (crx) { - /* display the last status report in hex */ - /* clear bypass condition on Tek terminals */ - put_crlf(); - if (i >= 3) { - buf[i -= 3] = '\0'; - } - put_str(hex_expand_to(buf, 3)); - } else { - hex_display = !hex_display; - } - } - if (!strncmp(&txt[sizeof(txt) - 3], "two", 3)) - crx = 2; - if (!strncmp(&txt[sizeof(txt) - 3], "one", 3)) - crx = 1; - if (!strncmp(&txt[sizeof(txt) - 3], "all", 3)) - crx = 0; - } - scan_mode = save_scan_mode; - put_crlf(); - tty_set(); - if (crx) { - ptextln("End of status report test."); - } else { - ptextln("End of echo test."); - } -} diff --git a/tack/init.c b/tack/init.c deleted file mode 100644 index 3e52dbf3..00000000 --- a/tack/init.c +++ /dev/null @@ -1,316 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ -/* initialization and wrapup code */ - -#include - -MODULE_ID("$Id: init.c,v 1.7 2006/11/26 00:16:01 tom Exp $") - -#if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219 -#define _nc_get_curterm(p) _nc_get_tty_mode(p) -#endif - -FILE *debug_fp; -char temp[1024]; -char tty_basename[64]; - -void -put_name(const char *cap, const char *name) -{ /* send the cap name followed by the cap */ - if (cap) { - ptext(name); - tc_putp(cap); - } -} - -static void -report_cap(const char *tag, const char *s) -{ /* expand the cap or print *** missing *** */ - int i; - - ptext(tag); - for (i = char_count; i < 13; i++) { - putchp(' '); - } - put_str(" = "); - if (s) { - putln(expand(s)); - } else { - putln("*** missing ***"); - } -} - - -void -reset_init(void) -{ /* send the reset and init strings */ - int i; - - ptext("Terminal reset"); - i = char_count; - put_name(reset_1string, " (rs1)"); - put_name(reset_2string, " (rs2)"); - /* run the reset file */ - if (reset_file && reset_file[0]) { - FILE *fp; - int ch; - - can_test("rf", FLAG_TESTED); - if ((fp = fopen(reset_file, "r"))) { /* send the reset file */ - sprintf(temp, " (rf) %s", reset_file); - ptextln(temp); - while (1) { - ch = getc(fp); - if (ch == EOF) - break; - put_this(ch); - } - fclose(fp); - } else { - sprintf(temp, "\nCannot open reset file (rf) %s", reset_file); - ptextln(temp); - } - } - put_name(reset_3string, " (rs3)"); - if (i != char_count) { - put_crlf(); - } - ptext(" init"); - put_name(init_1string, " (is1)"); - put_name(init_2string, " (is2)"); - if (set_tab && clear_all_tabs && init_tabs != 8) { - put_crlf(); - tc_putp(clear_all_tabs); - for (char_count = 0; char_count < columns; char_count++) { - put_this(' '); - if ((char_count & 7) == 7) { - tc_putp(set_tab); - } - } - put_cr(); - } - /* run the initialization file */ - if (init_file && init_file[0]) { - FILE *fp; - int ch; - - can_test("if", FLAG_TESTED); - if ((fp = fopen(init_file, "r"))) { /* send the init file */ - sprintf(temp, " (if) %s", init_file); - ptextln(temp); - while (1) { - ch = getc(fp); - if (ch == EOF) - break; - put_this(ch); - } - fclose(fp); - } else { - sprintf(temp, "\nCannot open init file (if) %s", init_file); - ptextln(temp); - } - } - if (init_prog) { - can_test("iprog", FLAG_TESTED); - (void) system(init_prog); - } - put_name(init_3string, " (is3)"); - - fflush(stdout); -} - -/* -** display_basic() -** -** display the basic terminal definitions -*/ -void -display_basic(void) -{ - put_str("Name: "); - putln(ttytype); - - report_cap("\\r ^M (cr)", carriage_return); - report_cap("\\n ^J (ind)", scroll_forward); - report_cap("\\b ^H (cub1)", cursor_left); - report_cap("\\t ^I (ht)", tab); -/* report_cap("\\f ^L (ff)", form_feed); */ - if (newline) { - /* OK if missing */ - report_cap(" (nel)", newline); - } - report_cap(" (clear)", clear_screen); - if (!cursor_home && cursor_address) { - report_cap("(cup) (home)", TPARM_2(cursor_address, 0, 0)); - } else { - report_cap(" (home)", cursor_home); - } -#ifdef user9 - report_cap("ENQ (u9)", user9); -#endif -#ifdef user8 - report_cap("ACK (u8)", user8); -#endif - - sprintf(temp, "\nTerminal size: %d x %d. Baud rate: %u. Frame size: %d.%d", - columns, lines, - tty_baud_rate, - tty_frame_size >> 1, - (tty_frame_size & 1) * 5); - putln(temp); -} - -/* -** curses_setup(exec_name) -** -** Startup ncurses -*/ -void -curses_setup( - char *exec_name) -{ - int status; - static TERMTYPE term; - char tty_filename[2048]; - - tty_init(); - - /** - See if the terminal is in the terminfo data base. This call has - two useful benefits, 1) it returns the filename of the terminfo entry, - and 2) it searches only terminfo's. This allows us to abort before - ncurses starts scanning the termcap file. - **/ - if ((status = _nc_read_entry(tty_basename, tty_filename, &term)) == 0) { - const TERMTYPE *fallback = _nc_fallback(tty_basename); - - if (fallback) { - term = *fallback; - sprintf(tty_filename, "(fallback)%s", tty_basename); - status = 1; - } else { - fprintf(stderr, "Terminal not found: TERM=%s\n", tty_basename); - show_usage(exec_name); - exit(1); - } - } - if (status == -1) { - fprintf(stderr, "Terminfo database is inaccessible\n"); - exit(1); - } - - /** - This call will load the terminfo data base and set the cur-term - variable. Only terminals that actually exist will get here so its - OK to ignore errors. This is a good thing since ncurses does not - permit (os) or (gn) to be set. - **/ - setupterm(tty_basename, 1, &status); - - /** - Get the current terminal definitions. This must be done before - getting the baudrate. - **/ - _nc_get_curterm(&cur_term->Nttyb); - tty_baud_rate = baudrate(); - tty_cps = (tty_baud_rate << 1) / tty_frame_size; - - /* set up the defaults */ - replace_mode = TRUE; - scan_mode = 0; - char_count = 0; - select_delay_type = debug_level = 0; - char_mask = (meta_on && meta_on[0] == '\0') ? ALLOW_PARITY : STRIP_PARITY; - /* Don't change the XON/XOFF modes yet. */ - select_xon_xoff = initial_stty_query(TTY_XON_XOFF) ? 1 : needs_xon_xoff; - - fflush(stdout); /* flush any output */ - tty_set(); - - go_home(); /* set can_go_home */ - put_clear(); /* set can_clear_screen */ - - if (send_reset_init) { - reset_init(); - } - - /* - I assume that the reset and init strings may not have the correct - pads. (Because that part of the test comes much later.) Because - of this, I allow the terminal some time to catch up. - */ - fflush(stdout); /* waste some time */ - sleep(1); /* waste more time */ - charset_can_test(); - can_test("lines cols cr nxon rf if iprog rmp smcup rmcup", FLAG_CAN_TEST); - edit_init(); /* initialize the edit data base */ - - if (send_reset_init && enter_ca_mode) { - tc_putp(enter_ca_mode); - put_clear(); /* just in case we switched pages */ - } - put_crlf(); - ptext("Using terminfo from: "); - ptextln(tty_filename); - put_crlf(); - - if (tty_can_sync == SYNC_NEEDED) { - verify_time(); - } - - display_basic(); -} - -/* -** bye_kids(exit-condition) -** -** Shutdown the terminal, clear the signals, and exit -*/ -void -bye_kids(int n) -{ /* reset the tty and exit */ - ignoresig(); - if (send_reset_init) { - if (exit_ca_mode) { - tc_putp(exit_ca_mode); - } - if (initial_stty_query(TTY_XON_XOFF)) { - if (enter_xon_mode) { - tc_putp(enter_xon_mode); - } - } else if (exit_xon_mode) { - tc_putp(exit_xon_mode); - } - } - if (debug_fp) { - fclose(debug_fp); - } - if (log_fp) { - fclose(log_fp); - } - tty_reset(); - fclose(stdin); - fclose(stdout); - fclose(stderr); - if (not_a_tty) - sleep(1); - exit(n); -} diff --git a/tack/menu.c b/tack/menu.c deleted file mode 100644 index b4c8c050..00000000 --- a/tack/menu.c +++ /dev/null @@ -1,421 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: menu.c,v 1.3 2005/09/17 19:49:16 tom Exp $") - -/* - Menu control - */ - -static void test_byname(struct test_menu *, int *, int *); - -struct test_list *augment_test; -char prompt_string[80]; /* menu prompt storage */ - -/* -** menu_prompt() -** -** Print the menu prompt string. -*/ -void -menu_prompt(void) -{ - ptext(&prompt_string[1]); -} - -/* -** menu_test_loop(test-structure, state, control-character) -** -** This function implements the repeat test function. -*/ -static void -menu_test_loop( - struct test_list *test, - int *state, - int *ch) -{ - int nch, p; - - if ((test->flags & MENU_REP_MASK) && (augment_test != test)) { - /* set the augment variable (first time only) */ - p = (test->flags >> 8) & 15; - if ((test->flags & MENU_REP_MASK) == MENU_LM1) { - augment = lines - 1; - } else - if ((test->flags & MENU_ONE_MASK) == MENU_ONE) { - augment = 1; - } else - if ((test->flags & MENU_LC_MASK) == MENU_lines) { - augment = lines * p / 10; - } else - if ((test->flags & MENU_LC_MASK) == MENU_columns) { - augment = columns * p / 10; - } else { - augment = 1; - } - augment_test = test; - set_augment_txt(); - } - do { - if ((test->flags | *state) & MENU_CLEAR) { - put_clear(); - } else - if (line_count + test->lines_needed >= lines) { - put_clear(); - } - nch = 0; - if (test->test_procedure) { - /* The procedure takes precedence so I can pass - the menu entry as an argument. - */ - can_test(test->caps_done, FLAG_TESTED); - can_test(test->caps_tested, FLAG_TESTED); - test->test_procedure(test, state, &nch); - } else - if (test->sub_menu) { - /* nested menu's */ - menu_display(test->sub_menu, &nch); - *state = 0; - if (nch == 'q' || nch == 's') { - /* Quit and skip are killed here */ - nch = '?'; - } - } else { - break; /* cya */ - } - if (nch == '\r' || nch == '\n' || nch == 'n') { - nch = 0; - break; - } - } while (nch == 'r'); - *ch = nch; -} - -/* -** menu_display(menu-structure, flags) -** -** This function implements menu control. -*/ -void -menu_display( - struct test_menu *menu, - int *last_ch) -{ - int test_state = 0, run_standard_tests; - int hot_topic, ch = 0, nch = 0; - struct test_list *mt; - struct test_list *repeat_tests = 0; - int repeat_state = 0; - int prompt_length; - - prompt_length = strlen(prompt_string); - if (menu->ident) { - sprintf(&prompt_string[prompt_length], "/%s", menu->ident); - } - hot_topic = menu->default_action; - run_standard_tests = menu->standard_tests ? - menu->standard_tests[0] : -1; - if (!last_ch) { - last_ch = &ch; - } - while (1) { - if (ch == 0) { - /* Display the menu */ - put_crlf(); - if (menu->menu_function) { - /* - this function may be used to restrict menu - entries. If used it must print the title. - */ - menu->menu_function(menu); - } else - if (menu->menu_title) { - ptextln(menu->menu_title); - } - for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) { - if (mt->menu_entry) { - ptext(" "); - ptextln(mt->menu_entry); - } - } - if (menu->standard_tests) { - ptext(" "); - ptextln(menu->standard_tests); - ptextln(" r) repeat test"); - ptextln(" s) skip to next test"); - } - ptextln(" q) quit"); - ptextln(" ?) help"); - } - if (ch == 0 || ch == REQUEST_PROMPT) { - put_crlf(); - ptext(&prompt_string[1]); - if (hot_topic) { - ptext(" ["); - putchp(hot_topic); - ptext("]"); - } - ptext(" > "); - /* read a character */ - ch = wait_here(); - } - if (ch == '\r' || ch == '\n') { - ch = hot_topic; - } - if (ch == 'q') { - break; - } - if (ch == '?') { - ch = 0; - continue; - } - nch = ch; - ch = 0; - /* Run one of the standard tests (by request) */ - for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) { - if (mt->menu_entry && (nch == mt->menu_entry[0])) { - if (mt->flags & MENU_MENU) { - test_byname(menu, &test_state, &nch); - } else { - menu_test_loop(mt, &test_state, &nch); - } - ch = nch; - if ((mt->flags & MENU_COMPLETE) && ch == 0) { - /* top level */ - hot_topic = 'q'; - ch = '?'; - } - } - } - if (menu->standard_tests && nch == 'r') { - menu->resume_tests = repeat_tests; - test_state = repeat_state; - nch = run_standard_tests; - } - if (nch == run_standard_tests) { - if (!(mt = menu->resume_tests)) { - mt = menu->tests; - } - if (mt->flags & MENU_LAST) { - mt = menu->tests; - } - /* Run the standard test suite */ - for ( ; (mt->flags & MENU_LAST) == 0; ) { - if ((mt->flags & MENU_NEXT) == MENU_NEXT) { - repeat_tests = mt; - repeat_state = test_state; - nch = run_standard_tests; - menu_test_loop(mt, &test_state, &nch); - if (nch != 0 && nch != 'n') { - ch = nch; - break; - } - if (test_state & MENU_STOP) { - break; - } - } - mt++; - } - if (ch == 0) { - ch = hot_topic; - } - menu->resume_tests = mt; - menu->resume_state = test_state; - menu->resume_char = ch; - - if (ch == run_standard_tests) { - /* pop up a level */ - break; - } - } - } - *last_ch = ch; - prompt_string[prompt_length] = '\0'; -} - -/* -** generic_done_message(test_list) -** -** Print the Done message and request input. -*/ -void -generic_done_message( - struct test_list *test, - int *state, - int *ch) -{ - char done_message[128]; - - if (test->caps_done) { - sprintf(done_message, "(%s) Done ", test->caps_done); - ptext(done_message); - } else { - ptext("Done "); - } - *ch = wait_here(); - if (*ch == '\r' || *ch == '\n' || *ch == 'n') { - *ch = 0; - } - if (*ch == 's') { - *state |= MENU_STOP; - *ch = 0; - } -} - -/* -** menu_clear_screen(test, state, ch) -** -** Just clear the screen. -*/ -void -menu_clear_screen( - struct test_list *test GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - put_clear(); -} - -/* -** menu_reset_init(test, state, ch) -** -** Send the reset and init strings. -*/ -void -menu_reset_init( - struct test_list *test GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - reset_init(); - put_crlf(); -} - -/* -** subtest_menu(test, state, ch) -** -** Scan the menu looking for something to execute -** Return TRUE if we found anything. -*/ -int -subtest_menu( - struct test_list *test, - int *state, - int *ch) -{ - struct test_list *mt; - - if (*ch) { - for (mt = test; (mt->flags & MENU_LAST) == 0; mt++) { - if (mt->menu_entry && (*ch == mt->menu_entry[0])) { - *ch = 0; - menu_test_loop(mt, state, ch); - return TRUE; - } - } - } - return FALSE; -} - -/* -** menu_can_scan(menu-structure) -** -** Recursively scan the menu tree and find which cap names can be tested. -*/ -void -menu_can_scan( - const struct test_menu *menu) -{ - struct test_list *mt; - - for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) { - can_test(mt->caps_done, FLAG_CAN_TEST); - can_test(mt->caps_tested, FLAG_CAN_TEST); - if (!(mt->test_procedure)) { - if (mt->sub_menu) { - menu_can_scan(mt->sub_menu); - } - } - } -} - -/* -** menu_search(menu-structure, cap) -** -** Recursively search the menu tree and execute any tests that use cap. -*/ -static void -menu_search( - struct test_menu *menu, - int *state, - int *ch, - char *cap) -{ - struct test_list *mt; - int nch; - - for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) { - nch = 0; - if (cap_match(mt->caps_done, cap) - || cap_match(mt->caps_tested, cap)) { - menu_test_loop(mt, state, &nch); - } - if (!(mt->test_procedure)) { - if (mt->sub_menu) { - menu_search(mt->sub_menu, state, &nch, cap); - } - } - if (*state & MENU_STOP) { - break; - } - if (nch != 0 && nch != 'n') { - *ch = nch; - break; - } - } -} - -/* -** test_byname(menu, state, ch) -** -** Get a cap name then run all tests that use that cap. -*/ -static void -test_byname( - struct test_menu *menu, - int *state GCC_UNUSED, - int *ch) -{ - int test_state = 0; - char cap[32]; - - if (tty_can_sync == SYNC_NOT_TESTED) { - verify_time(); - } - ptext("enter name: "); - read_string(cap, sizeof(cap)); - if (cap[0]) { - menu_search(menu, &test_state, ch, cap); - } - *ch = '?'; -} diff --git a/tack/modes.c b/tack/modes.c deleted file mode 100644 index b202fa0e..00000000 --- a/tack/modes.c +++ /dev/null @@ -1,913 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: modes.c,v 1.3 2006/11/26 00:16:21 tom Exp $") - -/* - * Tests boolean flags and terminal modes. - */ -static void subtest_os(struct test_list *, int *, int *); -static void subtest_rmam(struct test_list *, int *, int *); -static void subtest_smam(struct test_list *, int *, int *); -static void subtest_am(struct test_list *, int *, int *); -static void subtest_ul(struct test_list *, int *, int *); -static void subtest_uc(struct test_list *, int *, int *); -static void subtest_bw(struct test_list *, int *, int *); -static void subtest_xenl(struct test_list *, int *, int *); -static void subtest_eo(struct test_list *, int *, int *); -static void subtest_xmc(struct test_list *, int *, int *); -static void subtest_xhp(struct test_list *, int *, int *); -static void subtest_mir(struct test_list *, int *, int *); -static void subtest_msgr(struct test_list *, int *, int *); -static void subtest_tbc(struct test_list *, int *, int *); -static void subtest_xt(struct test_list *, int *, int *); -static void subtest_hts(struct test_list *, int *, int *); -static void subtest_cbt(struct test_list *, int *, int *); -static void subtest_in(struct test_list *, int *, int *); -static void subtest_dadb(struct test_list *, int *, int *); - -struct test_list mode_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_NEXT, 3, "os", 0, 0, subtest_os, 0}, - {MENU_NEXT, 1, "rmam", 0, 0, subtest_rmam, 0}, - {MENU_NEXT, 1, "smam", 0, 0, subtest_smam, 0}, - {MENU_NEXT, 1, "am", 0, 0, subtest_am, 0}, - {MENU_NEXT, 3, "ul", 0, 0, subtest_ul, 0}, - {MENU_NEXT, 3, "uc", 0, 0, subtest_uc, 0}, - {MENU_NEXT, 3, "bw", 0, 0, subtest_bw, 0}, - {MENU_NEXT, 4, "xenl", 0, 0, subtest_xenl, 0}, - {MENU_NEXT, 3, "eo", 0, 0, subtest_eo, 0}, - {MENU_NEXT, 3, "xmc", 0, 0, subtest_xmc, 0}, - {MENU_NEXT, 3, "xhp", 0, 0, subtest_xhp, 0}, - {MENU_NEXT, 6, "mir", 0, 0, subtest_mir, 0}, - {MENU_NEXT, 6, "msgr", 0, 0, subtest_msgr, 0}, - {MENU_NEXT | MENU_CLEAR, 0, "tbc", "it", 0, subtest_tbc, 0}, - {MENU_NEXT | MENU_CLEAR, 0, "hts", "it", 0, subtest_hts, 0}, - {MENU_NEXT, 4, "xt", "it", 0, subtest_xt, 0}, - {MENU_NEXT, 1, "cbt", "it", 0, subtest_cbt, 0}, - {MENU_NEXT, 6, "in", 0, 0, subtest_in, 0}, - {MENU_NEXT, 1, "da) (db", 0, 0, subtest_dadb, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -/* -** subtest_os(test_list, status, ch) -** -** test over strike mode (os) -*/ -static void -subtest_os( - struct test_list *t, - int *state, - int *ch) -{ - ptext("(os) should be true, not false."); - put_cr(); - ptextln("(os) should be false."); - sprintf(temp, "(os) over-strike is %s in the data base. ", - over_strike ? "true" : "false"); - ptext(temp); - generic_done_message(t, state, ch); -} - -/* -** subtest_rmam(test_list, status, ch) -** -** test exit automatic margins mode (rmam) -*/ -static void -subtest_rmam( - struct test_list *t, - int *state, - int *ch) -{ - int j; - - if (!exit_am_mode) { - ptext("(rmam) not present. "); - } else - if (!can_go_home) { - ptext("(rmam) not tested, no way to home cursor. "); - } else - if (over_strike) { - put_clear(); - go_home(); - tc_putp(exit_am_mode); - ptext("\n(rmam) will reset (am)"); - go_home(); - for (j = 0; j < columns; j++) - put_this(' '); - ptext("(rmam) will not reset (am)"); - go_home(); - put_newlines(2); - } else { - put_clear(); - go_home(); - tc_putp(exit_am_mode); - ptext("\n(rmam) will reset (am)"); - go_home(); - for (j = 0; j < columns; j++) - put_this(' '); - ptext("(rmam) will not reset (am) "); - go_home(); - put_str(" "); - go_home(); - put_newlines(2); - } - ptext("Exit-automatic-margins "); - generic_done_message(t, state, ch); -} - -/* -** subtest_smam(test_list, status, ch) -** -** test enter automatic margins mode (smam) -*/ -static void -subtest_smam( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!enter_am_mode) { - ptext("(smam) not present. "); - } else - if (!can_go_home) { - ptext("(smam) not tested, no way to home cursor. "); - } else - if (over_strike) { - put_clear(); - go_home(); - tc_putp(enter_am_mode); - ptext("\n(smam) will "); - i = char_count; - ptext("not set (am)"); - go_home(); - for (j = -i; j < columns; j++) - put_this(' '); - put_str("@@@"); - put_newlines(2); - } else { - put_clear(); - go_home(); - tc_putp(enter_am_mode); - ptext("\n(smam) will not set (am)"); - go_home(); - for (j = 0; j < columns; j++) - put_this(' '); - ptext("(smam) will set (am) "); - go_home(); - put_str(" "); - put_newlines(2); - } - ptext("Enter-automatic-margins "); - generic_done_message(t, state, ch); -} - -/* -** subtest_am(test_list, status, ch) -** -** test automatic margins (am) -*/ -static void -subtest_am( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!can_go_home) { - ptextln("(am) not tested, no way to home cursor. "); - } else - if (over_strike) { - put_clear(); - go_home(); - ptext("\n(am) should "); - i = char_count; - ptext("not be set"); - go_home(); - for (j = -i; j < columns; j++) - put_this(' '); - put_str("@@@"); - go_home(); - put_newlines(2); - sprintf(temp, "(am) is %s in the data base", - auto_right_margin ? "true" : "false"); - ptextln(temp); - } else { - put_clear(); - go_home(); - ptext("\n(am) should not be set"); - go_home(); - for (j = 0; j < columns; j++) - put_this(' '); - ptext("(am) should be set "); - go_home(); - put_str(" \n\n"); - sprintf(temp, "(am) is %s in the data base", - auto_right_margin ? "true" : "false"); - ptextln(temp); - } - ptext("Automatic-right-margin "); - generic_done_message(t, state, ch); -} - -/* Note: uprint() sends underscore back-space character, and - ucprint() sends character back-space underscore. */ - -/* -** uprint(string) -** -** underline string for (ul) test -*/ -static void -uprint(const char *s) -{ - if (s) { - while (*s) { - put_str("_\b"); - putchp(*s++); - } - } -} - -/* -** ucprint(string) -** -** underline string for (uc) test -*/ -static void -ucprint(const char *s) -{ - if (s) { - while (*s) { - putchp(*s++); - putchp('\b'); - tc_putp(underline_char); - } - } -} - -/* -** subtest_ul(test_list, status, ch) -** -** test transparent underline (ul) -*/ -static void -subtest_ul( - struct test_list *t, - int *state, - int *ch) -{ - if (!over_strike) { - /* (ul) is used only if (os) is reset */ - put_crlf(); - sprintf(temp, "This text should %sbe underlined.", - transparent_underline ? "" : "not "); - uprint(temp); - put_crlf(); - ptextln("If the above line is not underlined the (ul) should be false."); - sprintf(temp, "(ul) Transparent-underline is %s in the data base", - transparent_underline ? "true" : "false"); - ptextln(temp); - generic_done_message(t, state, ch); - } -} - -/* -** subtest_uc(test_list, status, ch) -** -** test underline character (uc) -*/ -static void -subtest_uc( - struct test_list *t, - int *state, - int *ch) -{ - if (!over_strike) { - if (underline_char) { - ucprint("This text should be underlined."); - put_crlf(); - ptextln("If the above text is not underlined the (uc) has failed."); - ptext("Underline-character "); - } else { - ptext("(uc) underline-character is not defined. "); - } - generic_done_message(t, state, ch); - } -} - -/* -** subtest_bw(test_list, status, ch) -** -** test auto left margin (bw) -*/ -static void -subtest_bw( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (over_strike) { - /* test (bw) */ - ptext("\n(bw) should "); - i = char_count; - ptextln("not be set."); - for (j = i; j < columns; j++) - put_str("\b"); - put_str("@@@"); - put_crlf(); - sprintf(temp, "(bw) Auto-left-margin is %s in the data base", - auto_left_margin ? "true" : "false"); - ptextln(temp); - } else { - /* test (bw) */ - ptextln("(bw) should not be set."); - for (i = 12; i < columns; i++) - put_str("\b"); - if (delete_character) { - for (i = 0; i < 4; i++) - tc_putp(delete_character); - } else { - put_str(" "); - } - put_crlf(); - sprintf(temp, "(bw) Auto-left-margin is %s in the data base", - auto_left_margin ? "true" : "false"); - ptextln(temp); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_tbc(test_list, status, ch) -** -** test clear tabs (tbc) -*/ -static void -subtest_tbc( - struct test_list *t, - int *state, - int *ch) -{ - int tabat; /* the tab spacing we end up with */ - int i; - - if (clear_all_tabs && !set_tab) { - ptext("(tbc) Clear-all-tabs is defined but (hts) set-tab is not. "); - ptext("Once the tabs are cleared there is no way to set them. "); - } else - if (clear_all_tabs) { - tabat = set_tab ? 8 : init_tabs; - tc_putp(clear_all_tabs); - ptext("Clear tabs (tbc)"); - go_home(); - put_crlf(); - putchp('\t'); - putchp('T'); - go_home(); - put_newlines(2); - for (i = 0; i < columns; i++) { - if (i == tabat) { - putchp('T'); - } else { - putchp('.'); - } - } - go_home(); - ptext("\n\n\nIf the above two lines have T's in the same column then (tbc) has failed. "); - } else { - ptext("(tbc) Clear-all-tabs is not defined. "); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_hts(test_list, status, ch) -** -** (ht) and set tabs with (hts) -*/ -static void -subtest_hts( - struct test_list *t, - int *state, - int *ch) -{ - int tabat; /* the tab spacing we end up with */ - int i; - - tabat = init_tabs; - if (set_tab) { - ptext("Tabs set with (hts)"); - put_crlf(); - for (i = 1; i < columns; i++) { - if (i % 8 == 1) { - tc_putp(set_tab); - } - putchp(' '); - } - tabat = 8; - } else { - sprintf(temp, "(hts) Set-tabs not defined. (it) Initial-tabs at %d", init_tabs); - ptext(temp); - } - go_home(); - put_newlines(2); - if (tabat <= 0) { - tabat = 8; - } - for (i = tabat; i < columns; i += tabat) { - putchp('\t'); - putchp('T'); - } - go_home(); - put_newlines(3); - for (i = 1; i < columns; i++) { - putchp('.'); - } - go_home(); - put_newlines(3); - for (i = tabat; i < columns; i += tabat) { - putchp('\t'); - putchp('T'); - } - go_home(); - put_newlines(4); - putchp('.'); - for (i = 2; i < columns; i++) { - if (i % tabat == 1) { - putchp('T'); - } else { - putchp('.'); - } - } - go_home(); - put_newlines(5); - if (set_tab) { - ptextln("If the last two lines are not the same then (hts) has failed."); - } else - if (init_tabs > 0) { - ptextln("If the last two lines are not the same then (it) is wrong."); - } else { - ptextln("If the last two lines are the same then maybe you do have tabs and (it) should be changed."); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_xt(test_list, status, ch) -** -** (xt) glitch -*/ -static void -subtest_xt( - struct test_list *t, - int *state, - int *ch) -{ - int tabat; /* the tab spacing we end up with */ - int cc; - - tabat = set_tab ? 8 : init_tabs; - if (!over_strike && (tabat > 0)) { - ptext("(xt) should not "); - put_cr(); - ptext("(xt) should"); - cc = char_count; - while (cc < 16) { - putchp('\t'); - cc = ((cc / tabat) + 1) * tabat; - } - putln("be set."); - sprintf(temp, "(xt) Destructive-tab is %s in the data base.", - dest_tabs_magic_smso ? "true" : "false"); - ptextln(temp); - generic_done_message(t, state, ch); - } -} - -/* -** subtest_cbt(test_list, status, ch) -** -** (cbt) back tab -*/ -static void -subtest_cbt( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (back_tab) { - put_clear(); - ptext("Back-tab (cbt)"); - go_home(); - put_crlf(); - for (i = 1; i < columns; i++) { - putchp(' '); - } - for (i = 0; i < columns; i += 8) { - tc_putp(back_tab); - putchp('T'); - tc_putp(back_tab); - } - go_home(); - put_newlines(2); - for (i = 1; i < columns; i++) { - if (i % 8 == 1) { - putchp('T'); - } else { - putchp(' '); - } - } - go_home(); - put_newlines(3); - ptextln("The preceding two lines should be the same."); - } else { - ptextln("(cbt) Back-tab not present"); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_xenl(test_list, status, ch) -** -** (xenl) eat newline glitch -*/ -static void -subtest_xenl( - struct test_list *t, - int *state, - int *ch) -{ - int i, j, k; - - if (over_strike) { - /* test (xenl) on overstrike terminals */ - if (!can_go_home || !can_clear_screen) { - ptextln("(xenl) Newline-glitch not tested, can't home cursor and clear."); - generic_done_message(t, state, ch); - return; - } - put_clear(); - /* - this test must be done in raw mode. Otherwise UNIX will - translate CR to CRLF. - */ - if (stty_query(TTY_OUT_TRANS)) - tty_raw(1, char_mask); - ptext("\nreset (xenl). Does "); - i = char_count; - put_str("not ignore CR, does "); - k = char_count; - put_str("not ignore LF"); - go_home(); - for (j = 0; j < columns; j++) - put_this(' '); - put_cr(); - for (j = 0; j < i; j++) - putchp(' '); - put_str("@@@\n@@"); - go_home(); - for (j = 0; j < columns; j++) - put_this(' '); - put_lf(); - for (j = 0; j < k; j++) - putchp(' '); - put_str("@@@\r@@"); - tty_set(); - go_home(); - put_newlines(4); - sprintf(temp, "(xenl) Newline-glitch is %s in the data base", - eat_newline_glitch ? "true" : "false"); - ptextln(temp); - } else { - /* test (xenl) when (os) is reset */ - if (!can_go_home) { - ptextln("(xenl) Newline-glitch not tested, can't home cursor"); - generic_done_message(t, state, ch); - return; - } - /* (xenl) test */ - put_clear(); - /* - this test must be done in raw mode. Otherwise - UNIX will translate CR to CRLF. - */ - if (stty_query(TTY_OUT_TRANS)) - tty_raw(1, char_mask); - for (j = 0; j < columns; j++) - put_this(' '); - put_cr(); - ptext("(xenl) should be set. Does not ignore CR"); - go_home(); - put_crlf(); - for (j = 0; j < columns; j++) - put_this(' '); - put_lf(); /* test (cud1) */ - ptext("(xenl) should be set. Ignores (cud1)"); - go_home(); - put_newlines(3); - if (scroll_forward && cursor_down && - strcmp(scroll_forward, cursor_down)) { - for (j = 0; j < columns; j++) - put_this(' '); - put_ind(); /* test (ind) */ - ptext("(xenl) should be set. Ignores (ind)"); - go_home(); - put_newlines(5); - } - tty_set(); - ptextln("If you don't see text above telling you to set it, (xenl) should be false"); - sprintf(temp, "(xenl) Newline-glitch is %s in the data base", - eat_newline_glitch ? "true" : "false"); - ptextln(temp); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_eo(test_list, status, ch) -** -** (eo) erase overstrike -*/ -static void -subtest_eo( - struct test_list *t, - int *state, - int *ch) -{ - if (transparent_underline || over_strike || underline_char) { - ptext("(eo) should "); - if (underline_char) { - ucprint("not"); - } else { - uprint("not"); - } - put_cr(); - ptextln("(eo) should be set"); - sprintf(temp, "\n(eo) Erase-overstrike is %s in the data base", - erase_overstrike ? "true" : "false"); - ptextln(temp); - generic_done_message(t, state, ch); - } -} - -/* -** subtest_xmc(test_list, status, ch) -** -** (xmc) magic cookie glitch -*/ -static void -subtest_xmc( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (enter_standout_mode) { - sprintf(temp, "\n(xmc) Magic-cookie-glitch is %d in the data base", magic_cookie_glitch); - ptextln(temp); - j = magic_cookie_glitch * 8; - for (i = 0; i < j; i++) { - put_str(" "); - } - ptextln(" These two lines should line up."); - if (j > 0) { - char_count += j; - } - for (i = 0; i < 4; i++) { - put_mode(enter_standout_mode); - putchp(' '); - put_mode(exit_standout_mode); - putchp(' '); - } - ptextln("These two lines should line up."); - ptext("If they don't line up then (xmc) magic-cookie-glitch should be greater than zero. "); - generic_done_message(t, state, ch); - } -} - -/* -** subtest_xhp(test_list, status, ch) -** -** (xhp) erase does not clear standout mode -*/ -static void -subtest_xhp( - struct test_list *t, - int *state, - int *ch) -{ - if (enter_standout_mode) { - put_crlf(); - put_mode(enter_standout_mode); - put_str("Stand out"); - put_mode(exit_standout_mode); - put_cr(); - ptextln("If any part of this line is standout then (xhp) should be set."); - sprintf(temp, "(xhp) Erase-standout-glitch is %s in the data base", - ceol_standout_glitch ? "true" : "false"); - ptextln(temp); - generic_done_message(t, state, ch); - } -} - -/* -** subtest_mir(test_list, status, ch) -** -** (mir) move in insert mode -*/ -static void -subtest_mir( - struct test_list *t, - int *state, - int *ch) -{ - int i; - char *s; - - if (enter_insert_mode && exit_insert_mode && cursor_address) { - put_clear(); - i = line_count; - put_str("\nXXX\nXXX\nXXX\nXXX"); - tc_putp(enter_insert_mode); - s = TPARM_2(cursor_address, i + 1, 0); - tputs(s, lines, tc_putch); - putchp('X'); - s = TPARM_2(cursor_address, i + 2, 1); - tputs(s, lines, tc_putch); - putchp('X'); - s = TPARM_2(cursor_address, i + 3, 2); - tputs(s, lines, tc_putch); - putchp('X'); - s = TPARM_2(cursor_address, i + 4, 3); - tputs(s, lines, tc_putch); - putchp('X'); - tc_putp(exit_insert_mode); - put_newlines(2); - ptextln("If you see a 4 by 4 block of X's then (mir) should be true."); - sprintf(temp, "(mir) Move-in-insert-mode is %s in the data base", - move_insert_mode ? "true" : "false"); - ptextln(temp); - } else { - ptext("(mir) Move-in-insert-mode not tested, "); - if (!enter_insert_mode) { - ptext("(smir) "); - } - if (!exit_insert_mode) { - ptext("(rmir) "); - } - if (!cursor_address) { - ptext("(cup) "); - } - ptext("not present. "); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_msgr(test_list, status, ch) -** -** (msgr) move in sgr mode -*/ -static void -subtest_msgr( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (cursor_address && - ((enter_standout_mode && exit_standout_mode) || - (enter_alt_charset_mode && exit_alt_charset_mode))) { - put_crlf(); - i = line_count + 1; - tputs(TPARM_2(cursor_address, i, 0), lines, tc_putch); - put_mode(enter_alt_charset_mode); - put_crlf(); - /* - some versions of the wy-120 can not clear lines or - screen when in alt charset mode. If (el) and (ed) - are defined then I can test them. If they are not - defined then they can not break (msgr) - */ - tc_putp(clr_eos); - tc_putp(clr_eol); - put_mode(exit_alt_charset_mode); - put_mode(enter_standout_mode); - putchp('X'); - tputs(TPARM_2(cursor_address, i + 2, 1), lines, tc_putch); - putchp('X'); - tputs(TPARM_2(cursor_address, i + 3, 2), lines, tc_putch); - putchp('X'); - tputs(TPARM_2(cursor_address, i + 4, 3), lines, tc_putch); - putchp('X'); - put_mode(exit_standout_mode); - put_crlf(); - tc_putp(clr_eos); /* OK if missing */ - put_crlf(); - ptextln("If you see a diagonal line of standout X's then (msgr) should be true. If any of the blanks are standout then (msgr) should be false."); - sprintf(temp, "(msgr) Move-in-SGR-mode is %s in the data base", - move_standout_mode ? "true" : "false"); - ptextln(temp); - } else { - ptextln("(smso) (rmso) (smacs) (rmacs) missing; (msgr) Move-in-SGR-mode not tested."); - } - generic_done_message(t, state, ch); -} - -/* -** subtest_in(test_list, status, ch) -** -** (in) insert null glitch -*/ -static void -subtest_in( - struct test_list *t, - int *state, - int *ch) -{ - if (enter_insert_mode && exit_insert_mode) { - ptextln("\nTesting (in) with (smir) and (rmir)"); - putln("\tIf these two lines line up ..."); - put_str("\tIf these two lines line up ..."); - put_cr(); - tc_putp(enter_insert_mode); - putchp(' '); - tc_putp(exit_insert_mode); - ptext("\nthen (in) should be set. "); - sprintf(temp, - "(in) Insert-null-glitch is %s in the data base.", - insert_null_glitch ? "true" : "false"); - ptextln(temp); - generic_done_message(t, state, ch); - } -} - -/* -** subtest_dadb(test_list, status, ch) -** -** (da) (db) data above, (db) data below -*/ -static void -subtest_dadb( - struct test_list *t, - int *state, - int *ch) -{ - if (can_clear_screen && scroll_reverse && scroll_forward) { - put_clear(); - if (scroll_reverse) - ptext("(da) Data-above should be set\r"); - home_down(); - if (scroll_forward) - ptext("(db) Data-below should be set\r"); - tc_putp(scroll_forward); - go_home(); - tc_putp(scroll_reverse); - tc_putp(scroll_reverse); - home_down(); - tc_putp(scroll_forward); - go_home(); - ptextln("\n\n\n\n\nIf the top line is blank then (da) should be false."); - ptextln("If the bottom line is blank then (db) should be false."); - sprintf(temp, "\n(da) Data-above is %s, and (db) Data-below is %s, in the data base.", - memory_above ? "true" : "false", - memory_below ? "true" : "false"); - ptextln(temp); - line_count = lines; - } else { - ptextln("(da) Data-above, (db) Data-below not tested, scrolls or (clear) is missing."); - } - generic_done_message(t, state, ch); -} diff --git a/tack/modules b/tack/modules deleted file mode 100644 index 1e3b0203..00000000 --- a/tack/modules +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: modules,v 1.6 2006/12/24 00:53:44 tom Exp $ -############################################################################## -# Copyright (c) 1998-1999,2006 Free Software Foundation, Inc. # -# # -# Permission is hereby granted, free of charge, to any person obtaining a # -# copy of this software and associated documentation files (the "Software"), # -# to deal in the Software without restriction, including without limitation # -# the rights to use, copy, modify, merge, publish, distribute, distribute # -# with modifications, sublicense, and/or sell copies of the Software, and to # -# permit persons to whom the Software is furnished to do so, subject to the # -# following conditions: # -# # -# The above copyright notice and this permission notice shall be included in # -# all copies or substantial portions of the Software. # -# # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # -# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # -# DEALINGS IN THE SOFTWARE. # -# # -# Except as contained in this notice, the name(s) of the above copyright # -# holders shall not be used in advertising or otherwise to promote the sale, # -# use or other dealings in this Software without prior written # -# authorization. # -############################################################################## -# -# Author: Thomas E. Dickey 1997-on -# -@ base -ansi progs $(srcdir) $(srcdir)/tack.h ../include/term.h -charset progs $(srcdir) $(srcdir)/tack.h ../include/term.h -color progs $(srcdir) $(srcdir)/tack.h ../include/term.h -control progs $(srcdir) $(srcdir)/tack.h ../include/term.h -crum progs $(srcdir) $(srcdir)/tack.h ../include/term.h -edit progs $(srcdir) $(srcdir)/tack.h ../include/term.h $(INCDIR)/tic.h -fun progs $(srcdir) $(srcdir)/tack.h ../include/term.h -init progs $(srcdir) $(srcdir)/tack.h ../include/term.h -menu progs $(srcdir) $(srcdir)/tack.h ../include/term.h -modes progs $(srcdir) $(srcdir)/tack.h ../include/term.h -output progs $(srcdir) $(srcdir)/tack.h ../include/term.h -pad progs $(srcdir) $(srcdir)/tack.h ../include/term.h -scan progs $(srcdir) $(srcdir)/tack.h ../include/term.h -sync progs $(srcdir) $(srcdir)/tack.h ../include/term.h -sysdep progs $(srcdir) $(srcdir)/tack.h ../include/term.h -tack progs $(srcdir) $(srcdir)/tack.h ../include/term.h - -# vile:makemode diff --git a/tack/ncurses_tst.hin b/tack/ncurses_tst.hin deleted file mode 100644 index 02a76362..00000000 --- a/tack/ncurses_tst.hin +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * - * copy of this software and associated documentation files (the * - * "Software"), to deal in the Software without restriction, including * - * without limitation the rights to use, copy, modify, merge, publish, * - * distribute, distribute with modifications, sublicense, and/or sell * - * copies of the Software, and to permit persons to whom the Software is * - * furnished to do so, subject to the following conditions: * - * * - * The above copyright notice and this permission notice shall be included * - * in all copies or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * - * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * * - * Except as contained in this notice, the name(s) of the above copyright * - * holders shall not be used in advertising or otherwise to promote the * - * sale, use or other dealings in this Software without prior written * - * authorization. * - ****************************************************************************/ - -/**************************************************************************** - * Author: Thomas E. Dickey 1998 * - ****************************************************************************/ -/* - * $Id: ncurses_tst.hin,v 1.1 1998/02/11 12:14:05 tom Exp $ - * - * This is a template-file used to generate the "ncurses_cfg.h" file. - * - * Rather than list every definition, the configuration script substitutes - * the definitions that it finds using 'sed'. You need a patch (971222) - * to autoconf 2.12 to do this. - */ -#ifndef NC_CONFIG_H -#define NC_CONFIG_H -@DEFS@ - - /* The C compiler may not treat these properly but C++ has to */ -#ifdef __cplusplus -#undef const -#undef inline -#else -#if defined(lint) || defined(TRACE) -#undef inline -#define inline /* nothing */ -#endif -#endif - -#endif /* NC_CONFIG_H */ diff --git a/tack/output.c b/tack/output.c deleted file mode 100644 index 8a3d0f42..00000000 --- a/tack/output.c +++ /dev/null @@ -1,818 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ -/* screen formatting and I/O utility functions */ - -#include -#include - -MODULE_ID("$Id: output.c,v 1.11 2006/11/26 00:16:49 tom Exp $") - -/* globals */ -long char_sent; /* number of characters sent */ -int char_count; /* counts characters */ -int line_count; /* counts line feeds */ -int expand_chars; /* length of expand() string */ -int replace_mode; /* used to output replace mode padding */ -int can_go_home; /* TRUE if we can fashion a home command */ -int can_clear_screen; /* TRUE if we can somehow clear the screen */ -int raw_characters_sent; /* Total output characters */ -static int log_count; /* Number of characters on a log line */ - -/* translate mode default strings */ -#define TM_carriage_return TM_string[0].value -#define TM_cursor_down TM_string[1].value -#define TM_scroll_forward TM_string[2].value -#define TM_newline TM_string[3].value -#define TM_cursor_left TM_string[4].value -#define TM_bell TM_string[5].value -#define TM_form_feed TM_string[6].value -#define TM_tab TM_string[7].value - -struct default_string_list TM_string[TM_last] = { - {"cr", "\r", 0}, - {"cud1", "\n", 0}, - {"ind", "\n", 0}, - {"nel", "\r\n", 0}, - {"cub1", "\b", 0}, - {"bel", "\007", 0}, - {"ff", "\f", 0}, - {"ht", "\t", 0} -}; - -static const char *c0[32] = { - "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", - "BEL", "BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI", - "DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB", - "CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US" -}; - -static const char *c1[32] = { - "", "", "", "", "IND", "NEL", "SSA", "ESA", - "HTS", "HTJ", "VTS", "PLD", "PLU", "RI", "SS2", "SS3", - "DCS", "PU1", "PU2", "STS", "CCH", "MW", "SPA", "EPA", - "", "", "", "CSI", "ST", "OSC", "PM", "APC" -}; - -int -getnext(int mask) -{ /* get the next character without scan mode - conversion */ - int ch; - unsigned char buf; - - tc_putp(req_for_input); - fflush(stdout); - if (nodelay_read) - while (1) { - ch = read(fileno(stdin), &buf, 1); - if (ch == -1) - return EOF; - if (ch == 1) - return buf; - } - ch = getchar(); - if (ch == EOF) - return EOF; - return ch & mask; -} - - -int -getchp(int mask) -{ /* read a character with scan mode conversion */ - if (scan_mode) { - tc_putp(req_for_input); - fflush(stdout); - return scan_key(); - } else - return getnext(mask); -} - -/* -** tc_putch(c) -** -** Output one character -*/ -int -tc_putch(int c) -{ - char_sent++; - raw_characters_sent++; - putchar(c); - if ((raw_characters_sent & 31) == 31) { - fflush(stdout); - } - if (log_fp) { - /* terminal output logging */ - c = UChar(c); - if (c < 32) { - fprintf(log_fp, "<%s>", c0[c]); - log_count += 5; - } else - if (c < 127) { - fprintf(log_fp, "%c", c); - log_count += 1; - } else { - fprintf(log_fp, "<%02x>", c); - log_count += 4; - } - if (c == '\n' || log_count >= 80) { - fprintf(log_fp, "\n"); - log_count = 0; - } - } - return (c); -} - -/* -** tt_tputs(string, reps) -** -** Output a string with tputs() translation. -** Use this function inside timing tests. -*/ -void -tt_tputs(const char *string, int reps) -{ - int i; - - if (string) { - for (i = 0; i < TT_MAX; i++) { - if (i >= ttp) { - tt_cap[i] = string; - tt_affected[i] = reps; - tt_count[i] = 1; - tt_delay[i] = msec_cost(string, reps); - ttp++; - break; - } - if (string == tt_cap[i] && reps == tt_affected[i]) { - tt_count[i]++; - tt_delay_used += tt_delay[i]; - break; - } - } - (void) tputs(string, reps, tc_putch); - } -} - -/* -** tt_putp(string) -** -** Output a string with tputs() translation. -** Use this function inside timing tests. -*/ -void -tt_putp(const char *string) -{ - tt_tputs(string, 1); -} - -/* -** tt_putparm(string, reps, arg1, arg2) -** -** Send tt_tputs(tparm(string, args1, arg2), reps) -** Use this function inside timing tests. -*/ -void -tt_putparm( - NCURSES_CONST char *string, - int reps, - int arg1, - int arg2) -{ - int i; - - if (string) { - for (i = 0; i < TT_MAX; i++) { - if (i >= ttp) { - tt_cap[i] = string; - tt_affected[i] = reps; - tt_count[i] = 1; - tt_delay[i] = msec_cost(string, reps); - ttp++; - break; - } - if (string == tt_cap[i] && reps == tt_affected[i]) { - tt_count[i]++; - tt_delay_used += tt_delay[i]; - break; - } - } - (void) tputs(TPARM_2((NCURSES_CONST char *)string, arg1, arg2), reps, tc_putch); - } -} - -/* -** tc_putp(string) -** -** Output a string with tputs() translation. -** Use this function instead of putp() so we can track -** the actual number of characters sent. -*/ -int -tc_putp(const char *string) -{ - return tputs(string, 1, tc_putch); -} - - -void -put_this(int c) -{ /* output one character (with padding) */ - tc_putch(c); - if (char_padding && replace_mode) - tt_putp(char_padding); -} - - -void -put_cr(void) -{ - if (translate_mode && carriage_return) { - tt_putp(carriage_return); - } else { - tt_putp(TM_carriage_return); - } - char_count = 0; -} - - -void -put_lf(void) -{ /* send a linefeed (only works in RAW or - CBREAK mode) */ - if (translate_mode && cursor_down) { - tt_putp(cursor_down); - } else { - tt_putp(TM_cursor_down); - } - line_count++; -} - - -void -put_ind(void) -{ /* scroll forward (only works in RAW or - CBREAK mode) */ - if (translate_mode && scroll_forward) { - tt_putp(scroll_forward); - } else { - tt_putp(TM_scroll_forward); - } - line_count++; -} - -/* -** put_crlf() -** -** Send (nel) or -*/ -void -put_crlf(void) -{ - if (translate_mode && newline) { - tt_putp(newline); - } else { - tt_putp(TM_newline); - } - char_count = 0; - line_count++; -} - -/* -** put_new_lines(count) -** -** Send a number of newlines. (nel) -*/ -void -put_newlines(int n) -{ - while (n-- > 0) { - put_crlf(); - } -} - -/* -** putchp(character) -** -** Send one character to the terminal. -** This function does translation of control characters. -*/ -void -putchp(int c) -{ - switch (c) { - case '\b': - if (translate_mode && cursor_left) { - tt_putp(cursor_left); - } else { - tt_putp(TM_cursor_left); - } - char_count--; - break; - case 7: - if (translate_mode && bell) { - tt_putp(bell); - } else { - tt_putp(TM_bell); - } - break; - case '\f': - if (translate_mode && form_feed) { - tt_putp(form_feed); - } else { - tt_putp(TM_form_feed); - } - char_count = 0; - line_count++; - break; - case '\n': - put_crlf(); - break; - case '\r': - put_cr(); - break; - case '\t': - if (translate_mode && tab) { - tt_putp(tab); - } else { - tt_putp(TM_tab); - } - char_count = ((char_count / 8) + 1) * 8; - break; - default: - put_this(c); - char_count++; - break; - } -} - - -void -put_str(const char *s) -{ /* send the string to the terminal */ - for (; *s; putchp(*s++)); -} - - -void -putln(const char *s) -{ /* output a string followed by a CR LF */ - for (; *s; putchp(*s++)); - put_crlf(); -} - - -void -put_columns(const char *s, int len, int w) -{ /* put out s in column format */ - int l; - - if (char_count + w > columns) { - put_crlf(); - } - l = char_count % w; - if (l) { - while (l < w) { - putchp(' '); - l++; - } - } - if (char_count && char_count + len >= columns) { - put_crlf(); - } - l = char_count; - put_str(s); - char_count = l + len; -} - - -/* -** ptext(string) -** -** Output a string but do not assume the terminal will wrap to a -** new line. Break the line at a word boundary then send a CR LF. -** This is more esthetic on 40 column terminals. -*/ -void -ptext(const char *s) -{ - const char *t; - - while (*s) { - for (t = s + 1; *t > ' '; t++); - if ((char_count != 0) && ((t - s) + char_count >= columns)) { - put_crlf(); - while (*s == ' ') - s++; - } - while (s < t) { - putchp(*s++); - } - } -} - - -void -put_dec(char *f, int i) -{ /* print a line with a decimal number in it */ - char tm[128]; - - sprintf(tm, f, i / 10, i % 10); - ptext(tm); -} - - -void -three_digit(char *tx, int i) -{ /* convert the decimal number to a string of - at least 3 digits */ - if (i < 1000) - sprintf(tx, "%d.%d", i / 10, i % 10); - else - sprintf(tx, "%d", i / 10); -} - - -void -ptextln(const char *s) -{ /* print the text using ptext() then add a CR - LF */ - ptext(s); - put_crlf(); -} - - -static void -expand_one(int ch, char **v) -{ /* expand one character */ - char *t = *v; - - if (ch & 0x80) { /* dump it in octal (yuck) */ - *t++ = '\\'; - *t++ = '0' + ((ch >> 6) & 3); - *t++ = '0' + ((ch >> 3) & 7); - *t++ = '0' + (ch & 7); - expand_chars += 4; - } else if (ch == 127) { /* DEL */ - *t++ = '^'; - *t++ = '?'; - expand_chars += 2; - } else if (ch >= ' ') { - *t++ = ch; - expand_chars++; - } else { /* control characters */ - *t++ = '^'; - *t++ = ch + '@'; - expand_chars += 2; - } - *v = t; -} - - -char * -expand(const char *s) -{ /* convert the string to printable form */ - static char buf[4096]; - char *t, *v; - int ch; - - if (magic_cookie_glitch <= 0 && exit_attribute_mode) { - v = enter_reverse_mode; - } else { - v = NULL; - } - expand_chars = 0; - t = buf; - if (s) { - for (; (ch = *s); s++) { - if ((ch & 0x80) && v) { /* print it in reverse video - mode */ - strcpy(t, liberated(TPARM_0(v))); - for (; *t; t++); - expand_one(ch & 0x7f, &t); - strcpy(t, liberated(TPARM_0(exit_attribute_mode))); - for (; *t; t++); - } else { - expand_one(ch, &t); - } - } - } - *t = '\0'; - return buf; -} - - -char * -print_expand(char *s) -{ /* convert the string to 7-bit printable form */ - static char buf[4096]; - char *t; - int ch; - - expand_chars = 0; - t = buf; - if (s) { - for (; (ch = *s); s++) { - expand_one(ch, &t); - } - } - *t = '\0'; - return buf; -} - - -char * -expand_to(char *s, int l) -{ /* expand s to length l */ - char *t; - - for (s = t = expand(s); *t; t++); - for (; expand_chars < l; expand_chars++) { - *t++ = ' '; - } - *t = '\0'; - return s; -} - - -char * -hex_expand_to(char *s, int l) -{ /* expand s to length l in hex */ - static char buf[4096]; - char *t; - - for (t = buf; *s; s++) { - sprintf(t, "%02X ", UChar(*s)); - t += 3; - if (t - buf > (int) sizeof(buf) - 4) { - break; - } - } - for (; t - buf < l;) { - *t++ = ' '; - } - *t = '\0'; - expand_chars = t - buf; - return buf; -} - - -char * -expand_command(const char *c) -{ /* expand an ANSI escape sequence */ - static char buf[256]; - int i, j, ch; - char *s; - - s = buf; - for (i = FALSE; (ch = UChar(*c)) != 0; c++) { - if (i) { - *s++ = ' '; - } - i = TRUE; - if (ch < 32) { - j = UChar(c[1]); - if (ch == '\033' && j >= '@' && j <= '_') { - ch = j - '@'; - c++; - for (j = 0; (*s = c1[ch][j++]); s++); - } else - for (j = 0; (*s = c0[ch][j++]); s++); - } else { - *s++ = ch; - j = UChar(c[1]); - if (ch >= '0' && ch <= '9' && - j >= '0' && j <= '9') { - i = FALSE; - } - } - } - *s = '\0'; - return buf; -} - -/* -** go_home() -** -** Move the cursor to the home position -*/ -void -go_home(void) -{ - int i; - - if (cursor_home) - tt_putp(cursor_home); - else if (cursor_address) - tt_putparm(cursor_address, lines, 0, 0); - else if (row_address) { /* use (vpa) */ - put_cr(); - tt_putparm(row_address, 1, 0, 0); - } else if (cursor_up && cursor_to_ll) { - tt_putp(cursor_to_ll); - for (i = 1; i < lines; i++) { - tt_putp(cursor_up); - } - } else { - can_go_home = FALSE; - return; - } - char_count = line_count = 0; - can_go_home = TRUE; -} - - -void -home_down(void) -{ /* move the cursor to the lower left hand - corner */ - int i; - - if (cursor_to_ll) - tt_putp(cursor_to_ll); - else if (cursor_address) - tt_putparm(cursor_address, lines, lines - 1, 0); - else if (row_address) { /* use (vpa) */ - put_cr(); - tt_putparm(row_address, 1, lines - 1, 0); - } else if (cursor_down && cursor_home) { - tt_putp(cursor_home); - for (i = 1; i < lines; i++) - tt_putp(cursor_down); - } else - return; - char_count = 0; - line_count = lines - 1; -} - - -void -put_clear(void) -{ /* clear the screen */ - int i; - - if (clear_screen) - tt_tputs(clear_screen, lines); - else if (clr_eos && can_go_home) { - go_home(); - tt_tputs(clr_eos, lines); - } else if (scroll_forward && !over_strike && (can_go_home || cursor_up)) { - /* clear the screen by scrolling */ - put_cr(); - if (cursor_to_ll) { - tt_putp(cursor_to_ll); - } else if (cursor_address) { - tt_putparm(cursor_address, lines, lines - 1, 0); - } else if (row_address) { - tt_putparm(row_address, 1, lines - 1, 0); - } else { - for (i = 1; i < lines; i++) { - tt_putp(scroll_forward); - } - } - for (i = 1; i < lines; i++) { - tt_putp(scroll_forward); - } - if (can_go_home) { - go_home(); - } else { - for (i = 1; i < lines; i++) { - tt_putp(cursor_up); - } - } - } else { - can_clear_screen = FALSE; - return; - } - char_count = line_count = 0; - can_clear_screen = TRUE; -} - -/* -** wait_here() -** -** read one character from the input stream -** If the terminal is not in RAW mode then this function will -** wait for a or . -*/ -int -wait_here(void) -{ - char ch, cc[64]; - char message[16]; - int i, j; - - for (i = 0; i < (int) sizeof(cc); i++) { - cc[i] = ch = getchp(STRIP_PARITY); - if (ch == '\r' || ch == '\n') { - put_crlf(); - char_sent = 0; - return cc[i ? i - 1 : 0]; - } - if (ch >= ' ') { - if (stty_query(TTY_CHAR_MODE)) { - put_crlf(); - char_sent = 0; - return ch; - } - continue; - } - if (ch == 023) { /* Control S */ - /* ignore control S, but tell me about it */ - while (ch == 023 || ch == 021) { - ch = getchp(STRIP_PARITY); - if (i < (int) sizeof(cc)) - cc[++i] = ch; - } - put_str("\nThe terminal sent a ^S -"); - for (j = 0; j <= i; j++) { - sprintf(message, " %02X", cc[j] & 0xFF); - put_str(message); - } - put_crlf(); - i = -1; - } else if (ch != 021) { /* Not Control Q */ - /* could be abort character */ - spin_flush(); - if (tty_can_sync == SYNC_TESTED) { - (void) tty_sync_error(); - } else { - put_str("\n? "); - } - } - } - return '?'; -} - - -/* -** read_string(buffer, length) -** -** Read a string of characters from the input stream. -*/ -void -read_string( - char *buf, - int length) -{ - int ch, i; - - for (i = 0; i < length - 1; ) { - ch = getchp(STRIP_PARITY); - if (ch == '\r' || ch == '\n') { - break; - } - if (ch == '\b' || ch == 127) { - if (i) { - putchp('\b'); - putchp(' '); - putchp('\b'); - i--; - } - } else { - buf[i++] = ch; - putchp(ch); - } - } - buf[i] = '\0'; - put_crlf(); - char_sent = 0; -} - -/* -** maybe_wait(lines) -** -** wait if near the end of the screen, then clear screen -*/ -void -maybe_wait(int n) -{ - if (line_count + n >= lines) { - if (char_sent != 0) { - ptext("Go? "); - (void) wait_here(); - } - put_clear(); - } else { - put_crlf(); - } -} diff --git a/tack/pad.c b/tack/pad.c deleted file mode 100644 index da1e3d78..00000000 --- a/tack/pad.c +++ /dev/null @@ -1,1958 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: pad.c,v 1.6 2005/09/17 19:49:16 tom Exp $") - -/* test the pad counts on the terminal */ - -static void pad_standard(struct test_list *, int *, int *); -static void init_xon_xoff(struct test_list *, int *, int *); -static void init_cup(struct test_list *, int *, int *); -static void pad_rmxon(struct test_list *, int *, int *); -static void pad_home1(struct test_list *, int *, int *); -static void pad_home2(struct test_list *, int *, int *); -static void pad_clear(struct test_list *, int *, int *); -static void pad_ech(struct test_list *, int *, int *); -static void pad_el1(struct test_list *, int *, int *); -static void pad_el(struct test_list *, int *, int *); -static void pad_smdc(struct test_list *, int *, int *); -static void pad_dch(struct test_list *, int *, int *); -static void pad_dch1(struct test_list *, int *, int *); -static void pad_smir(struct test_list *, int *, int *); -static void pad_ich(struct test_list *, int *, int *); -static void pad_ich1(struct test_list *, int *, int *); -static void pad_xch1(struct test_list *, int *, int *); -static void pad_rep(struct test_list *, int *, int *); -static void pad_cup(struct test_list *, int *, int *); -static void pad_hd(struct test_list *, int *, int *); -static void pad_hu(struct test_list *, int *, int *); -static void pad_rin(struct test_list *, int *, int *); -static void pad_il(struct test_list *, int *, int *); -static void pad_indn(struct test_list *, int *, int *); -static void pad_dl(struct test_list *, int *, int *); -static void pad_xl(struct test_list *, int *, int *); -static void pad_scrc(struct test_list *, int *, int *); -static void pad_csrind(struct test_list *, int *, int *); -static void pad_sccsrrc(struct test_list *, int *, int *); -static void pad_csr_nel(struct test_list *, int *, int *); -static void pad_csr_cup(struct test_list *, int *, int *); -static void pad_ht(struct test_list *, int *, int *); -static void pad_smso(struct test_list *, int *, int *); -static void pad_smacs(struct test_list *, int *, int *); -static void pad_crash(struct test_list *, int *, int *); - -/* - Any command found in this list, executed from a "Done" prompt - will force the default action to repeat rather than next. -*/ -const char *pad_repeat_test = {"ep-+<>"}; - -struct test_list pad_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {0, 0, 0, 0, "p) change padding", 0, &change_pad_menu}, - {0, 0, 0, 0, "@) display statistics about the last test", dump_test_stats, 0}, - {0, 0, 0, 0, "c) clear screen", menu_clear_screen, 0}, - {0, 0, 0, 0, "i) send reset and init", menu_reset_init, 0}, - {0, 0, 0, 0, txt_longer_test_time, longer_test_time, 0}, - {0, 0, 0, 0, txt_shorter_test_time, shorter_test_time, 0}, - {0, 0, 0, 0, txt_longer_augment, longer_augment, 0}, - {0, 0, 0, 0, txt_shorter_augment, shorter_augment, 0}, - /*** - Phase 1: Test initialization and reset strings. - - (rs1) (rs2) (rs3) (is1) (is2) (is3) are very difficult to test. - They have no defined output. To make matters worse, the cap - builder could partition (rs1) (rs2) (rs3) by length, leaving the - terminal in some unknown state between (rs1) and (rs2) or between - (r2) and (rs3). Some reset strings clear the screen when done. - - We have no control over this. The only thing we can do for - certain is to test the pad times by checking for overruns. - ***/ - {MENU_NEXT, 3, "rs1", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "rs2", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "rs3", 0, 0, pad_standard, 0}, - {MENU_NEXT | MENU_INIT, 0, 0, 0, 0, init_xon_xoff, 0}, - {MENU_NEXT, 3, "is1", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "is2", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "is3", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "rmxon", "smxon", 0, pad_rmxon, 0}, - {MENU_NEXT | MENU_INIT, 0, 0, 0, 0, init_cup, 0}, - /* - Phase 2: Test home, screen clears and erases. - */ - {MENU_NEXT, 0, "home", 0, 0, pad_home1, 0}, - {MENU_NEXT, 0, "home) (nel", 0, 0, pad_home2, 0}, - {MENU_NEXT | 1, 0, "clear", 0, 0, pad_clear, 0}, - {MENU_NEXT | MENU_LM1, 0, "ed", 0, 0, pad_clear, 0}, - {MENU_NEXT | MENU_80c, 0, "ech", 0, 0, pad_ech, 0}, - {MENU_NEXT | MENU_80c, 0, "el1", "cub1 nel", 0, pad_el1, 0}, - {MENU_NEXT | MENU_10c, 0, "el", "nel", 0, pad_el, 0}, - /* - Phase 3: Character deletions and insertions - */ - {MENU_NEXT, 0, "smdc) (rmdc", 0, 0, pad_smdc, 0}, - {MENU_NEXT | MENU_80c, 0, "dch", "smdc rmdc", 0, pad_dch, 0}, - {MENU_NEXT | MENU_80c, 0, "dch1", "smdc rmdc", 0, pad_dch1, 0}, - {MENU_NEXT, 0, "smir) (rmir", 0, 0, pad_smir, 0}, - {MENU_NEXT | MENU_90c, 0, "ich) (ip", "smir rmir", 0, pad_ich, 0}, - {MENU_NEXT | MENU_90c, 0, "ich1) (ip", "smir rmir", 0, pad_ich1, 0}, - {MENU_NEXT, 4, "ich1) (dch1", "smir rmir", 0, pad_xch1, 0}, - {MENU_NEXT | MENU_90c, 0, "rep", 0, 0, pad_rep, 0}, - /* - Phase 4: Test cursor addressing pads. - */ - {MENU_NEXT, 0, "cup", 0, 0, pad_cup, 0}, - /* - Phase 5: Test scrolling and cursor save/restore. - */ - {MENU_NEXT, 0, "hd", 0, 0, pad_hd, 0}, - {MENU_NEXT, 0, "hu", 0, 0, pad_hu, 0}, - {MENU_NEXT | MENU_LM1 | 1, 0, "rin", 0, 0, pad_rin, 0}, - {MENU_NEXT, 0, "ri", 0, 0, pad_rin, 0}, - {MENU_NEXT | MENU_LM1 | 1, 0, "il", 0, 0, pad_il, 0}, - {MENU_NEXT, 0, "il1", 0, 0, pad_il, 0}, - {MENU_NEXT | MENU_LM1 | 1, 0, "indn", 0, 0, pad_indn, 0}, - {MENU_NEXT, 0, "ind", 0, 0, pad_indn, 0}, - {MENU_NEXT | MENU_LM1 | 1, 0, "dl", 0, 0, pad_dl, 0}, - {MENU_NEXT, 0, "dl1", 0, 0, pad_dl, 0}, - {MENU_NEXT, 0, "il1) (dl1", 0, 0, pad_xl, 0}, - {MENU_NEXT, 0, "sc) (rc", 0, 0, pad_scrc, 0}, - {MENU_NEXT | MENU_50l, 0, "csr) (ind", 0, 0, pad_csrind, 0}, - {MENU_NEXT, 0, "sc) (csr) (rc", 0, 0, pad_sccsrrc, 0}, - {MENU_NEXT, 0, "csr) (nel", "sc rc", 0, pad_csr_nel, 0}, - {MENU_NEXT, 0, "csr) (cup", 0, 0, pad_csr_cup, 0}, - /* - Phase 6: Test tabs. - */ - {MENU_NEXT, 0, "ht", 0, 0, pad_ht, 0}, - /* - Phase 7: Test character-set-switch pads. - */ - {MENU_NEXT, 0, "smso) (rmso", 0, 0, pad_smso, 0}, - {MENU_NEXT, 0, "smacs) (rmacs", 0, 0, pad_smacs, 0}, - /* - Phase 8: Tests for miscellaneous mode-switch pads. - */ - {MENU_NEXT, 3, "flash", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "smkx", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "rmkx", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "smm", 0, 0, pad_standard, 0}, - {MENU_NEXT, 3, "rmm", 0, 0, pad_standard, 0}, - /* - Phase 9: Test crash-and-burn properties of unpadded (clear). - */ - {0, 0, "clear", "xon", "k) run clear test with no padding", pad_crash, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -/* globals */ -static int hzcc; /* horizontal character count */ -char letter; /* current character being displayed */ -int letter_number; /* points into letters[] */ -int augment, repeats; /* number of characters (or lines) effected */ -char letters[] = "AbCdefghiJklmNopQrStuVwXyZ"; - -static char every_line[] = "This text should be on every line."; -static char all_lines[] = "Each char on any line should be the same. "; -static char above_line[] = "The above lines should be all Xs. "; -static char no_visual[] = "This loop test has no visual failure indicator. "; - -/* -** pad_standard(test_list, status, ch) -** -** Run a single cap pad test. -*/ -static void -pad_standard( - struct test_list *t, - int *state, - int *ch) -{ - const char *long_name; - char *cap; - int l = 2, i; - char tbuf[128]; - - if ((cap = get_string_cap_byname(t->caps_done, &long_name))) { - sprintf(tbuf, "(%s) %s, start testing", t->caps_done, - long_name); - if (skip_pad_test(t, state, ch, tbuf)) { - return; - } - i = 1; - pad_test_startup(1); - do { - if (i >= columns) { - page_loop(); - l++; - i = 1; - } - tt_putp(cap); - putchp(letter); - i++; - } while(still_testing()); - pad_test_shutdown(t, 0); - if (l >= lines) { - home_down(); - } else { - put_crlf(); - } - ptextln(no_visual); - } else { - CAP_NOT_FOUND; - /* Note: get_string_cap_byname() always sets long_name */ - sprintf(temp, "(%s) %s, not present. ", t->caps_done, - long_name); - ptext(temp); - } - pad_done_message(t, state, ch); -} - -/* -** init_xon_xoff(test_list, status, ch) -** -** Initialize the xon_xoff values -*/ -static void -init_xon_xoff( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - /* the reset strings may dink with the XON/XOFF modes */ - if (select_xon_xoff == 0 && exit_xon_mode) { - tc_putp(exit_xon_mode); - } - if (select_xon_xoff == 1 && enter_xon_mode) { - tc_putp(enter_xon_mode); - } -} - -/* -** pad_rmxon(test_list, status, ch) -** -** Test (rmxon) exit XON/XOFF mode -*/ -static void -pad_rmxon( - struct test_list *t, - int *state, - int *ch) -{ - if (select_xon_xoff == 0 && exit_xon_mode) { - pad_standard(t, state, ch); - } -} - -/* -** init_cup(test_list, status, ch) -** -** Send the initialization strings for XON/XOFF and (smcup) -** Stop pad testing if clear screen is missing. -*/ -static void -init_cup( - struct test_list *t, - int *state, - int *ch) -{ - init_xon_xoff(t, state, ch); - if (enter_ca_mode) { - tc_putp(enter_ca_mode); - } - if (!can_clear_screen) { - ptext("(clear) clear screen not present,"); - ptext(" pad processing terminated. "); - pad_done_message(t, state, ch); - if (*ch == 0 || *ch == 'n' || *ch == 's' || *ch == 'r') { - *ch = '?'; - } - return; - } -} - -/* -** pad_home1(test_list, status, ch) -** -** Test (home) when (am) is set. -*/ -static void -pad_home1( - struct test_list *t, - int *state, - int *ch) -{ - int j, k; - - if (can_go_home && auto_right_margin) { - /* - truly brain damaged terminals will fail this test because - they cannot accept data at full rate - */ - if (skip_pad_test(t, state, ch, "(home) Home start testing")) { - return; - } - pad_test_startup(1); - do { - go_home(); - for (j = 1; j < lines; j++) { - for (k = 0; k < columns; k++) { - if (k & 0xF) { - put_this(letter); - } else { - put_this('.'); - } - } - SLOW_TERMINAL_EXIT; - } - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext("All the dots should line up. "); - pad_done_message(t, state, ch); - put_clear(); - } -} - -/* -** pad_home2(test_list, status, ch) -** -** Test (home) and (nel). (am) is reset. -*/ -static void -pad_home2( - struct test_list *t, - int *state, - int *ch) -{ - int j, k; - - if (can_go_home) { - if (skip_pad_test(t, state, ch, - "(home) Home, (nel) newline start testing")) { - return; - } - pad_test_startup(1); - do { - go_home(); - for (j = 1; j < lines; j++) { - for (k = 2; k < columns; k++) { - if (k & 0xF) { - put_this(letter); - } else { - put_this('.'); - } - } - put_crlf(); /* this does the (nel) */ - SLOW_TERMINAL_EXIT; - } - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext("All the dots should line up. "); - pad_done_message(t, state, ch); - put_clear(); - } -} - -/* -** pad_clear(test_list, status, ch) -** -** Test (clear) and (ed) -** run the clear screen tests (also clear-to-end-of-screen) -** -** 0) full page -** 1) sparse page -** 2) short lines -** 3) one full line -** 4) one short line -*/ -static void -pad_clear( - struct test_list *t, - int *state, - int *ch) -{ - const char *end_message = 0; - const char *txt; - int j, k, is_clear; - int clear_select; /* select the test number */ - - is_clear = t->flags & 1; - clear_select = auto_right_margin ? 0 : 1; - if (is_clear) { - txt = "(clear) clear-screen start testing"; - } else { - if (!clr_eos) { - CAP_NOT_FOUND; - ptext("(ed) erase-to-end-of-display, not present. "); - pad_done_message(t, state, ch); - return; - } - txt = "(ed) erase-to-end-of-display start testing"; - } - if (skip_pad_test(t, state, ch, txt)) { - return; - } - if (enter_am_mode) { - tc_putp(enter_am_mode); - clear_select = 0; - } - for (; clear_select < 5; clear_select++) { - if (augment > lines || is_clear || !cursor_address) { - augment = lines; - } else { - if (augment <= 1) { - augment = 2; - } - if (augment < lines) { - put_clear(); - tt_putparm(cursor_address, 1, - lines - augment - 1, 0); - ptextln("This line should not be erased (ed)"); - } - } - repeats = augment; - switch (clear_select) { - case 0: - end_message = "Clear full screen. "; - break; - case 1: - end_message = "Clear sparse screen. "; - if (cursor_down) { - break; - } - clear_select++; - /* FALLTHRU */ - case 2: - end_message = "Clear one character per line. "; - if (newline) { - break; - } - clear_select++; - /* FALLTHRU */ - case 3: - end_message = "Clear one full line. "; - break; - case 4: - end_message = "Clear single short line. "; - break; - } - pad_test_startup(0); - do { - switch (clear_select) { - case 0: /* full screen test */ - for (j = 1; j < repeats; j++) { - for (k = 0; k < columns; k++) { - if (k & 0xF) { - put_this(letter); - } else { - put_this('.'); - } - } - SLOW_TERMINAL_EXIT; - } - break; - case 1: /* sparse screen test */ - for (j = columns - repeats; j > 2; j--) { - put_this(letter); - } - for (j = 2; j < repeats; j++) { - tt_putp(cursor_down); - put_this(letter); - } - break; - case 2: /* short lines */ - for (j = 2; j < repeats; j++) { - put_this(letter); - tt_putp(newline); - } - put_this(letter); - break; - case 3: /* one full line */ - for (j = columns - 5; j > 1; j--) { - put_this(letter); - } - break; - case 4: /* one short line */ - put_str("Erase this!"); - break; - } - if (is_clear) { - put_clear(); - } else { - if (augment == lines) { - go_home(); - } else { - tt_putparm(cursor_address, 1, - lines - repeats, 0); - } - tt_tputs(clr_eos, repeats); - } - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 1); - ptext(end_message); - - pad_done_message(t, state, ch); - - if (*ch != 0 && *ch != 'n') { - return; - } - } -} - -/* -** pad_ech(test_list, status, ch) -** -** Test (ech) erase characters -*/ -static void -pad_ech( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!erase_chars) { - CAP_NOT_FOUND; - ptext("(ech) Erase-characters, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(ech) Erase-characters start testing")) { - return; - } - if (augment > columns - 2) { - augment = columns - 2; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - for (j = 0; j <= repeats; j++) { - putchp(letter); - } - put_cr(); - tt_putparm(erase_chars, repeats, repeats, 0); - put_crlf(); - SLOW_TERMINAL_EXIT; - } - for (i = 1; i <= repeats; i++) { - putchp(' '); - } - putchp(letter); - put_crlf(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext(all_lines); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_el1(test_list, status, ch) -** -** Test (el1) erase to start of line also (cub1) and (nel) -*/ -static void -pad_el1( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!clr_bol) { - CAP_NOT_FOUND; - ptext("(el1) Erase-to-beginning-of-line, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(el1) Erase-to-beginning-of-line start testing")) { - return; - } - if (augment > columns - 2) { - augment = columns - 2; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - for (j = 0; j <= repeats; j++) { - putchp(letter); - } - tt_putp(cursor_left); - tt_putp(cursor_left); - tt_tputs(clr_bol, repeats); - put_crlf(); - SLOW_TERMINAL_EXIT; - } - for (i = 1; i <= repeats; i++) { - putchp(' '); - } - putchp(letter); - put_crlf(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext(all_lines); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_el(test_list, status, ch) -** -** Test (el) clear to end of line also (nel) -*/ -static void -pad_el( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!clr_eol) { - CAP_NOT_FOUND; - ptext("(el) Clear-to-end-of-line, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(el) Clear-to-end-of-line start testing")) { - return; - } - hzcc = columns * 8 / 10; /* horizontal character count */ - if (augment > hzcc) { - augment = hzcc; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - for (j = -1; j < augment; j++) { - putchp(letter); - } - put_cr(); - putchp(letter); - tt_putp(clr_eol); - put_crlf(); - SLOW_TERMINAL_EXIT; - } - putchp(letter); - put_crlf(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext(all_lines); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_smdc(test_list, status, ch) -** -** Test (smdc) (rmdc) Delete mode -*/ -static void -pad_smdc( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (!enter_delete_mode) { - CAP_NOT_FOUND; - ptext("(smdc) Enter-delete-mode"); - if (!exit_delete_mode) { - ptext(", (rmdc) Exit-delete-mode"); - } - ptext(", not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(smdc) (rmdc) Enter/Exit-delete-mode start testing")) { - return; - } - pad_test_startup(1); - do { - page_loop(); - for (i = 1; i < columns; i++) { - tt_putp(enter_delete_mode); - tt_putp(exit_delete_mode); - putchp(letter); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext(no_visual); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_dch(test_list, status, ch) -** -** Test (smdc) (rmdc) Delete mode and (dch) -*/ -static void -pad_dch( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!parm_dch) { - CAP_NOT_FOUND; - ptext("(dch) Delete-characters, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(dch) Delete-characters start testing")) { - return; - } - hzcc = columns * 8 / 10; /* horizontal character count */ - if (augment > hzcc) { - augment = hzcc; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - for (j = 0; j <= repeats; j++) { - putchp(letter); - } - put_cr(); - tt_putp(enter_delete_mode); - tt_putparm(parm_dch, repeats, repeats, 0); - tt_putp(exit_delete_mode); - put_crlf(); - SLOW_TERMINAL_EXIT; - } - putchp(letter); - put_crlf(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext(all_lines); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_dch1(test_list, status, ch) -** -** Test (smdc) (rmdc) Delete mode and (dch1) -*/ -static void -pad_dch1( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!delete_character) { - if (parm_dch) { - /* if the other one is defined then its OK */ - return; - } - CAP_NOT_FOUND; - ptext("(dch1) Delete-character, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(dch1) Delete-character start testing")) { - return; - } - hzcc = columns * 8 / 10; /* horizontal character count */ - if (augment > hzcc) { - augment = hzcc; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - for (j = -1; j < augment; j++) { - putchp(letter); - } - put_cr(); - tt_putp(enter_delete_mode); - for (j = 0; j < augment; j++) { - tt_putp(delete_character); - } - tt_putp(exit_delete_mode); - put_crlf(); - SLOW_TERMINAL_EXIT; - } - putchp(letter); - put_crlf(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext(all_lines); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_smir(test_list, status, ch) -** -** Test (smir) (rmir) Insert mode -*/ -static void -pad_smir( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (!enter_insert_mode) { - CAP_NOT_FOUND; - ptext("(smir) Enter-insert-mode"); - if (!exit_insert_mode) { - ptext(", (rmir) Exit-insert-mode"); - } - ptext(", not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(smir) (rmir) Enter/Exit-insert-mode start testing")) { - return; - } - pad_test_startup(1); - do { - page_loop(); - for (i = 1; i < columns; i++) { - tt_putp(enter_insert_mode); - tt_putp(exit_insert_mode); - putchp(letter); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext(no_visual); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_ich(test_list, status, ch) -** -** Test (smir) (rmir) Insert mode and (ich) and (ip) -*/ -static void -pad_ich( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!parm_ich) { - CAP_NOT_FOUND; - ptext("(ich) Insert-characters, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(ich) Insert-characters, (ip) Insert-padding start testing")) { - return; - } - j = columns * 9 / 10; - if (augment > j) { - augment = j; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - putchp(letter); - put_cr(); - tt_putp(enter_insert_mode); - replace_mode = 0; - tt_putparm(parm_ich, repeats, repeats, 0); - tt_putp(exit_insert_mode); - replace_mode = 1; - put_crlf(); - SLOW_TERMINAL_EXIT; - } - for (i = 0; i < repeats; i++) { - putchp(' '); - } - putchp(letter); - NEXT_LETTER; - put_crlf(); - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext(all_lines); - pad_done_message(t, state, ch); - tc_putp(exit_insert_mode); -} - -/* -** pad_ich1(test_list, status, ch) -** -** Test (smir) (rmir) Insert mode and (ich1) and (ip) -*/ -static void -pad_ich1( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!insert_character) { - CAP_NOT_FOUND; - ptext("(ich1) Insert-character, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(ich1) Insert-character, (ip) Insert-padding start testing")) { - return; - } - if (augment > columns - 2) { - augment = columns - 2; - } - pad_test_startup(1); - do { - put_clear(); - for (i = 2; i < lines; i++) { - putchp(letter); - put_cr(); - tt_putp(enter_insert_mode); - replace_mode = 0; - if (!insert_padding && !insert_character) { - /* only enter/exit is needed */ - for (j = 0; j < augment; j++) { - putchp('.'); - } - } else { - for (j = 0; j < augment; j++) { - tt_putp(insert_character); - putchp('.'); - tt_putp(insert_padding); - } - } - tt_putp(exit_insert_mode); - replace_mode = 1; - put_crlf(); - SLOW_TERMINAL_EXIT; - } - for (j = 0; j < augment; j++) { - putchp('.'); - } - putchp(letter); - NEXT_LETTER; - put_crlf(); - } while(still_testing()); - pad_test_shutdown(t, 0); - ptext(all_lines); - pad_done_message(t, state, ch); - tc_putp(exit_insert_mode); -} - -/* -** pad_xch1(test_list, status, ch) -** -** Test (ich1) (ip) (dch1) -*/ -static void -pad_xch1( - struct test_list *t, - int *state, - int *ch) -{ - static char xch1[] = - "This line should not be garbled. It should be left justified."; - - if (enter_insert_mode || exit_insert_mode || - enter_delete_mode || exit_delete_mode || - !insert_character || !delete_character) { - /* this test is quietly ignored */ - return; - } - if (skip_pad_test(t, state, ch, - "(ich1) Insert-character, (dch1) Delete-character start testing")) { - return; - } - put_crlf(); - ptext(xch1); - put_cr(); - pad_test_startup(0); - do { - tt_putp(insert_character); - tt_putp(delete_character); - } while(still_testing()); - pad_test_shutdown(t, 1); - ptextln(xch1); - ptext("The preceding two lines should be the same. "); - pad_done_message(t, state, ch); -} - -/* -** pad_rep(test_list, status, ch) -** -** Test (rep) repeat character -*/ -static void -pad_rep( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!repeat_char) { - CAP_NOT_FOUND; - ptext("(rep) Repeat-character, not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(rep) Repeat-character start testing")) { - return; - } - if (augment > columns - 2) { - augment = columns - 2; - } - if (augment < 2) { - augment = 2; - } - pad_test_startup(1); - do { - go_home(); - for (i = 2; i < lines; i++) { - tt_putparm(repeat_char, repeats, letter, repeats); - put_crlf(); - } - for (j = 0; j < repeats; j++) { - putchp(letter); - } - put_crlf(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - ptextln(all_lines); - pad_done_message(t, state, ch); -} - -/* -** pad_cup(test_list, status, ch) -** -** Test (cup) Cursor address -*/ -static void -pad_cup( - struct test_list *t, - int *state, - int *ch) -{ - int i, j, l, r, c; - - if (!cursor_address) { - CAP_NOT_FOUND; - ptext("(cup) Cursor-address not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(cup) Cursor-address start testing")) { - return; - } - put_clear(); - ptext("Each line should be filled with the same letter. There should"); - ptext(" be no gaps, or single letters scattered over the screen. "); - if (char_count + 15 > columns) { - put_crlf(); - } - if (((lines - line_count) & 1) == 0) { - /* this removes the gap in the middle of the test when the - number of lines is odd. */ - put_crlf(); - } - r = line_count; - c = char_count; - l = (columns - 4) >> 1; - pad_test_startup(0); - do { - for (i = 1; i + i + r < lines; i++) { - for (j = 0; j <= l; j++) { - tt_putparm(cursor_address, 1, r + i, j); - putchp(letter); - tt_putparm(cursor_address, 1, r + i, l + l + 1 - j); - putchp(letter); - tt_putparm(cursor_address, 1, lines - i, j); - putchp(letter); - tt_putparm(cursor_address, 1, lines - i, l + l + 1 - j); - putchp(letter); - } - SLOW_TERMINAL_EXIT; - } - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - tt_putparm(cursor_address, 1, line_count = r, char_count = c); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_hd(test_list, status, ch) -** -** Test (hd) Half down -*/ -static void -pad_hd( - struct test_list *t, - int *state, - int *ch) -{ - int i, j, k; - - if (!down_half_line) { - CAP_NOT_FOUND; - ptext("(hd) Half-line-down not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(hd) Half-line-down start testing")) { - return; - } - pad_test_startup(1); - do { - for (i = 1; i < columns; i += 2) { - for (j = 1; j < i; ++j) { - putchp(' '); - } - tt_putp(down_half_line); - for (k = lines + lines; k > 4; k--) { - if (j++ >= columns) { - break; - } - tt_putp(down_half_line); - putchp(letter); - } - go_home(); - SLOW_TERMINAL_EXIT; - } - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_hu(test_list, status, ch) -** -** Test (hu) Half line up -*/ -static void -pad_hu( - struct test_list *t, - int *state, - int *ch) -{ - int i, j, k; - - if (!up_half_line) { - CAP_NOT_FOUND; - ptext("(hu) Half-line-up not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(hu) Half-line-up start testing")) { - return; - } - pad_test_startup(1); - do { - for (i = 1; i < columns; i += 2) { - home_down(); - for (j = 1; j < i; ++j) { - putchp(' '); - } - tt_putp(up_half_line); - for (k = lines + lines; k > 4; k--) { - if (j++ >= columns) { - break; - } - tt_putp(up_half_line); - putchp(letter); - } - SLOW_TERMINAL_EXIT; - } - go_home(); - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, 0); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_rin(test_list, status, ch) -** -** Test (rin) and (ri) Reverse index -*/ -static void -pad_rin( - struct test_list *t, - int *state, - int *ch) -{ - int i; - const char *start_message; - - if (t->flags & 1) { - /* rin */ - if (!parm_rindex) { - CAP_NOT_FOUND; - ptext("(rin) Scroll-reverse-n-lines not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(rin) Scroll-reverse-n-lines start testing"; - } else { - /* ri */ - if (!scroll_reverse) { - CAP_NOT_FOUND; - ptext("(ri) Scroll-reverse not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(ri) Scroll-reverse start testing"; - augment = 1; - } - if (skip_pad_test(t, state, ch, start_message)) { - return; - } - pad_test_startup(1); - do { - sprintf(temp, "%d\r", test_complete); - put_str(temp); - if (scroll_reverse && repeats == 1) { - tt_putp(scroll_reverse); - } else { - tt_putparm(parm_rindex, repeats, repeats, 0); - } - } while(still_testing()); - put_str("This line should be on the bottom.\r"); - if (scroll_reverse && augment == 1) { - for (i = 1; i < lines; i++) { - tt_putp(scroll_reverse); - } - } else { - tt_putparm(parm_rindex, lines - 1, lines - 1, 0); - } - putln("The screen should have text on the bottom line."); - sprintf(temp, "Scroll reverse %d line%s. ", augment, - augment == 1 ? "" : "s"); - put_str(temp); - pad_test_shutdown(t, 0); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_il(test_list, status, ch) -** -** Test (il) and (il1) Insert line -*/ -static void -pad_il( - struct test_list *t, - int *state, - int *ch) -{ - int i; - const char *start_message; - - if (t->flags & 1) { - /* il */ - if (!parm_insert_line) { - CAP_NOT_FOUND; - ptext("(il) Insert-lines not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(il) Insert-lines start testing"; - } else { - /* il1 */ - if (!insert_line) { - CAP_NOT_FOUND; - ptext("(il1) Insert-line not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(il1) Insert-line start testing"; - augment = 1; - } - if (skip_pad_test(t, state, ch, start_message)) { - return; - } - pad_test_startup(1); - do { - sprintf(temp, "%d\r", test_complete); - put_str(temp); - if (insert_line && repeats == 1) { - tt_putp(insert_line); - } else { - tt_putparm(parm_insert_line, repeats, repeats, 0); - } - } while(still_testing()); - put_str("This line should be on the bottom.\r"); - if (insert_line && augment == 1) { - for (i = 1; i < lines; i++) { - tt_putp(insert_line); - } - } else { - tt_putparm(parm_insert_line, lines - 1, lines - 1, 0); - } - putln("The screen should have text on the bottom line."); - sprintf(temp, "Insert %d line%s. ", augment, - augment == 1 ? "" : "s"); - put_str(temp); - pad_test_shutdown(t, 0); - pad_done_message(t, state, ch); - put_clear(); -} - -/* -** pad_indn(test_list, status, ch) -** -** Test (indn) and (ind) Scroll forward -*/ -static void -pad_indn( - struct test_list *t, - int *state, - int *ch) -{ - int i; - const char *start_message; - - if (t->flags & 1) { - /* indn */ - if (!parm_index) { - CAP_NOT_FOUND; - ptext("(indn) Scroll-forward-n-lines not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(indn) Scroll-forward-n-lines start testing"; - } else { - /* ind */ - if (!scroll_forward) { - CAP_NOT_FOUND; - ptext("(ind) Scroll-forward not present. "); - pad_done_message(t, state, ch); - return; - } - if (over_strike) { - ptext("(ind) Scroll-forward not tested on overstrike terminals. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(ind) Scroll-forward start testing"; - augment = 1; - } - if (skip_pad_test(t, state, ch, start_message)) { - return; - } - pad_test_startup(1); - /* go to the bottom of the screen */ - home_down(); - do { - sprintf(temp, "%d\r", test_complete); - put_str(temp); - if (scroll_forward && repeats == 1) { - put_ind(); - } else { - tt_putparm(parm_index, repeats, repeats, 0); - } - } while(still_testing()); - put_str("This line should be on the top.\r"); - if (scroll_forward && augment == 1) { - for (i = 1; i < lines; i++) { - put_ind(); - } - } else { - tt_putparm(parm_index, lines - 1, lines - 1, 0); - } - go_home(); - sprintf(temp, "\nScroll forward %d line%s. ", augment, - augment == 1 ? "" : "s"); - put_str(temp); - pad_test_shutdown(t, 0); - pad_done_message(t, state, ch); -} - -/* -** pad_dl(test_list, status, ch) -** -** Test (dl) and (dl1) Delete lines -*/ -static void -pad_dl( - struct test_list *t, - int *state, - int *ch) -{ - int i = 0; - const char *start_message; - - if (t->flags & 1) { - /* dl */ - if (!parm_delete_line) { - CAP_NOT_FOUND; - ptext("(dl) Delete-lines not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(dl) Delete-lines start testing"; - } else { - /* dl1 */ - if (!delete_line) { - CAP_NOT_FOUND; - ptext("(dl1) Delete-line not present. "); - pad_done_message(t, state, ch); - return; - } - start_message = "(dl1) Delete-line start testing"; - augment = 1; - } - if (skip_pad_test(t, state, ch, start_message)) { - return; - } - pad_test_startup(1); - do { - sprintf(temp, "%d\r", test_complete); - if (augment < lines - 1) { - go_home(); - putln(temp); - } - put_str(temp); - if (delete_line && repeats == 1) { - tt_putp(delete_line); - } else { - tt_putparm(parm_delete_line, repeats, repeats, 0); - } - } while(still_testing()); - home_down(); - put_str("This line should be on the top."); - go_home(); - if (delete_line && augment == 1) { - for (i = 1; i < lines; i++) { - tt_putp(delete_line); - } - } else { - tt_putparm(parm_delete_line, lines - 1, lines - 1, 0); - } - sprintf(temp, "\nDelete %d line%s. ", augment, - augment == 1 ? "" : "s"); - put_str(temp); - pad_test_shutdown(t, 0); - pad_done_message(t, state, ch); -} - -/* -** pad_xl(test_list, status, ch) -** -** Test (il1) Insert and (dl1) Delete lines -*/ -static void -pad_xl( - struct test_list *t, - int *state, - int *ch) -{ - if (!insert_line && !delete_line) { - /* quietly skip this test */ - return; - } - if (skip_pad_test(t, state, ch, - "(il1) Insert-line, (dl1) Delete-line start testing")) { - return; - } - put_clear(); - putln("\rThis text is written on the first line."); - ptext("This sentence begins on the second line. As this"); - ptext(" test runs the bottom part of this paragraph will"); - ptext(" jump up and down. Don't worry, that's normal. When"); - ptext(" the jumping stops, the entire paragraph should"); - ptext(" still be on the screen and in the same place as when"); - ptext(" the test started. If this paragraph has scrolled"); - ptext(" off the top or bottom of the screen then the test"); - ptext(" has failed. Scrolling off the top of the screen"); - ptext(" usually means that the delete line capability is"); - ptext(" working better than the insert line capability. If"); - ptext(" the text scrolls off the bottom then delete line may"); - ptext(" be broken. If parts of the text are missing then"); - ptext(" you should get professional help."); - put_crlf(); - go_home(); - put_newlines(2); - pad_test_startup(0); - do { - tt_putp(insert_line); - put_cr(); - tt_putp(delete_line); - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext("The top of the screen should have a paragraph of text. "); - pad_done_message(t, state, ch); -} - -/* -** pad_scrc(test_list, status, ch) -** -** Test (sc) (rc) Save/restore cursor -*/ -static void -pad_scrc( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (!save_cursor || !restore_cursor) { - CAP_NOT_FOUND; - if (save_cursor) { - ptext("(rc) Restore-cursor"); - } else - if (restore_cursor) { - ptext("(sc) Save-cursor"); - } else { - ptext("(sc) Save-cursor, (rc) Restore-cursor"); - } - ptext(" not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(sc) (rc) Save/Restore-cursor start testing")) { - return; - } - pad_test_startup(1); - do { - page_loop(); - for (i = 1; i < columns; i++) { - tt_putp(save_cursor); - putchp(letter); - tt_putp(restore_cursor); - putchp('X'); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext(above_line); - pad_done_message(t, state, ch); -} - -/* -** pad_csrind(test_list, status, ch) -** -** Test (csr) and (ind) Change scroll region and index. -*/ -static void -pad_csrind( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (!change_scroll_region) { - CAP_NOT_FOUND; - ptext("(csr) Change-scroll-region not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(csr) Save/Restore-cursor, (ind) index start testing")) { - return; - } - if (augment < 2) { - augment = 2; - } - if (augment > lines - 1) { - augment = lines - 1; - } - put_clear(); - ptext("This text is on the top line."); - tt_putparm(change_scroll_region, 1, lines - augment, lines - 1); - /* go to the bottom of the screen */ - home_down(); - pad_test_startup(0); - do { - sprintf(temp, "%d\r", test_complete); - put_str(temp); - put_ind(); - } while(still_testing()); - ptextln("(csr) is broken."); - for (i = augment; i > 1; i--) { - put_ind(); - } - pad_test_shutdown(t, 0); - ptext("All but top and bottom lines should be blank. "); - pad_done_message(t, state, ch); - tt_putparm(change_scroll_region, 1, 0, lines - 1); - put_clear(); -} - -/* -** pad_sccsrrc(test_list, status, ch) -** -** Test (sc) (csr) and (rc) Save/Change/Restore scroll region -*/ -static void -pad_sccsrrc( - struct test_list *t, - int *state, - int *ch) -{ - int i; - - if (!save_cursor || !change_scroll_region || !restore_cursor) { - /* quietly ignore this test */ - return; - } - if (skip_pad_test(t, state, ch, - "(sc) (csr) (rc) Save/Change/Restore-cursor, start testing")) { - return; - } - pad_test_startup(1); - do { - page_loop(); - for (i = 1; i < columns; i++) { - tt_putp(save_cursor); - putchp(letter); - tt_putparm(change_scroll_region, 1, 0, lines - 1); - tt_putp(restore_cursor); - putchp('X'); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext(above_line); - pad_done_message(t, state, ch); - tt_putparm(change_scroll_region, 1, 0, lines - 1); -} - -/* -** pad_csr_nel(test_list, status, ch) -** -** Test (sc) (csr) (nel) and (rc) Save/Change/Restore scroll region -*/ -static void -pad_csr_nel( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!save_cursor || !change_scroll_region || !restore_cursor) { - /* quietly ignore this test */ - return; - } - if (skip_pad_test(t, state, ch, - "(csr) Change-scroll-region, (nel) newline start testing")) { - return; - } - pad_test_startup(1); - do { - for (i = 0; i < lines; i++) { - for (j = lines - i; j > 0; j--) { - put_crlf(); - } - tt_putp(save_cursor); - tt_putparm(change_scroll_region, 1, i, lines - 1); - tt_putp(restore_cursor); - put_str(every_line); - } - tt_putp(save_cursor); - tt_putparm(change_scroll_region, 1, 0, lines - 1); - tt_putp(restore_cursor); - } while(still_testing()); - pad_test_shutdown(t, 0); - put_str(" "); - pad_done_message(t, state, ch); - tt_putparm(change_scroll_region, 1, 0, lines - 1); -} - -/* -** pad_csr_cup(test_list, status, ch) -** -** Test (csr) (cup) Change scroll region and cursor address -*/ -static void -pad_csr_cup( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!change_scroll_region || !cursor_address) { - /* quietly ignore this test */ - return; - } - if (skip_pad_test(t, state, ch, - "(csr) Change-scroll-region, (cup) cursor-address start testing")) { - return; - } - pad_test_startup(1); - do { - for (i = 0; i < lines; i++) { - for (j = lines - i; j > 0; j--) { - put_crlf(); - } - tt_putparm(change_scroll_region, 1, i, lines - 1); - tt_putparm(cursor_address, 1, lines - 1, 0); - put_str(every_line); - } - tt_putparm(change_scroll_region, 1, 0, lines - 1); - tt_putparm(cursor_address, 1, lines - 1, (int) strlen(every_line)); - } while(still_testing()); - pad_test_shutdown(t, 0); - put_str(" "); - pad_done_message(t, state, ch); - tt_putparm(change_scroll_region, 1, 0, lines - 1); -} - -/* -** pad_ht(test_list, status, ch) -** -** Test (ht) Tabs -*/ -static void -pad_ht( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!set_tab && init_tabs <= 0) { - CAP_NOT_FOUND; - ptext("(ht) Tab not tested. (hts) Set-tabs and (it) initial-tabs not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, "(ht) Tab start testing")) { - return; - } - pad_test_startup(1); - do { - /* - it is not always possible to test tabs with caps - that do not already have padding. The following - test uses a mixed bag of tests in order to avoid - this problem. Note: I do not scroll - */ - if (auto_right_margin && can_go_home) - for (i = 1, go_home(); i < lines - 2; i++) { - for (j = 8; j < columns; j += 8) { - putchp('\t'); - } - put_str("A "); - } - if (cursor_down && can_go_home) - for (i = 1, go_home(); i < lines - 2; i++) { - for (j = 8; j < columns; j += 8) { - putchp('\t'); - } - put_str("D\r"); - tt_putp(cursor_down); - } - if (cursor_address) - for (i = 1; i < lines - 2; i++) { - tt_putparm(cursor_address, 1, i - 1, 0); - for (j = 8; j < columns; j += 8) { - putchp('\t'); - } - put_str("C"); - } - go_home(); - for (i = 1; i < lines - 2; i++) { - for (j = 8; j < columns; j += 8) { - putchp('\t'); - } - putln("N"); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - ptextln("Letters on the screen other than Ns at the right margin indicate failure."); - ptext("A-(am) D-(cud1) C-(cup) N-(nel) "); - pad_done_message(t, state, ch); -} - -/* -** pad_smso(test_list, status, ch) -** -** Test (smso) (rmso) Enter/exit mode -*/ -static void -pad_smso( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - if (!enter_standout_mode || !exit_standout_mode) { - CAP_NOT_FOUND; - ptext("(smso) (rmso) Enter/Exit-standout-mode not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(smso) (rmso) Enter/Exit-standout-mode start testing")) { - return; - } - /* - In terminals that emulate non-hidden attributes with hidden - attributes, the amount of time that it takes to fill the screen - with an attribute is nontrivial. The following test is designed to - catch those delays - */ - pad_test_startup(1); - do { - page_loop(); - j = magic_cookie_glitch > 0 ? magic_cookie_glitch : 0; - for (i = 2 + j + j; i < columns;) { - put_mode(enter_standout_mode); - i += j + j + 2; - putchp('X'); - put_mode(exit_standout_mode); - putchp('X'); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext(above_line); - pad_done_message(t, state, ch); - put_mode(exit_standout_mode); -} - -/* -** pad_smacs(test_list, status, ch) -** -** Test (smacs) (rmacs) Enter/exit altcharset mode -*/ -static void -pad_smacs( - struct test_list *t, - int *state, - int *ch) -{ - int i, j; - - /* test enter even if exit is missing */ - if (!enter_alt_charset_mode) { - CAP_NOT_FOUND; - ptext("(smacs) Enter-altcharset-mode not present. "); - pad_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(smacs) (rmacs) Enter/Exit-altcharset-mode start testing")) { - return; - } - pad_test_startup(1); - do { - page_loop(); - j = magic_cookie_glitch > 0 ? magic_cookie_glitch : 0; - for (i = 2 + j + j; i < columns;) { - put_mode(enter_alt_charset_mode); - i += j + j + 2; - putchp(letter); - put_mode(exit_alt_charset_mode); - putchp(letter); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - home_down(); - ptext("Every other character is from the alternate character set. "); - pad_done_message(t, state, ch); - put_mode(exit_alt_charset_mode); -} - -/* -** pad_crash(test_list, status, ch) -** -** Test (clear) without padding -*/ -static void -pad_crash( - struct test_list *t, - int *state, - int *ch) -{ - int save_xon_xoff; - - if (!clear_screen) { - ptext("(clear) Clear-screen not present. "); - pad_done_message(t, state, ch); - return; - } - ptext("If you would like to see if the terminal will really lock up."); - ptextln(" I will send the clear screen sequence without the pads."); - if (skip_pad_test(t, state, ch, - "(clear) Clear-screen start crash testing")) { - return; - } - save_xon_xoff = xon_xoff; - xon_xoff = 1; - pad_test_startup(0); - do { - put_str("Erase this!"); - tt_putp(clear_screen); - } while(still_testing()); - xon_xoff = save_xon_xoff; - pad_test_shutdown(t, 1); - pad_done_message(t, state, ch); -} diff --git a/tack/scan.c b/tack/scan.c deleted file mode 100644 index dbe684bd..00000000 --- a/tack/scan.c +++ /dev/null @@ -1,264 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ -/* scan mode keyboard support */ - -#include - -MODULE_ID("$Id: scan.c,v 1.5 2005/09/17 19:49:16 tom Exp $") - -unsigned scan_max; /* length of longest scan code */ -char **scan_up, **scan_down, **scan_name; -unsigned *scan_tested, *scan_length; -static unsigned *scan_value; - -static int shift_state; -static char *str; -static int debug_char_count; - -#define SHIFT_KEY 0x100 -#define CONTROL_KEY 0x200 -#define META_KEY 0x400 -#define CAPS_LOCK 0x800 - -static const struct { - const char *name; - unsigned type; -} scan_special[] = { - {"", SHIFT_KEY}, - {"", SHIFT_KEY}, - {"", SHIFT_KEY}, - {"", CONTROL_KEY}, - {"", CONTROL_KEY}, - {"", CONTROL_KEY}, - {"", META_KEY}, - {"", META_KEY}, - {"", META_KEY}, - {"", CAPS_LOCK}, - {"", '\t'}, - {"", ' '}, - {"", '\r'}, - {"", '\n'}, - {"", '\f'}, - {"", '\b'}, - {0, 0} -}; - -static void -scan_blanks(void) -{ /* scan past the white space */ - while (*str == ' ' || *str == '\t') - str++; -} - -static char * -smash(void) -{ /* convert a string to hex */ - char *s, *t; - int ch, i, j; - - t = s = str; - for (i = 0; (ch = *str); str++) { - if (ch >= '0' && ch <= '9') - j = ch - '0'; - else if (ch >= 'a' && ch <= 'f') - j = 10 - 'a' + ch; - else if (ch >= 'A' && ch <= 'F') - j = 10 - 'A' + ch; - else if (ch == ' ' || ch == '\t') - break; - else - continue; - if (i) { - *s |= j; - s++; - } else - *s = j << 4; - i ^= 1; - } - *s = '\0'; - return t; -} - -void -scan_init(char *fn) -{ /* read the scan mode key definitions */ - char *s, *sl; - FILE *fp; - int ch, i, j; - unsigned len; - char home[512]; - - if ((str = getenv("HOME"))) - strcpy(home, str); - else - home[0] = '\0'; - fp = NULL; - if ((str = getenv("KEYBOARD"))) { - if (!(fp = fopen(str, "r")) && home[0]) { - sprintf(temp, "%s/.scan.%s", home, str); - fp = fopen(temp, "r"); - } - } - if (!fp) { - sprintf(temp, ".scan.%s", fn); - fp = fopen(temp, "r"); - } - if (!fp && home[0]) { - sprintf(temp, "%s/.scan.%s", home, fn); - fp = fopen(temp, "r"); - } - if (!fp) { - ptext("Unable to open scanfile: "); - ptextln(temp); - bye_kids(1); - return; - } - /* - scan file format: - - - - values are in hex. may be any string of characters - - */ - scan_up = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_down = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_name = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_tested = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN); - scan_length = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN); - scan_value = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN); - scan_up[0] = scan_down[0] = scan_name[0] = (char *) 0; - str = (char *) malloc(4096); /* buffer space */ - sl = str + 4000; /* an upper limit */ - scan_max = 1; - for (i = 0;;) { - for (s = str; (ch = getc(fp)) != EOF;) { - if (ch == '\n' || ch == '\r') - break; - *s++ = ch; - } - *s++ = '\0'; - if (ch == EOF) - break; - if (*str == '#' || *str == '\0') - continue; - scan_down[i] = smash(); - scan_blanks(); - scan_up[i] = smash(); - scan_blanks(); - scan_name[i] = str; - - scan_length[i] = strlen(scan_down[i]); - len = strlen(scan_up[i]) + scan_length[i]; - if (len > scan_max) - scan_max = len; - - scan_value[i] = UChar(scan_name[i][0]); - if (scan_name[i][1]) /* multi-character name */ - for (j = 0; scan_special[j].name; j++) { - if (!strcmp(scan_name[i], scan_special[j].name)) { - scan_value[i] = scan_special[j].type; - break; - } - } - - i++; - if (str > sl) { - str = (char *) malloc(4096); - sl = str + 4000; - } else - str = s; - } - fclose(fp); -#ifdef notdef - for (i = 0; scan_down[i]; i++) { - put_str(hex_expand_to(scan_down[i], 3)); - put_str(hex_expand_to(scan_up[i], 3)); - put_str(" "); - put_str(scan_name[i]); - put_crlf(); - } - (void) wait_here(); -#endif -} - -int -scan_key(void) -{ /* read a key and translate scan mode to - ASCII */ - unsigned i; - int j, ch; - char buf[64]; - - for (i = 1;; i++) { - ch = getchar(); - if (ch == EOF) - return EOF; - if (debug_fp) { - fprintf(debug_fp, "%02X ", ch); - debug_char_count += 3; - if (debug_char_count > 72) { - fprintf(debug_fp, "\n"); - debug_char_count = 0; - } - } - buf[i - 1] = ch; - buf[i] = '\0'; - if (buf[0] & 0x80) { /* scan up */ - for (j = 0; scan_up[j]; j++) { - if (i == scan_length[j] && - !strcmp(buf, scan_up[j])) { - i = 0; - shift_state &= ~scan_value[j]; - break; - } - } - continue; - } - for (j = 0; scan_down[j]; j++) { - if (i == scan_length[j] && !strcmp(buf, scan_down[j])) { - i = 0; - shift_state |= scan_value[j]; - ch = scan_value[j]; - if (ch == CAPS_LOCK) - shift_state ^= SHIFT_KEY; - if (ch >= 256) - break; - if (shift_state & SHIFT_KEY) { - if (ch >= 0x60) - ch -= 0x20; - else if (ch >= 0x30 && ch <= 0x3f) - ch -= 0x10; - } - if (shift_state & CONTROL_KEY) { - if ((ch | 0x20) >= 0x60 && - (ch | 0x20) <= 0x7f) - ch = (ch | 0x20) - 0x60; - } - if (shift_state & META_KEY) - ch |= 0x80; - return ch; - } - } - if (i > scan_max) - i = 1; - } -} diff --git a/tack/sync.c b/tack/sync.c deleted file mode 100644 index f9358bb1..00000000 --- a/tack/sync.c +++ /dev/null @@ -1,436 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include -#include - -MODULE_ID("$Id: sync.c,v 1.9 2006/05/06 20:45:48 tom Exp $") - -/* terminal-synchronization and performance tests */ - -static void sync_home(struct test_list *, int *, int *); -static void sync_lines(struct test_list *, int *, int *); -static void sync_clear(struct test_list *, int *, int *); -static void sync_summary(struct test_list *, int *, int *); - -static struct test_list sync_test_list[] = { - {MENU_NEXT, 0, 0, 0, "b) baud rate test", sync_home, 0}, - {MENU_NEXT, 0, 0, 0, "l) scroll performance", sync_lines, 0}, - {MENU_NEXT, 0, 0, 0, "c) clear screen performance", sync_clear, 0}, - {MENU_NEXT, 0, 0, 0, "p) summary of results", sync_summary, 0}, - {0, 0, 0, 0, txt_longer_test_time, longer_test_time, 0}, - {0, 0, 0, 0, txt_shorter_test_time, shorter_test_time, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -struct test_menu sync_menu = { - 0, 'n', 0, - "Performance tests", "perf", "n) run standard tests", - sync_test, sync_test_list, 0, 0, 0 -}; - -int tty_can_sync; /* TRUE if tty_sync_error() returned FALSE */ -static int tty_newline_rate; /* The number of newlines per second */ -static int tty_clear_rate; /* The number of clear-screens per second */ -unsigned long tty_cps; /* The number of characters per second */ - -#define TTY_ACK_SIZE 64 - -static int ACK_terminator; /* terminating ACK character */ -static int ACK_length; /* length of ACK string */ -static const char *tty_ENQ; /* enquire string */ -static char tty_ACK[TTY_ACK_SIZE]; /* ACK response, set by tty_sync_error() */ - -/***************************************************************************** - * - * Terminal synchronization. - * - * These functions handle the messy business of enq-ack handshaking - * for timing purposes. - * - *****************************************************************************/ - -int -tty_sync_error(void) -{ - int ch, trouble, ack; - - trouble = FALSE; - for (;;) { - tt_putp(tty_ENQ); /* send ENQ */ - ch = getnext(STRIP_PARITY); - event_start(TIME_SYNC); /* start the timer */ - - /* - The timer doesn't start until we get the first character. - After that I expect to get the remaining characters of - the acknowledge string in a short period of time. If - that is not true then these characters are coming from - the user and we need to send the ENQ sequence out again. - */ - for (ack = 0; ; ) { - if (ack < TTY_ACK_SIZE - 2) { - tty_ACK[ack] = ch; - tty_ACK[ack + 1] = '\0'; - } - if (ch == ACK_terminator) { - return trouble; - } - if (++ack >= ACK_length) { - return trouble; - } - ch = getnext(STRIP_PARITY); - if (event_time(TIME_SYNC) > 400000) { - break; - } - } - - set_attr(0); /* just in case */ - put_crlf(); - if (trouble) { - /* The terminal won't sync. Life is not good. */ - return TRUE; - } - put_str(" -- sync -- "); - trouble = TRUE; - } -} - -/* -** flush_input() -** -** Throw away any output. -*/ -void -flush_input(void) -{ - if (tty_can_sync == SYNC_TESTED && ACK_terminator >= 0) { - (void) tty_sync_error(); - } else { - spin_flush(); - } -} - -/* -** probe_enq_ok() -** -** does the terminal do enq/ack handshaking? -*/ -static void -probe_enq_ok(void) -{ - int tc, len, ulen; - - put_str("Testing ENQ/ACK, standby..."); - fflush(stdout); - can_test("u8 u9", FLAG_TESTED); - -#ifdef user9 - tty_ENQ = user9 ? user9 : "\005"; -#else - tty_ENQ = "\005"; -#endif - tc_putp(tty_ENQ); - event_start(TIME_SYNC); /* start the timer */ - read_key(tty_ACK, TTY_ACK_SIZE - 1); - - if (event_time(TIME_SYNC) > 400000 || tty_ACK[0] == '\0') { - /* These characters came from the user. Sigh. */ - tty_can_sync = SYNC_FAILED; - ptext("\nThis program expects the ENQ sequence to be"); - ptext(" answered with the ACK character. This will help"); - ptext(" the program reestablish synchronization when"); - ptextln(" the terminal is overrun with data."); - ptext("\nENQ sequence from (u9): "); - putln(expand(tty_ENQ)); - ptext("ACK received: "); - putln(expand(tty_ACK)); -#ifdef user8 - len = user8 ? strlen(user8) : 0; -#else - len = 0; -#endif - sprintf(temp, "Length of ACK %d. Expected length of ACK %d.", - (int) strlen(tty_ACK), len); - ptextln(temp); -#ifdef user8 - if (len) { - temp[0] = user8[len - 1]; - temp[1] = '\0'; - ptext("Terminating character found in (u8): "); - putln(expand(temp)); - } -#endif - return; - } - - tty_can_sync = SYNC_TESTED; - if ((len = strlen(tty_ACK)) == 1) { - /* single character acknowledge string */ - ACK_terminator = tty_ACK[0]; - ACK_length = 4096; - return; - } - tc = tty_ACK[len - 1]; -#ifdef user8 - if (user8) { - ulen = strlen(user8); - if (tc == user8[ulen - 1]) { - /* ANSI style acknowledge string */ - ACK_terminator = tc; - ACK_length = 4096; - return; - } - } -#endif - /* fixed length acknowledge string */ - ACK_length = len; - ACK_terminator = -2; -} - -/* -** verify_time() -** -** verify that the time tests are ready to run. -** If the baud rate is not set then compute it. -*/ -void -verify_time(void) -{ - int status, ch; - - if (tty_can_sync == SYNC_FAILED) { - return; - } - probe_enq_ok(); - put_crlf(); - if (tty_can_sync == SYNC_TESTED) { - put_crlf(); - if (ACK_terminator >= 0) { - ptext("ACK terminating character: "); - temp[0] = ACK_terminator; - temp[1] = '\0'; - ptextln(expand(temp)); - } else { - sprintf(temp, "Fixed length ACK, %d characters", - ACK_length); - ptextln(temp); - } - } - if (tty_baud_rate == 0) { - sync_home(&sync_test_list[0], &status, &ch); - } -} - -/***************************************************************************** - * - * Terminal performance tests - * - * Find out how fast the terminal can: - * 1) accept characters - * 2) scroll the screen - * 3) clear the screen - * - *****************************************************************************/ - -/* -** sync_home(test_list, status, ch) -** -** Baudrate test -*/ -static void -sync_home( - struct test_list *t, - int *state, - int *ch) -{ - int j, k; - unsigned long rate; - - if (!cursor_home && !cursor_address && !row_address) { - ptext("Terminal can not home cursor. "); - generic_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(home) Start baudrate search")) { - return; - } - pad_test_startup(1); - do { - go_home(); - for (j = 1; j < lines; j++) { - for (k = 0; k < columns; k++) { - if (k & 0xF) { - put_this(letter); - } else { - put_this('.'); - } - } - SLOW_TERMINAL_EXIT; - } - NEXT_LETTER; - } while(still_testing()); - pad_test_shutdown(t, auto_right_margin == 0); - /* note: tty_frame_size is the real framesize times two. - This takes care of half bits. */ - rate = (tx_cps * tty_frame_size) >> 1; - if (rate > tty_baud_rate) { - tty_baud_rate = rate; - } - if (tx_cps > tty_cps) { - tty_cps = tx_cps; - } - sprintf(temp, "%lu characters per second. Baudrate %d ", tx_cps, j); - ptext(temp); - generic_done_message(t, state, ch); -} - -/* -** sync_lines(test_list, status, ch) -** -** How many newlines/second? -*/ -static void -sync_lines( - struct test_list *t, - int *state, - int *ch) -{ - int j; - - if (skip_pad_test(t, state, ch, - "(nel) Start scroll performance test")) { - return; - } - pad_test_startup(0); - repeats = 100; - do { - sprintf(temp, "%d", test_complete); - put_str(temp); - put_newlines(repeats); - } while(still_testing()); - pad_test_shutdown(t, 0); - j = sliding_scale(tx_count[0], 1000000, usec_run_time); - if (j > tty_newline_rate) { - tty_newline_rate = j; - } - sprintf(temp, "%d linefeeds per second. ", j); - ptext(temp); - generic_done_message(t, state, ch); -} - -/* -** sync_clear(test_list, status, ch) -** -** How many clear-screens/second? -*/ -static void -sync_clear( - struct test_list *t, - int *state, - int *ch) -{ - int j; - - if (!clear_screen) { - ptext("Terminal can not clear-screen. "); - generic_done_message(t, state, ch); - return; - } - if (skip_pad_test(t, state, ch, - "(clear) Start clear-screen performance test")) { - return; - } - pad_test_startup(0); - repeats = 20; - do { - sprintf(temp, "%d", test_complete); - put_str(temp); - for (j = 0; j < repeats; j++) { - put_clear(); - } - } while(still_testing()); - pad_test_shutdown(t, 0); - j = sliding_scale(tx_count[0], 1000000, usec_run_time); - if (j > tty_clear_rate) { - tty_clear_rate = j; - } - sprintf(temp, "%d clear-screens per second. ", j); - ptext(temp); - generic_done_message(t, state, ch); -} - -/* -** sync_summary(test_list, status, ch) -** -** Print out the test results. -*/ -static void -sync_summary( - struct test_list *t, - int *state, - int *ch) -{ - char size[32]; - - put_crlf(); - ptextln("Terminal size characters/sec linefeeds/sec clears/sec"); - sprintf(size, "%dx%d", columns, lines); - sprintf(temp, "%-10s%-11s%11lu %11d %11d", tty_basename, size, - tty_cps, tty_newline_rate, tty_clear_rate); - ptextln(temp); - generic_done_message(t, state, ch); -} - -/* -** sync_test(menu) -** -** Run at the beginning of the pad tests and function key tests -*/ -void -sync_test( - struct test_menu *menu) -{ - control_init(); - if (tty_can_sync == SYNC_NOT_TESTED) { - verify_time(); - } - if (menu->menu_title) { - put_crlf(); - ptextln(menu->menu_title); - } -} - -/* -** sync_handshake(test_list, status, ch) -** -** Test or retest the ENQ/ACK handshake -*/ -void -sync_handshake( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - tty_can_sync = SYNC_NOT_TESTED; - verify_time(); -} diff --git a/tack/sysdep.c b/tack/sysdep.c deleted file mode 100644 index 78ae095e..00000000 --- a/tack/sysdep.c +++ /dev/null @@ -1,504 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ -/* - * Operating system dependent functions. We assume the POSIX API. - * Note: on strict-POSIX systems (including BSD/OS) the select_delay_type - * global has no effect. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include /* include before curses.h to work around glibc bug */ - -#include - -#include -#include - -#if defined(__BEOS__) -#undef false -#undef true -#include -#endif - -#if HAVE_SELECT -#if HAVE_SYS_TIME_H && HAVE_SYS_TIME_SELECT -#include -#endif -#if HAVE_SYS_SELECT_H -#include -#endif -#endif - -MODULE_ID("$Id: sysdep.c,v 1.15 2005/09/17 19:49:16 tom Exp $") - -#if DECL_ERRNO -extern int errno; -#endif - -#ifdef TERMIOS -#define PUT_TTY(fd, buf) tcsetattr(fd, TCSAFLUSH, buf) -#else -#define PUT_TTY(fd, buf) stty(fd, buf) -#endif - -/* globals */ -int tty_frame_size; /* asynch frame size times 2 */ -unsigned tty_baud_rate; /* baud rate - bits per second */ -int not_a_tty; /* TRUE if output is not a tty (i.e. pipe) */ -int nodelay_read; /* TRUE if NDELAY is set */ - -#ifdef TERMIOS -#define TTY_IS_NOECHO !(new_modes.c_lflag & ECHO) -#define TTY_IS_OUT_TRANS (new_modes.c_oflag & OPOST) -#define TTY_IS_CHAR_MODE !(new_modes.c_lflag & ICANON) -#define TTY_WAS_CS8 ((old_modes.c_cflag & CSIZE) == CS8) -#define TTY_WAS_XON_XOFF (old_modes.c_iflag & (IXON|IXOFF)) -#else -#define TTY_IS_NOECHO !(new_modes.sg_flags & (ECHO)) -#define TTY_IS_OUT_TRANS (new_modes.sg_flags & (CRMOD)) -#define TTY_IS_CHAR_MODE (new_modes.sg_flags & (RAW|CBREAK)) -#define TTY_WAS_CS8 (old_modes.sg_flags & (PASS8)) -#define TTY_WAS_XON_XOFF (old_modes.sg_flags & (TANDEM|MDMBUF|DECCTQ)) -#endif - -static TTY old_modes, new_modes; - -void catchsig(void); - -/* - * These are a sneaky way of conditionalizing bit unsets so strict-POSIX - * systems won't see them. - */ -#ifndef XCASE -#define XCASE 0 -#endif -#ifndef OLCUC -#define OLCUC 0 -#endif -#ifndef IUCLC -#define IUCLC 0 -#endif -#ifndef TABDLY -#define TABDLY 0 -#endif -#ifndef IXANY -#define IXANY 0 -#endif - -void -tty_raw(int minch GCC_UNUSED, int mask) -{ /* set tty to raw noecho */ - new_modes = old_modes; -#ifdef TERMIOS -#if HAVE_SELECT - new_modes.c_cc[VMIN] = 1; -#else - new_modes.c_cc[VMIN] = minch; -#endif - new_modes.c_cc[VTIME] = 2; - new_modes.c_lflag &= - ~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK | ECHONL); -#ifdef LOBLK - new_modes.c_lflag &= ~LOBLK; -#endif - new_modes.c_oflag &= ~(OPOST | OLCUC | TABDLY); - if (mask == ALLOW_PARITY) { - new_modes.c_cflag &= ~(CSIZE | PARENB | HUPCL); - new_modes.c_cflag |= CS8; - } - new_modes.c_iflag &= - ~(IGNBRK | BRKINT | IGNPAR | PARMRK | INPCK | ISTRIP | INLCR | IGNCR | ICRNL | - IUCLC | IXON | IXANY | IXOFF); -#else - new_modes.sg_flags |= RAW; -#endif - if (not_a_tty) - return; - PUT_TTY(fileno(stdin), &new_modes); -} - -void -tty_set(void) -{ /* set tty to special modes */ - new_modes = old_modes; -#ifdef TERMIOS - new_modes.c_cc[VMIN] = 1; - new_modes.c_cc[VTIME] = 1; - new_modes.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL); -#if defined(ONLCR) && defined(OCRNL) && defined(ONLRET) && defined(OFILL) - new_modes.c_oflag &= ~(ONLCR | OCRNL | ONLRET | OFILL); -#else - new_modes.c_oflag &= ~(OPOST); -#endif - if (char_mask == ALLOW_PARITY) - new_modes.c_iflag &= ~ISTRIP; - switch (select_xon_xoff) { - case 0: - new_modes.c_iflag &= ~(IXON | IXOFF); - break; - case 1: -#if defined(sequent) && sequent - /* the sequent System V emulation is broken */ - new_modes = old_modes; - new_modes.c_cc[VEOL] = 6; /* control F (ACK) */ -#endif - new_modes.c_iflag |= IXON | IXOFF; - break; - } - switch (select_delay_type) { - case 0: -#ifdef NLDLY - new_modes.c_oflag &= - ~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); -#endif /* NLDLY */ - break; - case 1: -#ifdef NLDLY - new_modes.c_oflag &= - ~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); -#endif /* NLDLY */ -#ifdef NL1 - new_modes.c_oflag |= NL1 | CR2; -#endif /* NL1 */ - break; - } - if (!(new_modes.c_oflag & (unsigned long) ~OPOST)) - new_modes.c_oflag &= (unsigned long) ~OPOST; -#else - new_modes.sg_flags |= RAW; - if (not_a_tty) - return; -#endif - PUT_TTY(fileno(stdin), &new_modes); -} - - -void -tty_reset(void) -{ /* reset the tty to the original modes */ - fflush(stdout); - if (not_a_tty) - return; - PUT_TTY(fileno(stdin), &old_modes); -} - - -void -tty_init(void) -{ /* ATT terminal init */ -#if defined(F_GETFL) && defined(O_NDELAY) - int flags; - - flags = fcntl(fileno(stdin), F_GETFL, 0); - nodelay_read = flags & O_NDELAY; -#else - nodelay_read = FALSE; -#endif - not_a_tty = FALSE; - if (GET_TTY(fileno(stdin), &old_modes) == -1) { - if (errno == ENOTTY) { - tty_frame_size = 20; - not_a_tty = TRUE; - return; - } - printf("tcgetattr error: %d\n", errno); - exit(1); - } - /* if TAB3 is set then setterm() wipes out tabs (ht) */ - new_modes = old_modes; -#ifdef TERMIOS -#ifdef TABDLY - new_modes.c_oflag &= ~TABDLY; -#endif /* TABDLY */ -#endif - if (PUT_TTY(fileno(stdin), &new_modes) == -1) { - printf("tcsetattr error: %d\n", errno); - exit(1); - } -#ifdef sequent - /* the sequent ATT emulation is broken soooo. */ - old_modes.c_cflag &= ~(CSIZE | CSTOPB); - old_modes.c_cflag |= CS7 | PARENB; -#endif - catchsig(); -#ifdef TERMIOS - switch (old_modes.c_cflag & CSIZE) { -#if defined(CS5) && (CS5 != 0) - case CS5: - tty_frame_size = 10; - break; -#endif -#if defined(CS6) && (CS6 != 0) - case CS6: - tty_frame_size = 12; - break; -#endif -#if defined(CS7) && (CS7 != 0) - case CS7: - tty_frame_size = 14; - break; -#endif -#if defined(CS8) && (CS8 != 0) - case CS8: - tty_frame_size = 16; - break; -#endif - } - tty_frame_size += 2 + - ((old_modes.c_cflag & PARENB) ? 2 : 0) + - ((old_modes.c_cflag & CSTOPB) ? 4 : 2); -#else - tty_frame_size = 6 + - (old_modes.sg_flags & PASS8) ? 16 : 14; -#endif -} - -/* -** stty_query(question) -** -** Does the current driver settings have this property? -*/ -int -stty_query(int q) -{ - switch (q) { - case TTY_NOECHO: - return TTY_IS_NOECHO; - case TTY_OUT_TRANS: - return TTY_IS_OUT_TRANS; - case TTY_CHAR_MODE: - return TTY_IS_CHAR_MODE; - } - return (-1); -} - -/* -** initial_stty_query(question) -** -** Did the initial driver settings have this property? -*/ -int -initial_stty_query(int q) -{ - switch (q) { - case TTY_8_BIT: - return TTY_WAS_CS8; - case TTY_XON_XOFF: - return TTY_WAS_XON_XOFF; - } - return (-1); -} - -#if HAVE_SELECT && defined(FD_ZERO) -static int -char_ready(void) -{ - int n; - fd_set ifds; - struct timeval tv; - - FD_ZERO(&ifds); - FD_SET(fileno(stdin), &ifds); - tv.tv_sec = 0; - tv.tv_usec = 200000; - n = select(fileno(stdin)+1, &ifds, NULL, NULL, &tv); - return (n != 0); -} - -#else -#ifdef FIONREAD -int -char_ready(void) -{ - int i, j; - - /* the following loop has to be tuned for each computer */ - for (j = 0; j < 1000; j++) { - ioctl(fileno(stdin), FIONREAD, &i); - if (i) - return i; - } - return i; -} - -#else -#if defined(__BEOS__) -int -char_ready(void) -{ - int n = 0; - int howmany = ioctl(0, 'ichr', &n); - return (howmany >= 0 && n > 0); -} -#else -#define char_ready() 1 -#endif -#endif -#endif - -/* -** spin_flush() -** -** Wait for the input stream to stop. -** Throw away all input characters. -*/ -void -spin_flush(void) -{ - unsigned char buf[64]; - - fflush(stdout); - event_start(TIME_FLUSH); /* start the timer */ - do { - if (char_ready()) { - (void) read(fileno(stdin), &buf, sizeof(buf)); - } - } while (event_time(TIME_FLUSH) < 400000); -} - -/* -** read_key(input-buffer, length-of-buffer) -** -** read one function key from the input stream. -** A null character is converted to 0x80. -*/ -void -read_key(char *buf, int max) -{ - int got, ask, i, l; - char *s; - - *buf = '\0'; - s = buf; - fflush(stdout); - /* ATT unix may return 0 or 1, Berkeley Unix should be 1 */ - while (read(fileno(stdin), s, 1) == 0); - ++s; - --max; - while (max > 0 && (ask = char_ready())) { - if (ask > max) { - ask = max; - } - if ((got = read(fileno(stdin), s, (unsigned) ask))) { - s += got; - } else { - break; - } - max -= got; - } - *s = '\0'; - l = s - buf; - for (s = buf, i = 0; i < l; i++) { - if ((*s & 0x7f) == 0) { - /* convert nulls to 0x80 */ - *(unsigned char *)s = 128; - } else { - /* strip high order bits (if any) */ - *s &= char_mask; - } - } -} - - -void -ignoresig(void) -{ - /* ignore signals */ - signal(SIGINT, SIG_IGN); - signal(SIGHUP, SIG_IGN); - signal(SIGQUIT, SIG_IGN); - signal(SIGTERM, SIG_IGN); - signal(SIGALRM, SIG_IGN); -} - - /* - onintr( ) - - is the interrupt handling routine onintr turns off interrupts while doing - clean-up - - onintr always exits fatally - */ - - -static RETSIGTYPE -onintr(int sig GCC_UNUSED) -{ - ignoresig(); - tty_reset(); - exit(1); -} - - - /* - catchsig( ) - - set up to field interrupts (via function onintr( )) so that if interrupted - we can restore the correct terminal modes - - catchsig simply returns - */ - - -void -catchsig(void) -{ - if ((signal(SIGINT, SIG_IGN)) == SIG_DFL) - signal(SIGINT, onintr); - - if ((signal(SIGHUP, SIG_IGN)) == SIG_DFL) - signal(SIGHUP, onintr); - - if ((signal(SIGQUIT, SIG_IGN)) == SIG_DFL) - signal(SIGQUIT, onintr); - - if ((signal(SIGTERM, SIG_IGN)) == SIG_DFL) - signal(SIGTERM, onintr); - -} - -/* -** alarm_event(sig) -** -** Come here for an alarm event -*/ -static void -alarm_event( - int sig GCC_UNUSED) -{ - no_alarm_event = 0; -} - -/* -** set_alarm_clock(seconds) -** -** Set the alarm clock to fire in -*/ -void -set_alarm_clock( - int seconds) -{ - signal(SIGALRM, alarm_event); - no_alarm_event = 1; - (void) alarm((unsigned) seconds); -} diff --git a/tack/tack.1 b/tack/tack.1 deleted file mode 100644 index dcab18f5..00000000 --- a/tack/tack.1 +++ /dev/null @@ -1,340 +0,0 @@ -.\"*************************************************************************** -.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * -.\" * -.\" Permission is hereby granted, free of charge, to any person obtaining a * -.\" copy of this software and associated documentation files (the * -.\" "Software"), to deal in the Software without restriction, including * -.\" without limitation the rights to use, copy, modify, merge, publish, * -.\" distribute, distribute with modifications, sublicense, and/or sell * -.\" copies of the Software, and to permit persons to whom the Software is * -.\" furnished to do so, subject to the following conditions: * -.\" * -.\" The above copyright notice and this permission notice shall be included * -.\" in all copies or substantial portions of the Software. * -.\" * -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * -.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * -.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * -.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * -.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -.\" * -.\" Except as contained in this notice, the name(s) of the above copyright * -.\" holders shall not be used in advertising or otherwise to promote the * -.\" sale, use or other dealings in this Software without prior written * -.\" authorization. * -.\"*************************************************************************** -.\" -.\" $Id: tack.1,v 1.3 2006/04/22 22:26:55 tom Exp $ -.TH tack 1M "" -.ds n 5 -.ds d @TERMINFO@ -.SH NAME -\fBtack\fR - \fIterminfo\fR action checker -.SH SYNOPSIS -\fBtack\fR [-itV] [term] -.br -.SH DESCRIPTION -The \fBtack\fR program has three purposes: -(1) to help you build a new terminfo entry describing an unknown terminal, -(2) to test the correctness of an existing entry, and -(3) to develop the correct pad timings needed to ensure that screen updates -don't fall behind the incoming data stream. -.PP -\fBTack\fR presents a series of screen-painting and interactive -tests in ways which are intended to make any mismatches between the -terminfo entry and reality visually obvious. -\fBTack\fR also provides tools that can help in understanding how -the terminal operates. -.SS OPTIONS -.TP -.I "\-i" -Usually \fBtack\fR will send the reset and init strings to the terminal -when the program starts up. The \fI-i\fR option will inhibit the -terminal initialization. -.TP -.I "\-t" -Tell \fBtack\fR to override the terminfo settings for basic terminal -functions. When this option is set \fBtack\fR will translate -(cr) to \\r, (cud1) to \\n, (ind) to \\n, (nel) to \\r\\n, -(cub1) to \\b, (bel) to \\007, (ff) to \\f and (ht) to \\t. -.TP -.I "\-V" -Display the version information and exit. -.TP -.I "term" -Terminfo terminal name to be tested. If not present then the $TERM -environment variable will be used. -.SH OVERVIEW -Since \fBtack\fR is designed to test terminfo's it is not possible -to rely on the correctness of the terminfo data base. Because of this -the menuing system used with \fBtack\fR is vary primitive. When a -menu is printed it will scroll the entire screen. To compensate -for this verbose menu system \fBtack\fR permits menu selection -type ahead. -If you already know what action you would like \fBtack\fR to perform -then you can enter that value immediately and avoid the menu display. -When in doubt the question mark (?) is a good character to type. -A carriage return will execute the default action. These default -actions are designed to run all the standard tests. -.PP -When \fBtack\fR first comes up it will display some basic information -about the terminal. Take some time to verify this information. -If it is wrong many of the subsequent tests will fail. The most -important item is the screen size. If the screen size is wrong there -is no point in proceeding. (home) and (clear) are also critical -to the success of subsequent tests. The values of (cr) (ind) -(cub1) and (ht) may effect the tests if they are defined incorrectly. -If they are undefined \fBtack\fR will set them to reasonable defaults. -The last two entries on the display are the enquire and acknowledge strings. -These strings are taken from the user strings (u9) and (u8). -.PP -By now you must be wondering why the terminfo names are enclosed -in parenthesis. This has no profound meaning other than it makes -them stand out. The \fBtack\fR program uses this convention any time -it displays a terminfo name. Remember \fBtack\fR is designed to -rely on as little of the terminfo entry as possible. -.SH CREATING NEW ENTRIES -\fBTack\fR has a number of tools that are designed to help gather -information about the terminal. Although these functions are not -dependent on terminal type, you may wish to execute \fBtack\fR -with options \fI\-it\fR. This will turn off initialization -and default the standard entries. -.PP -These tools may be reached from the main menu by selecting -the 'tools' entry. -.PP -\fBEcho tool\fR: All data typed from the keyboard will be echoed back -to the terminal. Control characters are not translated to the up arrow format -but are sent as control characters. This allows you to test an escape -sequence and see what it actually does. You may also elect to -\fBenable hex output on echo tool\fR this will echo the characters in -hexadecimal. Once the test is running you may enter the 'lines' -or 'columns' keywords which will display a pattern that will help -you determine your screen size. A complete list of keywords will -be displayed when the test starts. Type 'help' to redisplay -the list of available commands. -.PP -\fBReply tool\fR: This tool acts much like the echo tool, but -control characters that are sent from the terminal more than one character -after a carriage return will be expanded to the up arrow format. For example -on a standard ANSI terminal you may type: - - CR ESC [ c - -and the response will be echoed as something like: - - ^[ [ ? 6 c -.PP -\fBANSI sgr display\fR: This test assumes you have an ANSI terminal. It -goes through attribute numbers 0 to 79, displaying each in turn and using that -SGR number to write the text. This shows you which of the SGR -modes are actually implemented by the terminal. Note: some terminals (such as -Tektronix color) use the private use characters to augment the functionality of -the SGR command. These private use characters may be interjected into the -escape sequence by typing the character ( <, =, >, ? ) after the original -display has been shown. -.PP -\fBANSI status reports\fR: This test queries the terminal in standard -ANSI/VT-100 fashion. The results of this test may help -determine what options are supported by your terminal. -.PP -\fBANSI character sets\fR: This test displays the character sets -available on a ANSI/VT-100 style terminal. -Character sets on a real VT-100 terminal are usually defined -with smacs=\\E(0 and rmacs=\\E(B. The first character after the -escape defines the font bank. The second character defines the -character set. This test allows you to view any of the possible -combinations. Private use character sets are defined by the digits. -Standard character sets are located in the alphabetic range. -.SH VERIFYING AN EXISTING ENTRY -.PP -You can verify the correctness of an entry with the `begin testing' -function. This entry is the default action and will be chosen -if you hit carriage return (or enter). This will bring up a -secondary menu that allows you to select more specific tests. -.PP -The general philosophy of the program is, for each capability, to send an -appropriate test pattern to the terminal then send a description of -what the user should expect. Occasionally (as when checking function-key -capabilities) the program will ask you to enter input for it to check. -.PP -If the test fails then you have the option of dynamically changing -the terminfo entry and re-running the test. This is done with -the 'edit terminfo' menu item. The edit submenu allows you to change -the offending terminfo entry and immediately retest the capability. -The edit menu lets you do other things with the terminfo, such as; -display the entire terminfo entry, -display which caps have been tested and display which caps cannot -be tested. This menu also allows you to write the newly modified -terminfo to disc. If you have made any modifications to the -terminfo \fBtack\fR will ask you if you want to save the file -to disc before it exits. The filename will be the same as the terminal name. -After the program exits you can run the tic(1M) compiler on the -new terminfo to install it in the terminfo data base. -.PP -.SH CORRECTING PAD TIMINGS -.SS Theory of Overruns and Padding -.PP -Some terminals require significant amounts of time (that is, more than one -transmitted-character interval) to do screen updates that change large -portions of the screen, such as screen clears, line insertions, -line deletions, and scrolls (including scrolls triggered by line feeds -or a write to the lowest, right-hand-most cell of the screen). -.PP -If the computer continues to send characters to the terminal while one -of these time-consuming operations is going on, the screen may be garbled. -Since the length of a character transmission time varies inversely with -transmission speed in cps, entries which function at lower speeds may -break at higher speeds. -.PP -Similar problems result if the host machine is simply sending characters at a -sustained rate faster than the terminal can buffer and process them. In either -case, when the terminal cannot process them and can't tell the host to stop -soon enough, it will just drop them. The dropped characters could be text, -escape sequences or the escape character itself, causing some really -strange-looking displays. This kind of glitch is called an \fIoverrun\fR. -.PP -In terminfo entries, you can attach a \fBpad time\fR to each string capability -that is a number of milliseconds to delay after sending it. This will give -the terminal time to catch up and avoid overruns. -.PP -If you are running a software terminal emulator, or you are on an X pseudo-tty, -or your terminal is on an RS-232C line which correctly handles RTS/CTS -hardware flow control, then pads are not strictly necessary. However, some -display packages (such as ncurses(3X)) use the pad counts to calculate -the fastest way to implement certain functions. -For example: scrolling the screen may be faster than deleting the top line. -.PP -One common way to avoid overruns is with XON/XOFF handshaking. -But even this handshake may have problems at high baud rates. -This is a result of the way XON/XOFF works. The terminal tells -the host to stop with an XOFF. When the host gets this character, it stops -sending. However, there is a small amount of time between the stop request and -the actual stop. During this window, the terminal must continue to accept -characters even though it has told the host to stop. If the terminal sends -the stop request too late, then its internal buffer will overflow. If it sends -the stop character too early, then the terminal is not getting the most -efficient use out of its internal buffers. In a real application at high baud -rates, a terminal could get a dozen or more characters before the host gets -around to suspending transmission. Connecting the terminal over a network -will make the problem much worse. -.PP -(RTS/CTS handshaking does not have this problem because the UARTs are -signal-connected and the "stop flow" is done at the lowest level, without -software intervention). -.PP -.SS Timing your terminal -.PP -In order to get accurate timings from your terminal \fBtack\fR -needs to know when the terminal has finished processing all the -characters that were sent. This requires a different type of handshaking -than the XON/XOFF that is supported by most terminals. \fBTack\fR -needs to send a request to the terminal and wait for its reply. -Many terminals will respond with an ACK when they receive an ENQ. -This is the preferred method since the sequence is short. -ANSI/VT-100 style terminals can mimic this handshake with the -escape sequence that requests 'primary device attributes'. - - ESC [ c - -The terminal will respond with a sequence like: - - ESC [ ? 1 ; 0 c - -\fBTack\fR assumes that (u9) is the enquire sequence and that (u8) is the -acknowledge string. A VT-100 style terminal could set u9=\\E[c -and u8=\\E[?1;0c. -Acknowledge strings fall into two categories. -1) Strings with a unique terminating character and, -2) strings of fixed length. -The acknowledge string for the VT-100 is of the first type since -it always ends with the letter 'c'. Some Tektronics terminals -have fixed length acknowledge strings. \fBTack\fR supports both -types of strings by scanning for the terminating character until -the length of the expected acknowledge string has arrived. -(u8) should be set to some typical acknowledge that will be -returned when (u9) is sent. -.PP -\fBTack\fR will test this sequence before running any of the pad -tests or the function key tests. \fBTack\fR will ask you the following: - - Hit lower case g to start testing... - -After it sends this message it will send the enquire string. -It will then read characters from the terminal until it sees the -letter g. -.PP -.SS Testing and Repairing Pad Timings -.PP -The pad timings in distributed terminfo entries are often incorrect. One -major motivation for this program is to make it relatively easy to tune these -timings. -.PP -You can verify and edit the pad timings for a terminal with -the `test string capabilities' -function (this is also part of the `normal test sequence' function). -.PP -The key to determining pad times is to find out the effective baud rate of -the terminal. The effective baud rate determines the number of characters -per second that the terminal can accept without either handshaking or -losing data. This rate is frequently less than the nominal cps rate on the -RS-232 line. -.PP -\fBTack\fR uses the effective baud rate to judge the duration of the test and -how much a particular escape sequence will perturb the terminal. -.PP -Each pad test has two associated variables that can be tweaked to help verify -the correctness of the pad timings. One is the pad test length. The other is -the pad multiplier, which is used if the pad prefix includes `*'. In curses -use, it is often the first parameter of the capability (if there is one). -For a capability like (dch) or (il) this will be the number of character -positions or lines affected, respectively. -.PP -\fBTack\fR will run the pad tests and display the results to the terminal. -On capabilities that have multipliers \fBtack\fR will not tell you -if the pad needs the multiplier or not. You must make this decision -yourself by rerunning the test with a different multiplier. -If the padding changes in proportion to the multiplier than the -multiplier is required. If the multiplier has little or no effect on -the suggested padding then the multiplier is not needed. -Some capabilities will take several runs to get a good feel for -the correct values. You may wish to make the test longer -to get more accurate results. System load will also effect the -results (a heavily loaded system will not stress the -terminal as much, possibly leading to pad timings that are too short). -.PP -.SH NOTE -The tests done at the beginning of the program are assumed to be correct later -in the code. In particular, \fBtack\fR displays the number of lines and -columns indicated in the terminfo entry as part of its initial output. -If these values are wrong a large number of tests will fail or give incorrect -results. -.SH FILES -.TP 12 -tack.log -If logging is enabled then all characters written to the terminal -will also be written to the log file. This gives you the ability -to see how the tests were performed. This feature is disabled by default. -.TP 12 -.I "term" -If you make changes to the terminfo entry \fBtack\fR will save -the new terminfo to a file. The file will have the same name -as the terminal name. -.SH SEE ALSO -\fBterminfo\fR(\*n), \fBncurses\fR(3X), \fBtic\fR(1M), \fBinfocmp\fR(1M). -You should also have the documentation supplied by the terminal -manufacturer. -.SH BUGS -If the screen size is incorrect, many of the tests will fail. -.SH AUTHOR -Concept, design, and original implementation by -Daniel Weaver . Portions of the code and -documentation are by Eric S. Raymond . -.\"# -.\"# The following sets edit modes for GNU EMACS -.\"# Local Variables: -.\"# mode:nroff -.\"# fill-column:79 -.\"# End: diff --git a/tack/tack.c b/tack/tack.c deleted file mode 100644 index 946a2fbf..00000000 --- a/tack/tack.c +++ /dev/null @@ -1,603 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -#include - -MODULE_ID("$Id: tack.c,v 1.4 2005/09/17 19:49:16 tom Exp $") - -/* - This program is designed to test terminfo, not curses. Therefore - I have used as little of curses as possible. - - Pads associated with the following capabilities are used to set - delay times in the handler: (cr), (ind), (cub1), (ff), (tab). - - I use the (nxon) capability to set the tty handler with/without - xon/xoff. If (smxon)/(rmxon) is defined I will change the terminal - too. - - (xon) inhibits the sending of delay characters in putp(). - If the terminal is defined with no padding then the (xon) boolean - is a don't care. In this case I recommend that it be reset. - */ - -/***************************************************************************** - * - * Option processing - * - *****************************************************************************/ - -/* options and modes */ -int debug_level; /* debugging level */ -int translate_mode; /* translate tab, bs, cr, lf, ff */ -int scan_mode; /* use scan codes */ -int char_mask; /* either 0xFF else 0x7F, eight bit data mask */ -int select_delay_type; /* set handler delays for */ -int select_xon_xoff; /* TTY driver XON/XOFF mode select */ -int hex_out; /* Display output in hex */ -int send_reset_init; /* Send the reset and initialization strings */ -FILE *log_fp; /* Terminal logfile */ - -/***************************************************************************** - * - * Menu definitions - * - *****************************************************************************/ - -static void tools_hex_echo(struct test_list *, int *, int *); -static void tools_debug(struct test_list *, int *, int *); - -static char hex_echo_menu_entry[80]; - -static struct test_list tools_test_list[] = { - {0, 0, 0, 0, "s) ANSI status reports", tools_status, 0}, - {0, 0, 0, 0, "g) ANSI SGR modes (bold, underline, reverse)", tools_sgr, 0}, - {0, 0, 0, 0, "c) ANSI character sets", tools_charset, 0}, - {0, 0, 0, 0, hex_echo_menu_entry, tools_hex_echo, 0}, - {0, 0, 0, 0, "e) echo tool", tools_report, 0}, - {1, 0, 0, 0, "r) reply tool", tools_report, 0}, - {0, 0, 0, 0, "p) performance testing", 0, &sync_menu}, - {0, 0, 0, 0, "i) send reset and init", menu_reset_init, 0}, - {0, 0, "u8) (u9", 0, "u) test ENQ/ACK handshake", sync_handshake, 0}, - {0, 0, 0, 0, "d) change debug level", tools_debug, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -static struct test_menu tools_menu = { - 0, 'q', 0, "Tools Menu", "tools", - 0, 0, tools_test_list, 0, 0, 0 -}; - -static void tty_width(struct test_list *, int *, int *); -static void tty_delay(struct test_list *, int *, int *); -static void tty_xon(struct test_list *, int *, int *); -static void tty_trans(struct test_list *, int *, int *); -static void tty_show_state(struct test_menu *); - -static char tty_width_menu[80]; -static char tty_delay_menu[80]; -static char tty_xon_menu[80]; -static char tty_trans_menu[80]; -static char enable_xon_xoff[] = {"x) enable xon/xoff"}; -static char disable_xon_xoff[] = {"x) disable xon/xoff"}; - -static struct test_list tty_test_list[] = { - {0, 0, 0, 0, tty_width_menu, tty_width, 0}, - {0, 0, 0, 0, tty_delay_menu, tty_delay, 0}, - {0, 0, 0, 0, tty_xon_menu, tty_xon, 0}, - {0, 0, 0, 0, tty_trans_menu, tty_trans, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -static struct test_menu tty_menu = { - 0, 'q', 0, "Terminal and driver configuration", - "tty", 0, - tty_show_state, tty_test_list, 0, 0, 0 -}; - -struct test_menu edit_menu = { - 0, 'q', 0, "Edit terminfo menu", - "edit", 0, - 0, edit_test_list, 0, 0, 0 -}; - -static struct test_menu mode_menu = { - 0, 'n', 0, "Test modes and glitches:", - "mode", "n) run standard tests", - 0, mode_test_list, 0, 0, 0 -}; - -static struct test_menu acs_menu = { - 0, 'n', 0, - "Test alternate character set and graphics rendition:", - "acs", "n) run standard tests", - 0, acs_test_list, 0, 0, 0 -}; - -static struct test_menu color_menu = { - 0, 'n', 0, - "Test color:", - "color", "n) run standard tests", - 0, color_test_list, 0, 0, 0 -}; - -static struct test_menu crum_menu = { - 0, 'n', 0, - "Test cursor movement:", - "move", "n) run standard tests", - 0, crum_test_list, 0, 0, 0 -}; - -static struct test_menu funkey_menu = { - 0, 'n', 0, - "Test function keys:", - "fkey", "n) run standard tests", - sync_test, funkey_test_list, 0, 0, 0 -}; - -static struct test_menu printer_menu = { - 0, 'n', 0, - "Test printer:", - "printer", "n) run standard tests", - 0, printer_test_list, 0, 0, 0 -}; - -static void pad_gen(struct test_list *, int *, int *); - -static struct test_menu pad_menu = { - 0, 'n', 0, - "Test padding and string capabilities:", - "pad", "n) run standard tests", - sync_test, pad_test_list, 0, 0, 0 -}; - -static struct test_list normal_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {0, 0, 0, 0, "i) send reset and init", menu_reset_init, 0}, - {MENU_NEXT, 0, 0, 0, "x) test modes and glitches", 0, &mode_menu}, - {MENU_NEXT, 0, 0, 0, "a) test alternate character set and graphic rendition", 0, &acs_menu}, - {MENU_NEXT, 0, 0, 0, "c) test color", 0, &color_menu}, - {MENU_NEXT, 0, 0, 0, "m) test cursor movement", 0, &crum_menu}, - {MENU_NEXT, 0, 0, 0, "f) test function keys", 0, &funkey_menu}, - {MENU_NEXT, 0, 0, 0, "p) test padding and string capabilities", 0, &pad_menu}, - {0, 0, 0, 0, "P) test printer", 0, &printer_menu}, - {MENU_MENU, 0, 0, 0, "/) test a specific capability", 0, 0}, - {0, 0, 0, 0, "t) auto generate pad delays", pad_gen, &pad_menu}, - {0, 0, "u8) (u9", 0, 0, sync_handshake, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - - -static struct test_menu normal_menu = { - 0, 'n', 0, "Main test menu", - "test", "n) run standard tests", - 0, normal_test_list, 0, 0, 0 -}; - -static void start_tools(struct test_list *, int *, int *); -static void start_modes(struct test_list *, int *, int *); -static void start_basic(struct test_list *, int *, int *); -static void start_log(struct test_list *, int *, int *); - -static char logging_menu_entry[80] = "l) start logging"; - -static struct test_list start_test_list[] = { - {0, 0, 0, 0, "b) display basic information", start_basic, 0}, - {0, 0, 0, 0, "m) change modes", start_modes, 0}, - {0, 0, 0, 0, "t) tools", start_tools, 0}, - {MENU_COMPLETE, 0, 0, 0, "n) begin testing", 0, &normal_menu}, - {0, 0, 0, 0, logging_menu_entry, start_log, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - - -static struct test_menu start_menu = { - 0, 'n', 0, "Main Menu", "tack", 0, - 0, start_test_list, 0, 0, 0 -}; - -static struct test_list write_terminfo_list[] = { - {0, 0, 0, 0, "w) write the current terminfo to a file", save_info, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} -}; - -/***************************************************************************** - * - * Menu command interpretation. - * - *****************************************************************************/ - -/* -** tools_hex_echo(testlist, state, ch) -** -** Flip the hex echo flag. -*/ -static void -tools_hex_echo( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (hex_out) { - hex_out = FALSE; - strcpy(hex_echo_menu_entry, - "h) enable hex output on echo tool"); - } else { - hex_out = TRUE; - strcpy(hex_echo_menu_entry, - "h) disable hex output on echo tool"); - } -} - -/* -** tools_debug(testlist, state, ch) -** -** Change the debug level. -*/ -static void -tools_debug( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - char buf[32]; - - ptext("Enter a new value: "); - read_string(buf, sizeof(buf)); - if (buf[0]) { - sscanf(buf, "%d", &debug_level); - } - sprintf(temp, "Debug level is now %d", debug_level); - ptext(temp); - *ch = REQUEST_PROMPT; -} - -/* -** start_tools(testlist, state, ch) -** -** Run the generic test tools -*/ -static void -start_tools( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (hex_out) { - strcpy(hex_echo_menu_entry, - "h) disable hex output on echo tool"); - } else { - strcpy(hex_echo_menu_entry, - "h) enable hex output on echo tool"); - } - menu_display(&tools_menu, 0); -} - -/* -** tty_show_state() -** -** Display the current state on the tty driver settings -*/ -static void -tty_show_state( - struct test_menu *menu GCC_UNUSED) -{ - put_crlf(); - (void) sprintf(temp, - "Accepting %d bits, UNIX delays %d, XON/XOFF %sabled, speed %u, translate %s, scan-code mode %s.", - (char_mask == ALLOW_PARITY) ? 8 : 7, - select_delay_type, - select_xon_xoff ? "en" : "dis", - tty_baud_rate, - translate_mode ? "on" : "off", - scan_mode ? "on" : "off"); - ptextln(temp); - put_crlf(); -} - -/* -** tty_width(testlist, state, ch) -** -** Change the character width -*/ -static void -tty_width( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (char_mask == STRIP_PARITY) { - char_mask = ALLOW_PARITY; - strcpy(tty_width_menu, "7) treat terminal as 7-bit"); - } else { - char_mask = STRIP_PARITY; - strcpy(tty_width_menu, "8) treat terminal as 8-bit"); - } -} - -/* -** tty_delay(testlist, state, ch) -** -** Change the delay for in the TTY driver -*/ -static void -tty_delay( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (select_delay_type) { - select_delay_type = FALSE; - strcpy(tty_delay_menu, - "d) enable UNIX tty driver delays for "); - } else { - select_delay_type = TRUE; - strcpy(tty_delay_menu, - "d) disable UNIX tty driver delays for "); - } -} - -/* -** tty_xon(testlist, state, ch) -** -** Change the XON/XOFF flags in the TTY driver -*/ -static void -tty_xon( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (select_xon_xoff) { - if (needs_xon_xoff) { - ptextln("This terminal is marked as needing XON/XOFF protocol with (nxon)"); - } - if (exit_xon_mode) { - tc_putp(exit_xon_mode); - } - xon_xoff = select_xon_xoff = FALSE; - strcpy(tty_xon_menu, enable_xon_xoff); - } else { - if (enter_xon_mode) { - tc_putp(enter_xon_mode); - } - xon_xoff = select_xon_xoff = TRUE; - strcpy(tty_xon_menu, disable_xon_xoff); - } - tty_set(); -} - -/* -** tty_trans(testlist, state, ch) -** -** Change the translation mode for special characters -*/ -static void -tty_trans( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (translate_mode) { - translate_mode = FALSE; - strcpy(tty_trans_menu, - "t) use terminfo values for \\b\\f\\n\\r\\t"); - } else { - translate_mode = TRUE; - strcpy(tty_trans_menu, - "t) override terminfo values for \\b\\f\\n\\r\\t"); - } -} - -/* -** pad_gen(testlist, state, ch) -** -** Menu function for automatic pad generation -*/ -static void -pad_gen( - struct test_list *t, - int *state GCC_UNUSED, - int *ch) -{ - control_init(); - if (tty_can_sync == SYNC_NOT_TESTED) { - verify_time(); - } - auto_pad_mode = TRUE; - menu_display(t->sub_menu, ch); - auto_pad_mode = FALSE; -} - -/* -** start_modes(testlist, state, ch) -** -** Change the TTY modes -*/ -static void -start_modes( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - - if (select_delay_type) { - strcpy(tty_delay_menu, - "d) disable UNIX tty driver delays for "); - } else { - strcpy(tty_delay_menu, - "d) enable UNIX tty driver delays for "); - } - if (char_mask == ALLOW_PARITY) { - strcpy(tty_width_menu, - "7) treat terminal as 7-bit"); - } else { - strcpy(tty_width_menu, - "8) treat terminal as 8-bit"); - } - if (select_xon_xoff) { - strcpy(tty_xon_menu, disable_xon_xoff); - } else { - strcpy(tty_xon_menu, enable_xon_xoff); - } - if (translate_mode) { - strcpy(tty_trans_menu, - "t) override terminfo values for \\b\\f\\n\\r\\t"); - } else { - strcpy(tty_trans_menu, - "t) use terminfo values for \\b\\f\\n\\r\\t"); - } - menu_display(&tty_menu, 0); - tty_set(); -} - -/* -** start_basic(testlist, state, ch) -** -** Display basic terminal information -*/ -static void -start_basic( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch) -{ - display_basic(); - *ch = REQUEST_PROMPT; -} - -/* -** start_log(testlist, state, ch) -** -** Start/stop in logging function -*/ -static void -start_log( - struct test_list *t GCC_UNUSED, - int *state GCC_UNUSED, - int *ch GCC_UNUSED) -{ - if (logging_menu_entry[5] == 'a') { - ptextln("The log file will capture all characters sent to the terminal."); - if ((log_fp = fopen("tack.log", "w"))) { - ptextln("Start logging to file: tack.log"); - strcpy(logging_menu_entry, "l) stop logging"); - } else { - ptextln("File open error: tack.log"); - } - } else { - if (log_fp) { - fclose(log_fp); - log_fp = 0; - } - ptextln("Terminal output logging stopped."); - strcpy(logging_menu_entry, "l) start logging"); - } -} - -/* -** show_usage() -** -** Tell the user how its done. -*/ -void -show_usage( - char *name) -{ - (void) fprintf(stderr, "usage: %s [-itV] [term]\n", name); -} - -/* -** print_version() -** -** Print version and other useful information. -*/ -void -print_version(void) -{ - printf("tack version %d.%02d\n", MAJOR_VERSION, MINOR_VERSION); - printf("Copyright (C) 1997 Free Software Foundation, Inc.\n"); - printf("Tack comes with NO WARRANTY, to the extent permitted by law.\n"); - printf("You may redistribute copies of Tack under the terms of the\n"); - printf("GNU General Public License. For more information about\n"); - printf("these matters, see the file named COPYING.\n"); -} - - -/***************************************************************************** - * - * Main sequence - * - *****************************************************************************/ - -int -main(int argc, char *argv[]) -{ - int i, j; - char *term_variable; - - /* scan the option flags */ - send_reset_init = TRUE; - translate_mode = FALSE; - term_variable = getenv("TERM"); - tty_can_sync = SYNC_NOT_TESTED; - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - for (j = 1; argv[i][j]; j++) { - switch (argv[i][j]) { - case 'V': - print_version(); - return (1); - case 'i': - send_reset_init = FALSE; - break; - case 't': - translate_mode = FALSE; - break; - default: - show_usage(argv[0]); - return (0); - } - } - } else { - term_variable = argv[i]; - } - } - (void) strcpy(tty_basename, term_variable); - - curses_setup(argv[0]); - - menu_can_scan(&normal_menu); /* extract which caps can be tested */ - menu_display(&start_menu, 0); - - if (user_modified()) { - sprintf(temp, "Hit y to save changes to file: %s ? ", - tty_basename); - ptext(temp); - if (wait_here() == 'y') { - save_info(write_terminfo_list, &i, &j); - } - } - - put_str("\nTerminal test complete\n"); - bye_kids(0); - return (0); -} diff --git a/tack/tack.h b/tack/tack.h deleted file mode 100644 index 933f542b..00000000 --- a/tack/tack.h +++ /dev/null @@ -1,428 +0,0 @@ -/* -** Copyright (C) 1991, 1997 Free Software Foundation, Inc. -** -** This file is part of TACK. -** -** TACK is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. -** -** TACK is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with TACK; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -** Boston, MA 02110-1301, USA -*/ - -/* $Id: tack.h,v 1.16 2006/11/25 23:45:00 tom Exp $ */ - -#ifndef NCURSES_TACK_H_incl -#define NCURSES_TACK_H_incl 1 - -/* terminfo action checker include file */ - -#define MAJOR_VERSION 1 -#define MINOR_VERSION 1 - -#ifdef HAVE_CONFIG_H -#include -#else -#define RETSIGTYPE void -#define GCC_UNUSED /*nothing*/ -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_SELECT 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TIME_SELECT 1 -#endif - -#include -#include -#include -#include -#include - -#include -#include -#include - -#if USE_RCS_IDS -#define MODULE_ID(id) static const char Ident[] = id; -#else -#define MODULE_ID(id) /*nothing*/ -#endif - -#if !HAVE_STRSTR -extern char *_nc_strstr(const char *, const char *); -#define strstr(h,n) _nc_strstr(h,n) -#endif - -#define CUR_TP (&(cur_term->type)) -#define MAX_STRINGS NUM_STRINGS(CUR_TP) -#define STR_NAME(n) ExtStrname(CUR_TP,n,strnames) - -#define UChar(c) ((unsigned char)(c)) - -extern FILE *log_fp; -extern FILE *debug_fp; -extern int debug_level; -extern char temp[]; -extern char tty_basename[]; -extern char tty_shortname[]; - -#define SYNC_FAILED 0 -#define SYNC_TESTED 1 -#define SYNC_NOT_TESTED 2 -#define SYNC_NEEDED 3 - -extern int tty_can_sync; -extern int total_pads_sent; /* count pad characters sent */ -extern int total_caps_sent; /* count caps sent */ -extern int total_printing_characters; /* count printing characters sent */ -extern int no_alarm_event; /* TRUE if the alarm has not gone off yet */ -extern unsigned long usec_run_time; /* length of last test in microseconds */ -extern int raw_characters_sent; /* Total output characters */ - -/* Stopwatch event timers */ -#define TIME_TEST 0 -#define TIME_SYNC 1 -#define TIME_FLUSH 2 -#define MAX_TIMERS 3 - -/* definitions for pad.c */ - -#define EXIT_CONDITION (no_alarm_event && (tt_delay_used < tt_delay_max)) -#define SLOW_TERMINAL_EXIT if (!test_complete && !EXIT_CONDITION) { break; } -#define CAP_NOT_FOUND if (auto_pad_mode) return - -extern char letters[26+1]; -#define NEXT_LETTER letter = letters[letter_number =\ - letters[letter_number + 1] ? letter_number + 1 : 0] - -extern int test_complete; /* counts number of tests completed */ -extern char letter; -extern int letter_number; -extern int augment, repeats; -extern long char_sent; -extern const char *pad_repeat_test; /* commands that force repeat */ - -extern int replace_mode; -extern int char_count, line_count, expand_chars; -extern int can_go_home, can_clear_screen; - -extern int translate_mode, scan_mode; -extern int auto_pad_mode; /* TRUE for auto time tests */ -extern int char_mask; -extern int hex_out; /* Display output in hex */ - -/* Parity bit macros */ -#define STRIP_PARITY 0x7f -#define ALLOW_PARITY 0xff - -/* select_delay_type: 0 -> reset all delays - 1 -> force long delays - 2 -> do not change the delays */ -extern int select_delay_type; - -/* select_xon_xoff: 0 -> reset xon/xoff - 1 -> set xon/xoff - 2 -> do not change xon/xoff */ -extern int select_xon_xoff; - -extern int tty_frame_size; -extern unsigned tty_baud_rate; -extern unsigned long tty_cps; /* The number of characters per second */ -extern int not_a_tty, nodelay_read; -extern int send_reset_init; - -/* definitions for stty_query() and initial_stty_query() */ -#define TTY_CHAR_MODE 0 -#define TTY_NOECHO 1 -#define TTY_OUT_TRANS 2 -#define TTY_8_BIT 3 -#define TTY_XON_XOFF 4 - -/* scan code definitions */ -#define MAX_SCAN 256 - -/* translate mode default strings */ -struct default_string_list { - const char *name; /* terminfo name */ - const char *value; /* value of default string */ - int index; /* index into the strfname[] array */ -}; - -#define TM_last 8 -extern struct default_string_list TM_string[TM_last]; - -/* attribute structure definition */ -struct mode_list { - const char *name; - const char *begin_mode; - const char *end_mode; - int number; -}; - -extern const struct mode_list alt_modes[]; -extern const int mode_map[]; - -/* Test data base */ - -#define FLAG_CAN_TEST 1 -#define FLAG_TESTED 2 -#define FLAG_LABEL 4 -#define FLAG_FUNCTION_KEY 8 - -/* caps under test data base */ - -#define TT_MAX 8 -#define MAX_CHANGES (TT_MAX+2) - -extern int tt_delay_max; /* max number of milliseconds we can delay */ -extern int tt_delay_used; /* number of milliseconds consumed in delay */ -extern const char *tt_cap[TT_MAX]; /* value of string */ -extern int tt_affected[TT_MAX]; /* lines or columns effected (repetition - factor) */ -extern int tt_count[TT_MAX]; /* Number of times sent */ -extern int tt_delay[TT_MAX]; /* Number of milliseconds delay */ -extern int ttp; /* number of entries used */ - -extern const char *tx_cap[TT_MAX]; /* value of string */ -extern int tx_affected[TT_MAX]; /* lines or columns effected (repetition - factor) */ -extern int tx_count[TT_MAX]; /* Number of times sent */ -extern int tx_delay[TT_MAX]; /* Number of milliseconds delay */ -extern int tx_index[TT_MAX]; /* String index */ -extern int txp; /* number of entries used */ -extern int tx_characters; /* printing characters sent by test */ -extern unsigned long tx_cps; /* characters per second */ - -/* - Menu control for tack. -*/ - -struct test_results { - struct test_results *next; /* point to next entry */ - struct test_list *test; /* Test which got these results */ - int reps; /* repeat count */ - int delay; /* delay times 10 */ -}; - -struct test_list { - int flags; /* Test description flags */ - int lines_needed; /* Lines needed for test (0->no action) */ - const char *caps_done; /* Caps shown in Done message */ - const char *caps_tested; /* Other caps also being tested */ - const char *menu_entry; /* Menu entry text (optional) */ - /* Function that does testing */ - void (*test_procedure)(struct test_list *, int *, int *); - struct test_menu *sub_menu; /* Nested sub-menu */ -}; - -struct test_menu { - int flags; /* Menu feature flag */ - int default_action; /* Default command if entered */ - const char *menu_text; /* Describe this test_menu */ - const char *menu_title; /* Title for the menu */ - const char *ident; /* short menu name */ - const char *standard_tests; /* Standard test text */ - /* print current settings (optional) */ - void (*menu_function)(struct test_menu *); - struct test_list *tests; /* Pointer to the menu/function pairs */ - struct test_list *resume_tests; /* Standard test resume point */ - int resume_state; /* resume state of test group */ - int resume_char; /* resume ch of test group */ -}; - - -/* menu flags */ -#define MENU_100c 0x00001a00 /* Augment 100% of columns */ -#define MENU_90c 0x00001900 /* Augment 90% of columns */ -#define MENU_80c 0x00001800 /* Augment 80% of columns */ -#define MENU_70c 0x00001700 /* Augment 70% of columns */ -#define MENU_60c 0x00001600 /* Augment 60% of columns */ -#define MENU_50c 0x00001500 /* Augment 50% of columns */ -#define MENU_40c 0x00001400 /* Augment 40% of columns */ -#define MENU_30c 0x00001300 /* Augment 30% of columns */ -#define MENU_20c 0x00001200 /* Augment 20% of columns */ -#define MENU_10c 0x00001100 /* Augment 10% of columns */ -#define MENU_LM1 0x00002e00 /* Augment lines - 1 */ -#define MENU_100l 0x00002a00 /* Augment 100% of lines */ -#define MENU_90l 0x00002900 /* Augment 90% of lines */ -#define MENU_50l 0x00002500 /* Augment 50% of lines */ -#define MENU_lines 0x00002000 /* Augment of lines */ -#define MENU_columns 0x00001000 /* Augment of columns */ -#define MENU_LC_MASK 0x00003000 /* Augment mask for lines and columns */ -#define MENU_1L 0x00002f00 /* Augment == one */ -#define MENU_1C 0x00001f00 /* Augment == one */ -#define MENU_ONE 0x00000f00 /* Augment == one */ -#define MENU_ONE_MASK 0x00000f00 /* Augment == one mask */ -#define MENU_REP_MASK 0x00003f00 /* Augment mask */ - -#define MENU_CLEAR 0x00010000 /* clear screen */ -#define MENU_INIT 0x00020000 /* Initialization function */ -#define MENU_NEXT 0x00040000 /* Next test in sequence */ -#define MENU_LAST 0x00080000 /* End of menu list */ -#define MENU_STOP 0x00100000 /* Stop testing next-in-sequence */ -#define MENU_COMPLETE 0x00200000 /* Test complete after this */ -#define MENU_MENU 0x00400000 /* Pass the menu name not test name */ - -#define REQUEST_PROMPT 256 - -/* tack.c */ -extern struct test_menu edit_menu; -extern void show_usage(char *); -extern void print_version(void); - -/* output.c */ -extern char *expand(const char *); -extern char *expand_command(const char *); -extern char *expand_to(char *, int); -extern char *hex_expand_to(char *, int); -extern char *print_expand(char *); -extern int getchp(int); -extern int getnext(int); -extern int tc_putch(int); -extern int tc_putp(const char *); -extern int wait_here(void); -extern void go_home(void); -extern void home_down(void); -extern void maybe_wait(int); -extern void ptext(const char *); -extern void ptextln(const char *); -extern void put_clear(void); -extern void put_columns(const char *, int, int); -extern void put_cr(void); -extern void put_crlf(void); -extern void put_dec(char *, int); -extern void put_ind(void); -extern void put_lf(void); -extern void put_newlines(int); -extern void put_str(const char *); -extern void put_this(int); -extern void putchp(int); -extern void putln(const char *); -extern void read_string(char *, int); -extern void three_digit(char *, int); -extern void tt_putp(const char *); -extern void tt_putparm(NCURSES_CONST char *, int, int, int); -extern void tt_tputs(const char *, int); - -#define put_that(n) put_this((int) (n)) - -/* control.c */ -extern struct test_list color_test_list[]; -extern char *liberated(char *); -extern char txt_longer_augment[80]; -extern char txt_longer_test_time[80]; -extern char txt_shorter_augment[80]; -extern char txt_shorter_test_time[80]; -extern int msec_cost(const char *const, int); -extern int skip_pad_test(struct test_list *, int *, int *, const char *); -extern int sliding_scale(int, int, unsigned long); -extern int still_testing(void); -extern long event_time(int); -extern void control_init(void); -extern void dump_test_stats(struct test_list *, int *, int *); -extern void event_start(int); -extern void longer_augment(struct test_list *, int *, int *); -extern void longer_test_time(struct test_list *, int *, int *); -extern void pad_test_shutdown(struct test_list *, int); -extern void pad_test_startup(int); -extern void page_loop(void); -extern void set_augment_txt(void); -extern void shorter_augment(struct test_list *, int *, int *); -extern void shorter_test_time(struct test_list *, int *, int *); - -/* charset.c */ -extern struct test_list acs_test_list[]; -extern void set_attr(int); -extern void eat_cookie(void); -extern void put_mode(char *); - -/* crum.c */ -extern struct test_list crum_test_list[]; - -/* ansi.c */ -extern void tools_status(struct test_list *, int *, int *); -extern void tools_charset(struct test_list *, int *, int *); -extern void tools_sgr(struct test_list *, int *, int *); - -/* edit.c */ -extern struct test_menu change_pad_menu; -extern struct test_list edit_test_list[]; -extern char *get_string_cap_byname(const char *, const char **); -extern int cap_match(const char *names, const char *cap); -extern int get_string_cap_byvalue(const char *); -extern int user_modified(void); -extern void can_test(const char *, int); -extern void cap_index(const char *, int *); -extern void edit_init(void); -extern void save_info(struct test_list *, int *, int *); -extern void show_report(struct test_list *, int *, int *); - -/* fun.c */ -extern struct test_list funkey_test_list[]; -extern struct test_list printer_test_list[]; -extern void enter_key(const char *, char *, char *); -extern int tty_meta_prep(void); -extern void tools_report(struct test_list *, int *, int *); - -/* init.c */ -extern void reset_init(void); -extern void display_basic(void); -extern void put_name(const char *, const char *); -extern void charset_can_test(void); -extern void curses_setup(char *); -extern void bye_kids(int); - -/* scan.c */ -extern char **scan_up, **scan_down, **scan_name; -extern int scan_key(void); -extern unsigned scan_max; /* length of longest scan code */ -extern unsigned *scan_tested, *scan_length; -extern void scan_init(char *fn); - -/* sysdep.c */ -extern int initial_stty_query(int); -extern int stty_query(int); -extern void ignoresig(void); -extern void read_key(char *, int); -extern void set_alarm_clock(int); -extern void spin_flush(void); -extern void tty_init(void); -extern void tty_raw(int, int); -extern void tty_reset(void); -extern void tty_set(void); - -/* menu.c */ -extern char prompt_string[80]; /* menu prompt storage */ -extern int subtest_menu(struct test_list *, int *, int *); -extern struct test_list *augment_test; -extern void generic_done_message(struct test_list *, int *, int *); -extern void menu_can_scan(const struct test_menu *); -extern void menu_clear_screen(struct test_list *, int *, int *); -extern void menu_display(struct test_menu *, int *); -extern void menu_prompt(void); -extern void menu_reset_init(struct test_list *, int *, int *); -extern void pad_done_message(struct test_list *, int *, int *); - -/* modes.c */ -extern struct test_list mode_test_list[]; - -/* pad.c */ -extern struct test_list pad_test_list[]; - -/* sync.c */ -extern struct test_menu sync_menu; -extern int tty_sync_error(void); -extern void flush_input(void); -extern void sync_handshake(struct test_list *, int *, int *); -extern void sync_test(struct test_menu *); -extern void verify_time(void); - -#endif /* NCURSES_TACK_H_incl */ diff --git a/test/configure b/test/configure index c66d6c2a..fba2ae16 100755 --- a/test/configure +++ b/test/configure @@ -1235,7 +1235,6 @@ LOCAL_LDFLAGS="" MATH_LIB="-lm" TEST_ARGS="" TEST_DEPS="" -TICS_LEAKS="" TINFO_ARGS='$(LIBS_CURSES)' cf_cv_abi_version="" cf_cv_rel_version="" @@ -1244,12 +1243,12 @@ cf_cv_screen=curses cf_cv_libtype= echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1248: checking for Cygwin environment" >&5 +echo "configure:1247: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1277,19 +1276,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1281: checking for mingw32 environment" >&5 +echo "configure:1280: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1308,7 +1307,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1312: checking for executable suffix" >&5 +echo "configure:1311: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1318,7 +1317,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1339,13 +1338,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1343: checking for object suffix" >&5 +echo "configure:1342: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1365,7 +1364,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1369: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1368: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,7 +1460,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1589,7 +1588,7 @@ fi GCC_VERSION=none if test "$GCC" = yes ; then echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:1593: checking version of $CC" >&5 +echo "configure:1592: checking version of $CC" >&5 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown echo "$ac_t""$GCC_VERSION" 1>&6 @@ -1599,7 +1598,7 @@ fi if ( test "$GCC" = yes || test "$GXX" = yes ) then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:1603: checking if you want to turn on gcc warnings" >&5 +echo "configure:1602: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -1628,11 +1627,11 @@ if test "$GCC" = yes ; then case $host_os in linux*|gnu*) echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 -echo "configure:1632: checking if this is really Intel C compiler" >&5 +echo "configure:1631: checking if this is really Intel C compiler" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -1662,7 +1661,7 @@ fi cat > conftest.$ac_ext <&6 -echo "configure:1685: checking for $CC warning options" >&5 +echo "configure:1684: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" for cf_opt in \ @@ -1697,7 +1696,7 @@ echo "configure:1685: checking for $CC warning options" >&5 wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -1707,7 +1706,7 @@ echo "configure:1685: checking for $CC warning options" >&5 elif test "$GCC" = yes then echo "checking for $CC warning options" 1>&6 -echo "configure:1711: checking for $CC warning options" >&5 +echo "configure:1710: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -1726,7 +1725,7 @@ echo "configure:1711: checking for $CC warning options" >&5 Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -1773,9 +1772,9 @@ EOF if test "$GCC" = yes then echo "checking for $CC __attribute__ directives" 1>&6 -echo "configure:1777: checking for $CC __attribute__ directives" >&5 +echo "configure:1776: checking for $CC __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 cat conftest.h >>confdefs.h fi @@ -1826,7 +1825,7 @@ fi echo $ac_n "checking if $CC -U and -D options work together""... $ac_c" 1>&6 -echo "configure:1830: checking if $CC -U and -D options work together" >&5 +echo "configure:1829: checking if $CC -U and -D options work together" >&5 if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1834,7 +1833,7 @@ else cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cc_u_d_options=yes @@ -1894,13 +1893,13 @@ irix[56].*) #(vi linux*|gnu*) #(vi echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1898: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1897: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1910,7 +1909,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1920,7 +1919,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1930,7 +1929,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1974,13 +1973,13 @@ solaris*) #(vi ;; *) echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:1978: checking if we should define _XOPEN_SOURCE" >&5 +echo "configure:1977: checking if we should define _XOPEN_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1990,7 +1989,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -2000,7 +1999,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat > conftest.$ac_ext < int main() { @@ -2010,7 +2009,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -2065,16 +2064,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:2069: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:2068: checking if we should define _POSIX_C_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "(line 2075) testing if the symbol is already defined go no further ..." 1>&5 +echo "(line 2074) testing if the symbol is already defined go no further ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -2084,7 +2083,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_posix_c_source=no else @@ -2106,7 +2105,7 @@ else esac if test "$cf_want_posix_source" = yes ; then cat > conftest.$ac_ext < int main() { @@ -2116,7 +2115,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2127,15 +2126,15 @@ fi rm -f conftest* fi -echo "(line 2131) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "(line 2130) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "(line 2136) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 2135) testing if the second compile does not leave our definition intact error ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -2145,7 +2144,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2264,7 +2263,7 @@ curses) echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:2268: checking for extra include directories" >&5 +echo "configure:2267: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2289,7 +2288,7 @@ test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:2293: checking if we have identified curses headers" >&5 +echo "configure:2292: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2302,14 +2301,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:2313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -2332,17 +2331,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2336: checking for $ac_hdr" >&5 +echo "configure:2335: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2371,7 +2370,7 @@ done echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:2375: checking for terminfo header" >&5 +echo "configure:2374: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2388,7 +2387,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < #include <${cf_cv_ncurses_header-curses.h}> @@ -2398,7 +2397,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:2402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -2447,7 +2446,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:2451: checking for ncurses version" >&5 +echo "configure:2450: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2473,7 +2472,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:2477: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:2476: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -2482,7 +2481,7 @@ EOF else cat > conftest.$ac_ext < @@ -2506,7 +2505,7 @@ int main() exit(0); } EOF -if { (eval echo configure:2510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -2530,16 +2529,16 @@ EOF echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:2534: checking if we have identified curses libraries" >&5 +echo "configure:2533: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -2555,7 +2554,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:2559: checking for tgoto in -lmytinfo" >&5 +echo "configure:2558: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2563,7 +2562,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2597,7 +2596,7 @@ fi ;; hpux10.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:2601: checking for initscr in -lcur_colr" >&5 +echo "configure:2600: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2605,7 +2604,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2639,7 +2638,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:2643: checking for initscr in -lHcurses" >&5 +echo "configure:2642: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2647,7 +2646,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2711,12 +2710,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:2715: checking for tgoto" >&5 +echo "configure:2714: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -2760,7 +2759,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:2764: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:2763: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2768,7 +2767,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2809,7 +2808,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:2813: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:2812: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2817,7 +2816,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2854,16 +2853,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:2858: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:2857: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -2879,16 +2878,16 @@ rm -f conftest* : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:2883: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:2882: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -2898,14 +2897,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:2909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -2935,7 +2934,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:2939: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:2938: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2946,7 +2945,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -2993,7 +2992,7 @@ if test "$cf_cv_ncurses_h" != no ; then else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:2997: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:2996: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3088,14 +3087,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3122,7 +3121,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -3190,14 +3189,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3250,7 +3249,7 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:3254: checking for terminfo header" >&5 +echo "configure:3253: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3267,7 +3266,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < #include <${cf_cv_ncurses_header-curses.h}> @@ -3277,7 +3276,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:3281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -3332,7 +3331,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:3336: checking for ncurses version" >&5 +echo "configure:3335: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3358,7 +3357,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:3362: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:3361: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -3367,7 +3366,7 @@ EOF else cat > conftest.$ac_ext < @@ -3391,7 +3390,7 @@ int main() exit(0); } EOF -if { (eval echo configure:3395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -3422,7 +3421,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:3426: checking for Gpm_Open in -lgpm" >&5 +echo "configure:3425: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3430,7 +3429,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3457,7 +3456,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:3461: checking for initscr in -lgpm" >&5 +echo "configure:3460: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3465,7 +3464,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3508,7 +3507,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:3512: checking for tgoto in -lmytinfo" >&5 +echo "configure:3511: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3516,7 +3515,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3561,12 +3560,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:3565: checking for initscr" >&5 +echo "configure:3564: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -3609,17 +3608,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:3613: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:3612: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -3688,17 +3687,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:3692: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:3691: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -3729,7 +3728,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:3733: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:3732: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -3738,14 +3737,14 @@ echo "configure:3733: checking if we can link $cf_nculib_root without $cf_ncurse fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3771,14 +3770,14 @@ ncursesw) cf_cv_libtype=w echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6 -echo "configure:3775: checking for multibyte character support" >&5 +echo "configure:3774: checking for multibyte character support" >&5 if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -3786,7 +3785,7 @@ int main() { putwc(0,0); ; return 0; } EOF -if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_utf8_lib=yes else @@ -3795,7 +3794,7 @@ else rm -rf conftest* LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < @@ -3803,7 +3802,7 @@ int main() { putwc(0,0); ; return 0; } EOF -if { (eval echo configure:3807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_utf8_lib=add-on else @@ -3840,7 +3839,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:3844: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:3843: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3851,7 +3850,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -3906,7 +3905,7 @@ if test "$cf_cv_ncurses_h" != no ; then else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:3910: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:3909: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4001,14 +4000,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4035,7 +4034,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -4103,14 +4102,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4163,7 +4162,7 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:4167: checking for terminfo header" >&5 +echo "configure:4166: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4180,7 +4179,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < #include <${cf_cv_ncurses_header-curses.h}> @@ -4190,7 +4189,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:4194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -4245,7 +4244,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:4249: checking for ncurses version" >&5 +echo "configure:4248: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4271,7 +4270,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:4275: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:4274: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -4280,7 +4279,7 @@ EOF else cat > conftest.$ac_ext < @@ -4304,7 +4303,7 @@ int main() exit(0); } EOF -if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -4335,7 +4334,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:4339: checking for Gpm_Open in -lgpm" >&5 +echo "configure:4338: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4343,7 +4342,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4370,7 +4369,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:4374: checking for initscr in -lgpm" >&5 +echo "configure:4373: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4378,7 +4377,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4421,7 +4420,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:4425: checking for tgoto in -lmytinfo" >&5 +echo "configure:4424: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4429,7 +4428,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4474,12 +4473,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:4478: checking for initscr" >&5 +echo "configure:4477: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -4522,17 +4521,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:4526: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:4525: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -4601,17 +4600,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:4605: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:4604: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -4642,7 +4641,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:4646: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:4645: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -4651,14 +4650,14 @@ echo "configure:4646: checking if we can link $cf_nculib_root without $cf_ncurse fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:4662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4701,17 +4700,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4705: checking whether -R must be followed by a space" >&5 +echo "configure:4704: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4727,14 +4726,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4766,7 +4765,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4770: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4769: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4774,7 +4773,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4807,7 +4806,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4811: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4810: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4815,7 +4814,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4855,12 +4854,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4859: checking for gethostbyname" >&5 +echo "configure:4858: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4904,7 +4903,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4908: checking for gethostbyname in -lnsl" >&5 +echo "configure:4907: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4912,7 +4911,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4953,12 +4952,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4957: checking for connect" >&5 +echo "configure:4956: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5002,7 +5001,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:5006: checking for connect in -lsocket" >&5 +echo "configure:5005: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5010,7 +5009,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5045,12 +5044,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:5049: checking for remove" >&5 +echo "configure:5048: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -5094,7 +5093,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:5098: checking for remove in -lposix" >&5 +echo "configure:5097: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5102,7 +5101,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5137,12 +5136,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:5141: checking for shmat" >&5 +echo "configure:5140: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5186,7 +5185,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5190: checking for shmat in -lipc" >&5 +echo "configure:5189: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5194,7 +5193,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5238,7 +5237,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:5242: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5241: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5246,7 +5245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5372,14 +5371,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:5383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -5398,12 +5397,12 @@ fi echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:5402: checking for XOpenDisplay" >&5 +echo "configure:5401: checking for XOpenDisplay" >&5 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_XOpenDisplay=yes" else @@ -5445,7 +5444,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:5449: checking for XOpenDisplay in -lX11" >&5 +echo "configure:5448: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5453,7 +5452,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5488,12 +5487,12 @@ fi echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:5492: checking for XtAppInitialize" >&5 +echo "configure:5491: checking for XtAppInitialize" >&5 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_XtAppInitialize=yes" else @@ -5535,7 +5534,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:5539: checking for XtAppInitialize in -lXt" >&5 +echo "configure:5538: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5543,7 +5542,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5592,7 +5591,7 @@ fi cf_x_athena=${cf_x_athena-Xaw} echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 -echo "configure:5596: checking if you want to link with Xaw 3d library" >&5 +echo "configure:5595: checking if you want to link with Xaw 3d library" >&5 withval= # Check whether --with-Xaw3d or --without-Xaw3d was given. @@ -5609,7 +5608,7 @@ else fi echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:5613: checking if you want to link with neXT Athena library" >&5 +echo "configure:5612: checking if you want to link with neXT Athena library" >&5 withval= # Check whether --with-neXtaw or --without-neXtaw was given. @@ -5626,7 +5625,7 @@ else fi echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:5630: checking if you want to link with Athena-Plus library" >&5 +echo "configure:5629: checking if you want to link with Athena-Plus library" >&5 withval= # Check whether --with-XawPlus or --without-XawPlus was given. @@ -5643,7 +5642,7 @@ else fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:5647: checking for XextCreateExtension in -lXext" >&5 +echo "configure:5646: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5651,7 +5650,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5701,13 +5700,13 @@ do if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:5705: checking for $cf_test in $cf_path" >&5 +echo "configure:5704: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:5708: checking for $cf_test" >&5 +echo "configure:5707: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -5716,7 +5715,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -5763,21 +5762,21 @@ do if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:5767: checking for $cf_lib in $cf_path" >&5 +echo "configure:5766: checking for $cf_lib in $cf_path" >&5 else LIBS="$cf_lib $LIBS" echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:5771: checking for $cf_test in $cf_lib" >&5 +echo "configure:5770: checking for $cf_test in $cf_lib" >&5 fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -5818,7 +5817,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5822: checking for $ac_word" >&5 +echo "configure:5821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5947,14 +5946,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -5972,7 +5971,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:5976: checking for XOpenDisplay in -lX11" >&5 +echo "configure:5975: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5980,7 +5979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6012,14 +6011,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:6016: checking for XCurses library" >&5 +echo "configure:6015: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext < @@ -6029,7 +6028,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:6033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -6074,7 +6073,7 @@ pdcurses) #(vi *) # look for curses-related libraries echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6 -echo "configure:6078: checking for new_panel in -lpanel$cf_cv_libtype" >&5 +echo "configure:6077: checking for new_panel in -lpanel$cf_cv_libtype" >&5 ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6082,7 +6081,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpanel$cf_cv_libtype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6121,7 +6120,7 @@ else fi echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6 -echo "configure:6125: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 +echo "configure:6124: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6129,7 +6128,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmenu$cf_cv_libtype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6168,7 +6167,7 @@ else fi echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6 -echo "configure:6172: checking for form_driver in -lform$cf_cv_libtype" >&5 +echo "configure:6171: checking for form_driver in -lform$cf_cv_libtype" >&5 ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6176,7 +6175,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lform$cf_cv_libtype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6226,17 +6225,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6230: checking for $ac_hdr" >&5 +echo "configure:6229: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6266,12 +6265,12 @@ done esac echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:6270: checking return type of signal handlers" >&5 +echo "configure:6269: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6288,7 +6287,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:6292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -6308,12 +6307,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6312: checking for ANSI C header files" >&5 +echo "configure:6311: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6321,7 +6320,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6338,7 +6337,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6356,7 +6355,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6377,7 +6376,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6388,7 +6387,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6412,12 +6411,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:6416: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:6415: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6426,7 +6425,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:6430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -6459,17 +6458,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6463: checking for $ac_hdr" >&5 +echo "configure:6462: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6530,12 +6529,12 @@ wresize \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6534: checking for $ac_func" >&5 +echo "configure:6533: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6584,13 +6583,13 @@ done echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6 -echo "configure:6588: checking for ncurses extended functions" >&5 +echo "configure:6587: checking for ncurses extended functions" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6610,7 +6609,7 @@ int main() { (void) wresize (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_ncurses_ext_funcs=yes else @@ -6630,13 +6629,13 @@ EOF echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6 -echo "configure:6634: checking for wide-character functions" >&5 +echo "configure:6633: checking for wide-character functions" >&5 if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6648,7 +6647,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_widechar_funcs=yes else @@ -6676,13 +6675,13 @@ fi echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 -echo "configure:6680: checking if sys/time.h works with sys/select.h" >&5 +echo "configure:6679: checking if sys/time.h works with sys/select.h" >&5 if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6697,7 +6696,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_time_select=yes else @@ -6718,7 +6717,7 @@ EOF echo $ac_n "checking for function curses_version""... $ac_c" 1>&6 -echo "configure:6722: checking for function curses_version" >&5 +echo "configure:6721: checking for function curses_version" >&5 if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6727,7 +6726,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat > conftest.$ac_ext < @@ -6739,7 +6738,7 @@ int main() } EOF -if { (eval echo configure:6743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_func_curses_version=yes @@ -6764,7 +6763,7 @@ EOF echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6 -echo "configure:6768: checking for alternate character set array" >&5 +echo "configure:6767: checking for alternate character set array" >&5 if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6773,7 +6772,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map _nc_acs_map do cat > conftest.$ac_ext < @@ -6784,7 +6783,7 @@ $name['k'] = ACS_PLUS ; return 0; } EOF -if { (eval echo configure:6788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_curses_acs_map=$name; break else @@ -6805,7 +6804,7 @@ EOF echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6 -echo "configure:6809: checking for wide alternate character set array" >&5 +echo "configure:6808: checking for wide alternate character set array" >&5 if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6814,7 +6813,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs do cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_curses_wacs_map=$name break @@ -6841,9 +6840,9 @@ echo "$ac_t""$cf_cv_curses_wacs_map" 1>&6 echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 -echo "configure:6845: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 +echo "configure:6844: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -6884,9 +6883,9 @@ fi echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 -echo "configure:6888: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 +echo "configure:6887: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -7092,7 +7091,6 @@ s%@LOCAL_LDFLAGS@%$LOCAL_LDFLAGS%g s%@MATH_LIB@%$MATH_LIB%g s%@TEST_ARGS@%$TEST_ARGS%g s%@TEST_DEPS@%$TEST_DEPS%g -s%@TICS_LEAKS@%$TICS_LEAKS%g s%@TINFO_ARGS@%$TINFO_ARGS%g s%@cf_cv_abi_version@%$cf_cv_abi_version%g s%@cf_cv_rel_version@%$cf_cv_rel_version%g diff --git a/test/demo_termcap.c b/test/demo_termcap.c index fc9c8ab9..e5c747b3 100644 --- a/test/demo_termcap.c +++ b/test/demo_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 2005-2006,2007 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 * @@ -29,10 +29,11 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_termcap.c,v 1.5 2006/05/06 19:06:36 tom Exp $ + * $Id: demo_termcap.c,v 1.6 2007/02/03 18:51:23 tom Exp $ * * A simple demo of the termcap interface. */ +#define USE_TINFO #include #if HAVE_TGETENT diff --git a/test/dots.c b/test/dots.c index c99fbf4d..c0cdf901 100644 --- a/test/dots.c +++ b/test/dots.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1999-2006,2007 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 * @@ -29,10 +29,11 @@ /* * Author: Thomas E. Dickey 1999 * - * $Id: dots.c,v 1.15 2006/11/04 19:54:42 tom Exp $ + * $Id: dots.c,v 1.16 2007/02/03 18:51:23 tom Exp $ * * A simple demo of the terminfo interface. */ +#define USE_TINFO #include #if HAVE_SETUPTERM diff --git a/test/railroad.c b/test/railroad.c index fc339132..ad89fa00 100644 --- a/test/railroad.c +++ b/test/railroad.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2000-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 2000-2006,2007 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 * @@ -29,10 +29,11 @@ /* * Author: Thomas E. Dickey - 2000 * - * $Id: railroad.c,v 1.14 2006/05/20 16:02:04 tom Exp $ + * $Id: railroad.c,v 1.15 2007/02/03 18:51:23 tom Exp $ * * A simple demo of the termcap interface. */ +#define USE_TINFO #include #if HAVE_TGETENT diff --git a/test/test.priv.h b/test/test.priv.h index edba4ec3..eaeebc1a 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2007 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 * @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.63 2006/07/15 18:27:24 tom Exp $ */ +/* $Id: test.priv.h,v 1.65 2007/02/03 20:00:54 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -404,6 +404,10 @@ extern int optind; #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H #include +#if HAVE_NC_FREEALL && defined(USE_TINFO) +#undef ExitProgram +#define ExitProgram(code) _nc_free_tinfo(code) +#endif #else #define typeMalloc(type,n) (type *) malloc((n) * sizeof(type)) #define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type)) -- 2.44.0