From: Thomas E. Dickey Date: Sun, 10 Jan 2010 01:50:23 +0000 (+0000) Subject: ncurses 5.7 - patch 20100109 X-Git-Tag: v5.8~53 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=77afe78361875f531dc2bf8d73f2e781c8e76176;ds=sidebyside ncurses 5.7 - patch 20100109 + modify configure macro CF_XOPEN_SOURCE, etc., to use CF_ADD_CFLAGS consistently to add new -D's while removing duplicates. + modify a few configure macros to consistently put new options before older in the list. + add tiparm(), based on review of X/Open Curses Issue 7. + minor documentation cleanup. + update config.guess, config.sub from http://savannah.gnu.org/projects/config (caveat - its maintainer put 2010 copyright date on files dated 2009) --- diff --git a/INSTALL b/INSTALL index cdc3513a..0a5e6213 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2009,2010 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: INSTALL,v 1.140 2009/08/01 19:32:04 tom Exp $ +-- $Id: INSTALL,v 1.143 2010/01/09 19:26:36 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -39,9 +39,8 @@ d.d is the current version number. There should be several subdirectories, including `c++', `form', `man', `menu', 'misc', `ncurses', `panel', `progs', and `test'. See the README file for a roadmap to the package. -If you are a Linux or FreeBSD or NetBSD distribution integrator or packager, -please read and act on the section titled IF YOU ARE A SYSTEM INTEGRATOR -below. +If you are a distribution integrator or packager, please read and act on the +section titled IF YOU ARE A SYSTEM INTEGRATOR below. If you are converting from BSD curses and do not have root access, be sure to read the BSD CONVERSION NOTES section below. @@ -58,10 +57,6 @@ CROSS-COMPILER. If you want to build the Ada95 binding, go to the Ada95 directory and follow the instructions there. The Ada95 binding is not covered below. -If you are using anything but (a) Linux, or (b) one of the 4.4BSD-based -i386 Unixes, go read the Portability section in the TO-DO file before you -do anything else. - REQUIREMENTS: ------------ @@ -86,14 +81,14 @@ INSTALLATION PROCEDURE: The --prefix option to configure changes the root directory for installing ncurses. The default is normally in subdirectories of /usr/local, except - for systems where ncurses is normally installed as a system library, e.g., - Linux, the various BSD systems and Cygwin. Use --prefix=/usr to replace - your default curses distribution. + for systems where ncurses is normally installed as a system library (see + "IF YOU ARE A SYSTEM INTEGRATOR"). Use --prefix=/usr to replace your + default curses distribution. The package gets installed beneath the --prefix directory as follows: In $(prefix)/bin: tic, infocmp, captoinfo, tset, - reset, clear, tput, toe + reset, clear, tput, toe, tabs In $(prefix)/lib: libncurses*.* libcurses.a In $(prefix)/share/terminfo: compiled terminal descriptions In $(prefix)/include: C header files @@ -147,7 +142,7 @@ INSTALLATION PROCEDURE: library interfaces are not binary-compatible with the non-wide-character version. Building and running the wide-character code relies on a fairly recent implementation of libiconv. We have built this configuration on - Linux using libiconv, sometimes requiring libutf8. + various systems using libiconv, sometimes requiring libutf8. If you configure using the --with-pthread option, a "t" is appended to the library names (e.g., libncursest.a, libncursestw.a). @@ -170,8 +165,8 @@ INSTALLATION PROCEDURE: ./configure --with-shared --without-normal --without-debug Rules for generating shared libraries are highly dependent upon the choice - of host system and compiler. We've been testing shared libraries on Linux - and SunOS with gcc, but more work needs to be done to make shared libraries + of host system and compiler. We've been testing shared libraries on + several systems, but more work needs to be done to make shared libraries work on other systems. If you have libtool installed, you can type @@ -816,9 +811,9 @@ SUMMARY OF CONFIGURE OPTIONS: --with-manpage-renames=XXX Tell the configure script that you wish to rename the manpages while - installing. Currently the only distribution which does this is - the Linux Debian. The option value specifies the name of a file - that lists the renamed files, e.g., $srcdir/man/man_db.renames + installing. Currently the only distribution which does this is Debian. + The option value specifies the name of a file that lists the renamed + files, e.g., $srcdir/man/man_db.renames --with-manpage-symlinks Tell the configure script that you wish to make symbolic links in the @@ -1464,8 +1459,8 @@ COMPATIBILITY WITH OLDER VERSIONS OF NCURSES: 4.0 (December 24, 1996) - We bumped to version 4.0 because the newly released dynamic loader - (ld.so.1.8.5) on Linux did not load shared libraries whose ABI and REL + We bumped to version 4.0 because the newly released Linux dynamic + loader (ld.so.1.8.5) did not load shared libraries whose ABI and REL versions were inconsistent. At that point, ncurses ABI was 3.4 and the REL was 1.9.9g, so we made them consistent. @@ -1525,7 +1520,7 @@ IF YOU ARE A SYSTEM INTEGRATOR: On platforms where ncurses is assumed to be installed in /usr/lib, the configure script uses "/usr" as a default: - Linux, FreeBSD, NetBSD, OpenBSD, Cygwin + GNU/Linux, FreeBSD, NetBSD, OpenBSD, Cygwin For other platforms, the default is "/usr/local". See the discussion of the "--disable-overwrite" option. @@ -1588,7 +1583,7 @@ IF YOU ARE A SYSTEM INTEGRATOR: bsdos -- BSD/OS If you are responsible for integrating ncurses for one of these - distribution, please either use the recommended name or get back + distributions, please either use the recommended name or get back to us explaining why you don't want to, so we can work out nomenclature that will make users' lives easier rather than harder. @@ -1716,8 +1711,8 @@ USING NCURSES WITH AFS: with this by making tic use symbolic links. USING NCURSES WITH GPM: - Ncurses 4.1 and up can be configured to use GPM (General Purpose - Mouse) which is used on Linux console. Be aware that GPM is commonly + Ncurses 4.1 and up can be configured to use GPM (General Purpose Mouse) + which is used with Linux console. Be aware that GPM is commonly installed as a shared library which contains a wrapper for the curses wgetch() function (libcurses.o). Some integrators have simplified linking applications by combining all or part of libcurses.so into the diff --git a/MANIFEST b/MANIFEST index 7004facb..04efca83 100644 --- a/MANIFEST +++ b/MANIFEST @@ -351,6 +351,7 @@ ./doc/html/man/curs_inwstr.3x.html ./doc/html/man/curs_kernel.3x.html ./doc/html/man/curs_legacy.3x.html +./doc/html/man/curs_memleaks.3x.html ./doc/html/man/curs_mouse.3x.html ./doc/html/man/curs_move.3x.html ./doc/html/man/curs_opaque.3x.html @@ -430,6 +431,7 @@ ./doc/html/man/ncurses.3x.html ./doc/html/man/panel.3x.html ./doc/html/man/resizeterm.3x.html +./doc/html/man/tabs.1.html ./doc/html/man/term.5.html ./doc/html/man/term.7.html ./doc/html/man/terminfo.5.html @@ -487,6 +489,8 @@ ./form/fty_regex.c ./form/headers ./form/llib-lform +./form/llib-lformt +./form/llib-lformtw ./form/llib-lformw ./form/modules ./include/Caps @@ -659,6 +663,8 @@ ./menu/eti.h ./menu/headers ./menu/llib-lmenu +./menu/llib-lmenut +./menu/llib-lmenutw ./menu/llib-lmenuw ./menu/m_attribs.c ./menu/m_cursor.c @@ -728,6 +734,7 @@ ./mk-hdr.awk ./mkdirs.sh ./ncurses/Makefile.in +./ncurses/Makefile.orig ./ncurses/README ./ncurses/README.IZ ./ncurses/SigAction.h @@ -931,6 +938,8 @@ ./panel/Makefile.in ./panel/headers ./panel/llib-lpanel +./panel/llib-lpanelt +./panel/llib-lpaneltw ./panel/llib-lpanelw ./panel/modules ./panel/p_above.c diff --git a/NEWS b/NEWS index e6bab6c3..ad6cd1a9 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2009,2010 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: NEWS,v 1.1486 2010/01/02 22:56:01 tom Exp $ +-- $Id: NEWS,v 1.1491 2010/01/09 21:05:27 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,17 @@ 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. +20100109 + + modify configure macro CF_XOPEN_SOURCE, etc., to use CF_ADD_CFLAGS + consistently to add new -D's while removing duplicates. + + modify a few configure macros to consistently put new options + before older in the list. + + add tiparm(), based on review of X/Open Curses Issue 7. + + minor documentation cleanup. + + update config.guess, config.sub from + http://savannah.gnu.org/projects/config + (caveat - its maintainer put 2010 copyright date on files dated 2009) + 20100102 + minor improvement to tic's checking of similar SGR's to allow for the most common case of SGR 0. diff --git a/TO-DO b/TO-DO index eb252279..8f8b7f1e 100644 --- a/TO-DO +++ b/TO-DO @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2010 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.53 2008/11/28 16:39:12 tom Exp $ +-- $Id: TO-DO,v 1.54 2010/01/09 16:48:05 tom Exp $ ------------------------------------------------------------------------------- SHORT-TERM TO-DO ITEMS: @@ -96,21 +96,20 @@ Portability (or lack thereof): trip over a known problem with the signal-handling code which causes abrupt termination of ncurses applications following resume from a ^Z suspend (this problem was first seen running lynx). You will not see this problem if you - are running Linux or one of the 4.4BSD derivatives like FreeBSD, NetBSD, or - BSDI. For details, see the analysis in the header comment of - ncurses/tty/lib_tstp.c . + are using one of the 4.4BSD derivatives like such as, NetBSD, or BSDI, or + systems using that convention. For details, see the analysis in the header + comment of ncurses/tty/lib_tstp.c . + In theory, vwprintw and vwscanf are supposed to use the older varargs.h 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 + for that reason). Many newer systems do no have varargs.h, instead they have + only 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 system old enough not to have a native vsscanf(3) in its + library, vwscanw() will not work. If you want to fix this, add an implementation to ncurses/vsscanf.c. + The C++ binding fails to build with a few C++ compilers. diff --git a/aclocal.m4 b/aclocal.m4 index d23340ae..c74eb978 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2009,2010 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 * @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.489 2009/11/21 17:49:12 tom Exp $ +dnl $Id: aclocal.m4,v 1.490 2010/01/09 21:06:30 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -86,7 +86,7 @@ fi AC_SUBST(ACPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30 +dnl CF_ADD_CFLAGS version: 9 updated: 2010/01/09 11:05:50 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl The second parameter if given makes this macro verbose. @@ -112,8 +112,8 @@ no) 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 + && 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" @@ -128,6 +128,12 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags) + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -143,8 +149,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -1747,7 +1753,7 @@ make an error test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GPP_LIBRARY version: 8 updated: 2003/02/02 01:41:46 +dnl CF_GPP_LIBRARY version: 9 updated: 2009/12/19 13:46:49 dnl -------------- dnl If we're trying to use g++, test if libg++ is installed (a rather common dnl problem :-). If we have the compiler but no library, we'll be able to @@ -1766,7 +1772,7 @@ esac if test "$GXX" = yes; then AC_MSG_CHECKING([for lib$cf_gpp_libname]) cf_save="$LIBS" - LIBS="$LIBS -l$cf_gpp_libname" + LIBS="-l$cf_gpp_libname $LIBS" AC_TRY_LINK([ #include <$cf_gpp_libname/builtin.h> ], @@ -3617,7 +3623,7 @@ chmod 755 $cf_edit_man ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MATH_LIB version: 5 updated: 2000/05/28 01:39:10 +dnl CF_MATH_LIB version: 6 updated: 2009/12/19 13:46:49 dnl ----------- dnl Checks for libraries. At least one UNIX system, Apple Macintosh dnl Rhapsody 5.5, does not have -lm. We cannot use the simpler @@ -3636,7 +3642,7 @@ AC_CACHE_CHECK(if -lm needed for math functions, if test "$cf_cv_need_libm" = yes then ifelse($1,,[ - LIBS="$LIBS -lm" + LIBS="-lm $LIBS" ],[$1=-lm]) fi ]) @@ -3895,7 +3901,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10 +dnl CF_POSIX_C_SOURCE version: 7 updated: 2010/01/09 11:05:50 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -3963,12 +3969,7 @@ make an error 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" + CF_ADD_CFLAGS($cf_cv_posix_c_source) fi ])dnl @@ -4230,7 +4231,7 @@ case $cf_cv_regex in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18 +dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 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 @@ -4242,10 +4243,9 @@ 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'` + sed -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[[ ]]/ /g' \ + -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- dnl CF_REMOVE_LIB version: 1 updated: 2007/02/17 14:11:52 @@ -4312,7 +4312,7 @@ AC_MSG_RESULT(no) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 57 updated: 2009/01/17 16:10:05 +dnl CF_SHARED_OPTS version: 58 updated: 2009/12/19 13:46:49 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -4620,7 +4620,7 @@ CF_EOF if test -n "$LD_RPATH_OPT" ; then AC_MSG_CHECKING(if we need a space after rpath option) cf_save_LIBS="$LIBS" - LIBS="$LIBS ${LD_RPATH_OPT}$libdir" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes) LIBS="$cf_save_LIBS" AC_MSG_RESULT($cf_rpath_space) @@ -4931,7 +4931,7 @@ if test -n "$ADA_SUBDIRS"; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STDCPP_LIBRARY version: 5 updated: 2000/08/12 23:18:52 +dnl CF_STDCPP_LIBRARY version: 6 updated: 2009/12/19 13:46:49 dnl ----------------- dnl Check for -lstdc++, which is GNU's standard C++ library. AC_DEFUN([CF_STDCPP_LIBRARY], @@ -4947,7 +4947,7 @@ os2*) #(vi esac AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[ cf_save="$LIBS" - LIBS="$LIBS -l$cf_stdcpp_libname" + LIBS="-l$cf_stdcpp_libname $LIBS" AC_TRY_LINK([ #include ],[ char buf[80]; @@ -5728,7 +5728,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 29 updated: 2009/07/16 21:07:04 +dnl CF_XOPEN_SOURCE version: 32 updated: 2010/01/09 11:05:50 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, @@ -5739,14 +5739,19 @@ 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) +cf_xopen_source= case $host_os in #(vi aix[[456]]*) #(vi - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" + cf_xopen_source="-D_ALL_SOURCE" + ;; +darwin[[0-8]].*) #(vi + cf_xopen_source="-D_APPLE_C_SOURCE" + ;; +darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -5754,16 +5759,16 @@ freebsd*|dragonfly*) #(vi # _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" + cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ;; hpux11*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500" + cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; hpux*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" + cf_xopen_source="-D_HPUX_SOURCE" ;; irix[[56]].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" + cf_xopen_source="-D_SGI_SOURCE" ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi CF_GNU_SOURCE @@ -5778,16 +5783,16 @@ openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; osf[[45]]*) #(vi - CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" + cf_xopen_source="-D_OSF_SOURCE" ;; nto-qnx*) #(vi - CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" + cf_xopen_source="-D_QNX_SOURCE" ;; sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; solaris*) #(vi - CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" + cf_xopen_source="-D__EXTENSIONS__" ;; *) AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ @@ -5810,11 +5815,14 @@ make an error 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" + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + CF_ADD_CFLAGS($cf_temp_xopen_source) fi CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac + +if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) +fi ]) diff --git a/config.guess b/config.guess index dc84c68e..c2246a4f 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." diff --git a/config.sub b/config.sub index 2a55a507..85186096 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2009-12-31' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1435,6 +1436,8 @@ case $os in -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) diff --git a/configure b/configure index 5f91b153..403f6192 100755 --- a/configure +++ b/configure @@ -2458,8 +2458,8 @@ no) 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 + && 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" @@ -2474,6 +2474,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -2489,8 +2499,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -2511,7 +2521,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >conftest.$ac_ext <<_ACEOF -#line 2514 "configure" +#line 2524 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2532,16 +2542,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2535: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2545: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2538: \$? = $ac_status" >&5 + echo "$as_me:2548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2541: \"$ac_try\"") >&5 + { (eval echo "$as_me:2551: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2544: \$? = $ac_status" >&5 + echo "$as_me:2554: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_cc="$cf_arg"; break else @@ -2554,7 +2564,7 @@ CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:2557: result: $cf_cv_ansi_cc" >&5 +echo "$as_me:2567: result: $cf_cv_ansi_cc" >&5 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then @@ -2576,8 +2586,8 @@ no) 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 + && 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" @@ -2592,6 +2602,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -2607,8 +2627,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -2637,7 +2657,7 @@ fi fi if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:2640: error: Your compiler does not appear to recognize prototypes. + { { echo "$as_me:2660: 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 @@ -2677,7 +2697,7 @@ dragonfly*|freebsd*) #(vi *) LDPATH=$PATH:/sbin:/usr/sbin # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 -echo "$as_me:2680: checking for $ac_word" >&5 +echo "$as_me:2700: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LDCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2694,7 +2714,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LDCONFIG="$ac_dir/$ac_word" - echo "$as_me:2697: found $ac_dir/$ac_word" >&5 + echo "$as_me:2717: found $ac_dir/$ac_word" >&5 break fi done @@ -2705,10 +2725,10 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2708: result: $LDCONFIG" >&5 + echo "$as_me:2728: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2711: result: no" >&5 + echo "$as_me:2731: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2716,7 +2736,7 @@ fi esac fi -echo "$as_me:2719: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:2739: checking if you want to ensure bool is consistent with C++" >&5 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 # Check whether --with-cxx or --without-cxx was given. @@ -2726,7 +2746,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2729: result: $cf_with_cxx" >&5 +echo "$as_me:2749: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2744,7 +2764,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:2747: checking for $ac_word" >&5 +echo "$as_me:2767: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2759,7 +2779,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_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:2762: found $ac_dir/$ac_word" >&5 +echo "$as_me:2782: found $ac_dir/$ac_word" >&5 break done @@ -2767,10 +2787,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2770: result: $CXX" >&5 + echo "$as_me:2790: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2773: result: no" >&5 + echo "$as_me:2793: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2783,7 +2803,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2786: checking for $ac_word" >&5 +echo "$as_me:2806: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2798,7 +2818,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_ac_ct_CXX="$ac_prog" -echo "$as_me:2801: found $ac_dir/$ac_word" >&5 +echo "$as_me:2821: found $ac_dir/$ac_word" >&5 break done @@ -2806,10 +2826,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2809: result: $ac_ct_CXX" >&5 + echo "$as_me:2829: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2812: result: no" >&5 + echo "$as_me:2832: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2821,32 +2841,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:2824:" \ +echo "$as_me:2844:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2827: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2847: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2830: \$? = $ac_status" >&5 + echo "$as_me:2850: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2832: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:2852: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2835: \$? = $ac_status" >&5 + echo "$as_me:2855: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2837: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2857: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2840: \$? = $ac_status" >&5 + echo "$as_me:2860: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2843: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:2863: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2849 "configure" +#line 2869 "configure" #include "confdefs.h" int @@ -2861,16 +2881,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2864: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2884: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2867: \$? = $ac_status" >&5 + echo "$as_me:2887: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2870: \"$ac_try\"") >&5 + { (eval echo "$as_me:2890: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2873: \$? = $ac_status" >&5 + echo "$as_me:2893: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -2882,19 +2902,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2885: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:2905: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:2891: checking whether $CXX accepts -g" >&5 +echo "$as_me:2911: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2897 "configure" +#line 2917 "configure" #include "confdefs.h" int @@ -2906,16 +2926,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2929: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2912: \$? = $ac_status" >&5 + echo "$as_me:2932: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2915: \"$ac_try\"") >&5 + { (eval echo "$as_me:2935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2918: \$? = $ac_status" >&5 + echo "$as_me:2938: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -2925,7 +2945,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2928: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:2948: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -2952,7 +2972,7 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2955 "configure" +#line 2975 "configure" #include "confdefs.h" #include $ac_declaration @@ -2965,16 +2985,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2968: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2988: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2971: \$? = $ac_status" >&5 + echo "$as_me:2991: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2974: \"$ac_try\"") >&5 + { (eval echo "$as_me:2994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2977: \$? = $ac_status" >&5 + echo "$as_me:2997: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2984,7 +3004,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2987 "configure" +#line 3007 "configure" #include "confdefs.h" $ac_declaration int @@ -2996,16 +3016,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2999: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3019: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3002: \$? = $ac_status" >&5 + echo "$as_me:3022: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3005: \"$ac_try\"") >&5 + { (eval echo "$as_me:3025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3008: \$? = $ac_status" >&5 + echo "$as_me:3028: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3032,7 +3052,7 @@ ac_main_return=return if test "$CXX" = "g++" ; then # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -echo "$as_me:3035: checking for $ac_word" >&5 +echo "$as_me:3055: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3049,7 +3069,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_CXX="$ac_dir/$ac_word" - echo "$as_me:3052: found $ac_dir/$ac_word" >&5 + echo "$as_me:3072: found $ac_dir/$ac_word" >&5 break fi done @@ -3060,16 +3080,16 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:3063: result: $CXX" >&5 + echo "$as_me:3083: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3066: result: no" >&5 + echo "$as_me:3086: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test "$CXX" = "g++" ; then - { echo "$as_me:3072: WARNING: ignoring hardcoded g++" >&5 + { echo "$as_me:3092: WARNING: ignoring hardcoded g++" >&5 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} cf_with_cxx=no; CXX=""; GXX=""; fi @@ -3077,11 +3097,11 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:3080: checking version of g++" >&5 + echo "$as_me:3100: checking version of g++" >&5 echo $ECHO_N "checking version of g++... $ECHO_C" >&6 GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GXX_VERSION" && GXX_VERSION=unknown - echo "$as_me:3084: result: $GXX_VERSION" >&5 + echo "$as_me:3104: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi @@ -3089,12 +3109,12 @@ case $GXX_VERSION in 1*|2.[0-6]*) # GXX=""; CXX=""; ac_cv_prog_gxx=no # cf_cxx_library=no - { echo "$as_me:3092: WARNING: templates do not work" >&5 + { echo "$as_me:3112: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3097: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3117: checking if you want to build C++ binding and demo" >&5 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 # Check whether --with-cxx-binding or --without-cxx-binding was given. @@ -3104,10 +3124,10 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3107: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3127: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3110: checking if you want to build with Ada95" >&5 +echo "$as_me:3130: checking if you want to build with Ada95" >&5 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 # Check whether --with-ada or --without-ada was given. @@ -3117,10 +3137,10 @@ if test "${with_ada+set}" = set; then else cf_with_ada=yes fi; -echo "$as_me:3120: result: $cf_with_ada" >&5 +echo "$as_me:3140: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:3123: checking if you want to install manpages" >&5 +echo "$as_me:3143: checking if you want to install manpages" >&5 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 # Check whether --with-manpages or --without-manpages was given. @@ -3130,10 +3150,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3133: result: $cf_with_manpages" >&5 +echo "$as_me:3153: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3136: checking if you want to build programs such as tic" >&5 +echo "$as_me:3156: checking if you want to build programs such as tic" >&5 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 # Check whether --with-progs or --without-progs was given. @@ -3143,10 +3163,10 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3146: result: $cf_with_progs" >&5 +echo "$as_me:3166: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -echo "$as_me:3149: checking if you wish to install curses.h" >&5 +echo "$as_me:3169: checking if you wish to install curses.h" >&5 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 # Check whether --with-curses-h or --without-curses-h was given. @@ -3156,7 +3176,7 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3159: result: $with_curses_h" >&5 +echo "$as_me:3179: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" @@ -3182,7 +3202,7 @@ 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 "$as_me:3185: checking for $ac_word" >&5 +echo "$as_me:3205: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3197,7 +3217,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_AWK="$ac_prog" -echo "$as_me:3200: found $ac_dir/$ac_word" >&5 +echo "$as_me:3220: found $ac_dir/$ac_word" >&5 break done @@ -3205,21 +3225,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3208: result: $AWK" >&5 + echo "$as_me:3228: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3211: result: no" >&5 + echo "$as_me:3231: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3218: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3238: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3222: checking for egrep" >&5 +echo "$as_me:3242: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3229,11 +3249,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:3232: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3252: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep -test -z "$EGREP" && { { echo "$as_me:3236: error: No egrep program found" >&5 +test -z "$EGREP" && { { echo "$as_me:3256: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -3249,7 +3269,7 @@ echo "$as_me: error: No egrep program found" >&2;} # 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 "$as_me:3252: checking for a BSD compatible install" >&5 +echo "$as_me:3272: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -3298,7 +3318,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3301: result: $INSTALL" >&5 +echo "$as_me:3321: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3323,7 +3343,7 @@ for ac_prog in tdlint lint alint splint lclint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3326: checking for $ac_word" >&5 +echo "$as_me:3346: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3338,7 +3358,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_LINT="$ac_prog" -echo "$as_me:3341: found $ac_dir/$ac_word" >&5 +echo "$as_me:3361: found $ac_dir/$ac_word" >&5 break done @@ -3346,28 +3366,28 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3349: result: $LINT" >&5 + echo "$as_me:3369: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3352: result: no" >&5 + echo "$as_me:3372: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:3359: checking whether ln -s works" >&5 +echo "$as_me:3379: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3363: result: yes" >&5 + echo "$as_me:3383: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3366: result: no, using $LN_S" >&5 + echo "$as_me:3386: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3370: checking for long file names" >&5 +echo "$as_me:3390: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3406,7 +3426,7 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do rm -rf $ac_xdir 2>/dev/null done fi -echo "$as_me:3409: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3429: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test $ac_cv_sys_long_file_names = yes; then @@ -3418,7 +3438,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3421: checking if you want to use pkg-config" >&5 +echo "$as_me:3441: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -3428,7 +3448,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3431: result: $cf_pkg_config" >&5 +echo "$as_me:3451: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in #(vi @@ -3438,7 +3458,7 @@ no) #(vi yes) #(vi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:3441: checking for $ac_word" >&5 +echo "$as_me:3461: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3455,7 +3475,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3458: found $ac_dir/$ac_word" >&5 + echo "$as_me:3478: found $ac_dir/$ac_word" >&5 break fi done @@ -3467,10 +3487,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3470: result: $PKG_CONFIG" >&5 + echo "$as_me:3490: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3473: result: no" >&5 + echo "$as_me:3493: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3508,7 +3528,7 @@ case ".$PKG_CONFIG" in #(vi PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:3511: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3531: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3517,7 +3537,7 @@ esac fi if test "$PKG_CONFIG" != no ; then - echo "$as_me:3520: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:3540: checking if we should install .pc files for $PKG_CONFIG" >&5 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 # Leave this as something that can be overridden in the environment. @@ -3534,18 +3554,18 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; - echo "$as_me:3537: result: $enable_pc_files" >&5 + echo "$as_me:3557: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 else - echo "$as_me:3540: result: no" >&5 + echo "$as_me:3560: result: no" >&5 echo "${ECHO_T}no" >&6 - { echo "$as_me:3542: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 + { echo "$as_me:3562: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} enable_pc_files=no fi fi -echo "$as_me:3548: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3568: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3555,11 +3575,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3558: result: $enable_mixedcase" >&5 +echo "$as_me:3578: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3562: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3582: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3586,7 +3606,7 @@ else fi fi -echo "$as_me:3589: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3609: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF #define MIXEDCASE_FILENAMES 1 @@ -3603,7 +3623,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3606: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3626: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -3623,18 +3643,18 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3626: result: yes" >&5 + echo "$as_me:3646: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3630: result: no" >&5 + echo "$as_me:3650: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi # Extract the first word of "ctags", so it can be a program name with args. set dummy ctags; ac_word=$2 -echo "$as_me:3637: checking for $ac_word" >&5 +echo "$as_me:3657: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3649,7 +3669,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_MAKE_LOWER_TAGS="yes" -echo "$as_me:3652: found $ac_dir/$ac_word" >&5 +echo "$as_me:3672: found $ac_dir/$ac_word" >&5 break done @@ -3658,17 +3678,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3661: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3681: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3664: result: no" >&5 + echo "$as_me:3684: result: no" >&5 echo "${ECHO_T}no" >&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 "$as_me:3671: checking for $ac_word" >&5 +echo "$as_me:3691: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3683,7 +3703,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_MAKE_UPPER_TAGS="yes" -echo "$as_me:3686: found $ac_dir/$ac_word" >&5 +echo "$as_me:3706: found $ac_dir/$ac_word" >&5 break done @@ -3692,10 +3712,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3695: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3715: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3698: result: no" >&5 + echo "$as_me:3718: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3715,7 +3735,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3718: checking for makeflags variable" >&5 +echo "$as_me:3738: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3749,13 +3769,13 @@ CF_EOF rm -f cf_makeflags.tmp fi -echo "$as_me:3752: result: $cf_cv_makeflags" >&5 +echo "$as_me:3772: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3758: checking for $ac_word" >&5 +echo "$as_me:3778: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3770,7 +3790,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_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3773: found $ac_dir/$ac_word" >&5 +echo "$as_me:3793: found $ac_dir/$ac_word" >&5 break done @@ -3778,10 +3798,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3781: result: $RANLIB" >&5 + echo "$as_me:3801: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3784: result: no" >&5 + echo "$as_me:3804: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3790,7 +3810,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3793: checking for $ac_word" >&5 +echo "$as_me:3813: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3805,7 +3825,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_ac_ct_RANLIB="ranlib" -echo "$as_me:3808: found $ac_dir/$ac_word" >&5 +echo "$as_me:3828: found $ac_dir/$ac_word" >&5 break done @@ -3814,10 +3834,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3817: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3837: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3820: result: no" >&5 + echo "$as_me:3840: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3829,7 +3849,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:3832: checking for $ac_word" >&5 +echo "$as_me:3852: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3844,7 +3864,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_LD="${ac_tool_prefix}ld" -echo "$as_me:3847: found $ac_dir/$ac_word" >&5 +echo "$as_me:3867: found $ac_dir/$ac_word" >&5 break done @@ -3852,10 +3872,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3855: result: $LD" >&5 + echo "$as_me:3875: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3858: result: no" >&5 + echo "$as_me:3878: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3864,7 +3884,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:3867: checking for $ac_word" >&5 +echo "$as_me:3887: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3879,7 +3899,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_ac_ct_LD="ld" -echo "$as_me:3882: found $ac_dir/$ac_word" >&5 +echo "$as_me:3902: found $ac_dir/$ac_word" >&5 break done @@ -3888,10 +3908,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3891: result: $ac_ct_LD" >&5 + echo "$as_me:3911: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3894: result: no" >&5 + echo "$as_me:3914: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3903,7 +3923,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3906: checking for $ac_word" >&5 +echo "$as_me:3926: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3918,7 +3938,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_AR="${ac_tool_prefix}ar" -echo "$as_me:3921: found $ac_dir/$ac_word" >&5 +echo "$as_me:3941: found $ac_dir/$ac_word" >&5 break done @@ -3926,10 +3946,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3929: result: $AR" >&5 + echo "$as_me:3949: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3932: result: no" >&5 + echo "$as_me:3952: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3938,7 +3958,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:3941: checking for $ac_word" >&5 +echo "$as_me:3961: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3953,7 +3973,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_ac_ct_AR="ar" -echo "$as_me:3956: found $ac_dir/$ac_word" >&5 +echo "$as_me:3976: found $ac_dir/$ac_word" >&5 break done @@ -3962,10 +3982,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3965: result: $ac_ct_AR" >&5 + echo "$as_me:3985: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3968: result: no" >&5 + echo "$as_me:3988: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3977,7 +3997,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3980: checking for $ac_word" >&5 +echo "$as_me:4000: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3992,7 +4012,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_AR="${ac_tool_prefix}ar" -echo "$as_me:3995: found $ac_dir/$ac_word" >&5 +echo "$as_me:4015: found $ac_dir/$ac_word" >&5 break done @@ -4000,10 +4020,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4003: result: $AR" >&5 + echo "$as_me:4023: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4006: result: no" >&5 + echo "$as_me:4026: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4012,7 +4032,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4015: checking for $ac_word" >&5 +echo "$as_me:4035: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4027,7 +4047,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_ac_ct_AR="ar" -echo "$as_me:4030: found $ac_dir/$ac_word" >&5 +echo "$as_me:4050: found $ac_dir/$ac_word" >&5 break done @@ -4036,10 +4056,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4039: result: $ac_ct_AR" >&5 + echo "$as_me:4059: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4042: result: no" >&5 + echo "$as_me:4062: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4048,7 +4068,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4051: checking for options to update archives" >&5 +echo "$as_me:4071: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4061,13 +4081,13 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4070: \$? = $ac_status" >&5 + echo "$as_me:4090: \$? = $ac_status" >&5 (exit $ac_status); } ; then $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null if test -f conftest.a ; then @@ -4077,7 +4097,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me-configure}:4080: testing cannot compile test-program ..." 1>&5 +echo "${as_me-configure}:4100: testing cannot compile test-program ..." 1>&5 break fi @@ -4085,12 +4105,12 @@ echo "${as_me-configure}:4080: testing cannot compile test-program ..." 1>&5 rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi -echo "$as_me:4088: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4108: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags ARFLAGS=$cf_cv_ar_flags -echo "$as_me:4093: checking if you have specified an install-prefix" >&5 +echo "$as_me:4113: checking if you have specified an install-prefix" >&5 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -4103,7 +4123,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4106: result: $DESTDIR" >&5 +echo "$as_me:4126: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4131,7 +4151,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4134: checking for $ac_word" >&5 +echo "$as_me:4154: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4146,7 +4166,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_BUILD_CC="$ac_prog" -echo "$as_me:4149: found $ac_dir/$ac_word" >&5 +echo "$as_me:4169: found $ac_dir/$ac_word" >&5 break done @@ -4154,10 +4174,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4157: result: $BUILD_CC" >&5 + echo "$as_me:4177: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4160: result: no" >&5 + echo "$as_me:4180: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4165,12 +4185,12 @@ fi done fi; - echo "$as_me:4168: checking for native build C compiler" >&5 + echo "$as_me:4188: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4170: result: $BUILD_CC" >&5 + echo "$as_me:4190: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4173: checking for native build C preprocessor" >&5 + echo "$as_me:4193: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4180,10 +4200,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4183: result: $BUILD_CPP" >&5 + echo "$as_me:4203: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4186: checking for native build C flags" >&5 + echo "$as_me:4206: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4191,10 +4211,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4194: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4214: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4197: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4217: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4202,10 +4222,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4205: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4225: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4208: checking for native build linker-flags" >&5 + echo "$as_me:4228: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4213,10 +4233,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4216: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4236: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4219: checking for native build linker-libraries" >&5 + echo "$as_me:4239: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4224,7 +4244,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4227: result: $BUILD_LIBS" >&5 + echo "$as_me:4247: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4234,7 +4254,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4237: error: Cross-build requires two compilers. + { { echo "$as_me:4257: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4275,7 +4295,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:4278: checking if you want to build libraries with libtool" >&5 +echo "$as_me:4298: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -4285,7 +4305,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:4288: result: $with_libtool" >&5 +echo "$as_me:4308: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -4316,7 +4336,7 @@ case ".$with_libtool" in #(vi with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:4319: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:4339: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4326,7 +4346,7 @@ esac else # Extract the first word of "libtool", so it can be a program name with args. set dummy libtool; ac_word=$2 -echo "$as_me:4329: checking for $ac_word" >&5 +echo "$as_me:4349: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4343,7 +4363,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LIBTOOL="$ac_dir/$ac_word" - echo "$as_me:4346: found $ac_dir/$ac_word" >&5 + echo "$as_me:4366: found $ac_dir/$ac_word" >&5 break fi done @@ -4354,16 +4374,16 @@ fi LIBTOOL=$ac_cv_path_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4357: result: $LIBTOOL" >&5 + echo "$as_me:4377: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4360: result: no" >&5 + echo "$as_me:4380: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:4366: error: Cannot find libtool" >&5 + { { echo "$as_me:4386: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -4378,17 +4398,17 @@ echo "$as_me: error: Cannot find libtool" >&2;} LIB_PREP=: # Show the version of libtool - echo "$as_me:4381: checking version of libtool" >&5 + echo "$as_me:4401: checking version of libtool" >&5 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 # Save the version in a cache variable - this is not entirely a good # thing, but the version string from libtool is very ugly, and for # bug reports it might be useful to have the original string. "(" cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` - echo "$as_me:4388: result: $cf_cv_libtool_version" >&5 + echo "$as_me:4408: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 if test -z "$cf_cv_libtool_version" ; then - { { echo "$as_me:4391: error: This is not GNU libtool" >&5 + { { echo "$as_me:4411: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -4424,7 +4444,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:4427: checking if you want to build shared libraries" >&5 +echo "$as_me:4447: checking if you want to build shared libraries" >&5 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -4434,11 +4454,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4437: result: $with_shared" >&5 +echo "$as_me:4457: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4441: checking if you want to build static libraries" >&5 +echo "$as_me:4461: checking if you want to build static libraries" >&5 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 # Check whether --with-normal or --without-normal was given. @@ -4448,11 +4468,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:4451: result: $with_normal" >&5 +echo "$as_me:4471: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" -echo "$as_me:4455: checking if you want to build debug libraries" >&5 +echo "$as_me:4475: checking if you want to build debug libraries" >&5 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 # Check whether --with-debug or --without-debug was given. @@ -4462,11 +4482,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:4465: result: $with_debug" >&5 +echo "$as_me:4485: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" -echo "$as_me:4469: checking if you want to build profiling libraries" >&5 +echo "$as_me:4489: checking if you want to build profiling libraries" >&5 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 # Check whether --with-profile or --without-profile was given. @@ -4476,7 +4496,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:4479: result: $with_profile" >&5 +echo "$as_me:4499: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" @@ -4484,19 +4504,19 @@ fi ############################################################################### -echo "$as_me:4487: checking for specified models" >&5 +echo "$as_me:4507: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal test "$with_libtool" != "no" && cf_list_models=libtool -echo "$as_me:4491: result: $cf_list_models" >&5 +echo "$as_me:4511: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:4496: checking for default model" >&5 +echo "$as_me:4516: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:4499: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4519: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -4525,7 +4545,7 @@ LIB_SUFFIX= ############################################################################### -echo "$as_me:4528: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:4548: checking if you want to build a separate terminfo library" >&5 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 # Check whether --with-termlib or --without-termlib was given. @@ -4535,10 +4555,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:4538: result: $with_termlib" >&5 +echo "$as_me:4558: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:4541: checking if you want to build a separate tic library" >&5 +echo "$as_me:4561: checking if you want to build a separate tic library" >&5 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 # Check whether --with-ticlib or --without-ticlib was given. @@ -4548,13 +4568,13 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:4551: result: $with_ticlib" >&5 +echo "$as_me:4571: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:4557: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:4577: checking if you want to link with the GPM mouse library" >&5 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 # Check whether --with-gpm or --without-gpm was given. @@ -4564,27 +4584,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:4567: result: $with_gpm" >&5 +echo "$as_me:4587: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:4571: checking for gpm.h" >&5 + echo "$as_me:4591: checking for gpm.h" >&5 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 if test "${ac_cv_header_gpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4577 "configure" +#line 4597 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4581: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4601: \"$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:4587: \$? = $ac_status" >&5 + echo "$as_me:4607: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4603,7 +4623,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4606: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:4626: result: $ac_cv_header_gpm_h" >&5 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 if test $ac_cv_header_gpm_h = yes; then @@ -4614,14 +4634,14 @@ EOF if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 -echo "${as_me-configure}:4617: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me-configure}:4637: testing assuming we really have GPM library ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF else - echo "$as_me:4624: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:4644: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4629,7 +4649,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4632 "configure" +#line 4652 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4648,16 +4668,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4651: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4671: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4654: \$? = $ac_status" >&5 + echo "$as_me:4674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4657: \"$ac_try\"") >&5 + { (eval echo "$as_me:4677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4660: \$? = $ac_status" >&5 + echo "$as_me:4680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -4668,13 +4688,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4671: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:4691: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then : else - { { echo "$as_me:4677: error: Cannot link with GPM library" >&5 + { { echo "$as_me:4697: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } fi @@ -4684,7 +4704,7 @@ fi else - test "$with_gpm" != maybe && { echo "$as_me:4687: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:4707: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -4693,7 +4713,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:4696: checking if you want to load GPM dynamically" >&5 + echo "$as_me:4716: checking if you want to load GPM dynamically" >&5 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 # Check whether --with-dlsym or --without-dlsym was given. @@ -4703,18 +4723,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:4706: result: $with_dlsym" >&5 + echo "$as_me:4726: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "$with_dlsym" = yes ; then cf_have_dlsym=no -echo "$as_me:4711: checking for dlsym" >&5 +echo "$as_me:4731: checking for dlsym" >&5 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 if test "${ac_cv_func_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4717 "configure" +#line 4737 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -4745,16 +4765,16 @@ f = dlsym; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4748: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4768: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4751: \$? = $ac_status" >&5 + echo "$as_me:4771: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4754: \"$ac_try\"") >&5 + { (eval echo "$as_me:4774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4757: \$? = $ac_status" >&5 + echo "$as_me:4777: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -4764,14 +4784,14 @@ ac_cv_func_dlsym=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4767: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:4787: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 if test $ac_cv_func_dlsym = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:4774: checking for dlsym in -ldl" >&5 +echo "$as_me:4794: checking for dlsym in -ldl" >&5 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4779,7 +4799,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4782 "configure" +#line 4802 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4798,16 +4818,16 @@ dlsym (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4801: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4804: \$? = $ac_status" >&5 + echo "$as_me:4824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4807: \"$ac_try\"") >&5 + { (eval echo "$as_me:4827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4810: \$? = $ac_status" >&5 + echo "$as_me:4830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -4818,7 +4838,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4821: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:4841: result: $ac_cv_lib_dl_dlsym" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 if test $ac_cv_lib_dl_dlsym = yes; then @@ -4831,10 +4851,10 @@ fi if test "$cf_have_dlsym" = yes ; then test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" - echo "$as_me:4834: checking whether able to link to dl*() functions" >&5 + echo "$as_me:4854: checking whether able to link to dl*() functions" >&5 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4837 "configure" +#line 4857 "configure" #include "confdefs.h" #include int @@ -4852,16 +4872,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4858: \$? = $ac_status" >&5 + echo "$as_me:4878: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4861: \"$ac_try\"") >&5 + { (eval echo "$as_me:4881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4864: \$? = $ac_status" >&5 + echo "$as_me:4884: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -4872,15 +4892,15 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:4875: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:4895: error: Cannot link test program for libdl" >&5 echo "$as_me: error: Cannot link test program for libdl" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:4880: result: ok" >&5 + echo "$as_me:4900: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:4883: error: Cannot find dlsym function" >&5 + { { echo "$as_me:4903: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -4888,12 +4908,12 @@ fi if test "$with_gpm" != yes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me-configure}:4891: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me-configure}:4911: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:4896: checking for soname of gpm library" >&5 +echo "$as_me:4916: checking for soname of gpm library" >&5 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 if test "${cf_cv_gpm_soname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4911,15 +4931,15 @@ if (Gpm_Open(0,0)) Gpm_Close(); CF_EOF cf_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" - if { (eval echo "$as_me:4914: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4934: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4917: \$? = $ac_status" >&5 + echo "$as_me:4937: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:4919: \"$ac_link\"") >&5 + if { (eval echo "$as_me:4939: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4922: \$? = $ac_status" >&5 + echo "$as_me:4942: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown @@ -4930,7 +4950,7 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:4933: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:4953: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -4946,7 +4966,7 @@ EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:4949: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:4969: checking for Gpm_Wgetch in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4954,7 +4974,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4957 "configure" +#line 4977 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4973,16 +4993,16 @@ Gpm_Wgetch (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4976: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4996: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4979: \$? = $ac_status" >&5 + echo "$as_me:4999: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4982: \"$ac_try\"") >&5 + { (eval echo "$as_me:5002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4985: \$? = $ac_status" >&5 + echo "$as_me:5005: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -4993,11 +5013,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4996: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:5016: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then -echo "$as_me:5000: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:5020: checking if GPM is weakly bound to curses library" >&5 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 if test "${cf_cv_check_gpm_wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5021,15 +5041,15 @@ CF_EOF # to rely on the static library, noting that some packagers may not # include it. LIBS="-static -lgpm -dynamic $LIBS" - if { (eval echo "$as_me:5024: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5044: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5027: \$? = $ac_status" >&5 + echo "$as_me:5047: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5029: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5032: \$? = $ac_status" >&5 + echo "$as_me:5052: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'` test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes @@ -5041,11 +5061,11 @@ CF_EOF fi fi -echo "$as_me:5044: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:5064: result: $cf_cv_check_gpm_wgetch" >&5 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 if test "$cf_cv_check_gpm_wgetch" != yes ; then - { echo "$as_me:5048: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:5068: WARNING: GPM library is already linked with curses - read the FAQ" >&5 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} fi @@ -5055,7 +5075,7 @@ fi # not everyone has "test -c" if test -c /dev/sysmouse 2>/dev/null ; then -echo "$as_me:5058: checking if you want to use sysmouse" >&5 +echo "$as_me:5078: checking if you want to use sysmouse" >&5 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 # Check whether --with-sysmouse or --without-sysmouse was given. @@ -5067,7 +5087,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5070 "configure" +#line 5090 "configure" #include "confdefs.h" #include @@ -5090,16 +5110,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5093: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5113: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5096: \$? = $ac_status" >&5 + echo "$as_me:5116: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5099: \"$ac_try\"") >&5 + { (eval echo "$as_me:5119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5102: \$? = $ac_status" >&5 + echo "$as_me:5122: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_with_sysmouse=yes else @@ -5109,7 +5129,7 @@ cf_with_sysmouse=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5112: result: $cf_with_sysmouse" >&5 +echo "$as_me:5132: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF #define USE_SYSMOUSE 1 @@ -5127,7 +5147,7 @@ if test X"$CXX_G_OPT" = X"" ; then test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' fi -echo "$as_me:5130: checking for default loader flags" >&5 +echo "$as_me:5150: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in libtool) LD_MODEL='' ;; @@ -5136,13 +5156,13 @@ debug) LD_MODEL=$CC_G_OPT ;; profile) LD_MODEL='-pg';; shared) LD_MODEL='' ;; esac -echo "$as_me:5139: result: $LD_MODEL" >&5 +echo "$as_me:5159: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 case $DFT_LWR_MODEL in shared) -echo "$as_me:5145: checking if rpath option should be used" >&5 +echo "$as_me:5165: 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. @@ -5152,10 +5172,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_ld_rpath=no fi; -echo "$as_me:5155: result: $cf_cv_ld_rpath" >&5 +echo "$as_me:5175: result: $cf_cv_ld_rpath" >&5 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 -echo "$as_me:5158: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5178: checking if shared libraries should be relinked during install" >&5 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 # Check whether --enable-relink or --disable-relink was given. @@ -5165,7 +5185,7 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5168: result: $cf_cv_do_relink" >&5 +echo "$as_me:5188: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac @@ -5178,7 +5198,7 @@ esac cf_cv_do_symlinks=no - echo "$as_me:5181: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:5201: 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. @@ -5193,7 +5213,7 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; *) - { { echo "$as_me:5196: error: option value must be one of: rel, abi, auto or no" >&5 + { { echo "$as_me:5216: 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; }; } ;; @@ -5202,7 +5222,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:5205: result: $cf_cv_shlib_version" >&5 + echo "$as_me:5225: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -5211,14 +5231,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 CC_SHARED_OPTS= if test "$GCC" = yes then - echo "$as_me:5214: checking which $CC option to use" >&5 + echo "$as_me:5234: 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 5221 "configure" +#line 5241 "configure" #include "confdefs.h" #include int @@ -5230,16 +5250,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5233: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5253: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5236: \$? = $ac_status" >&5 + echo "$as_me:5256: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5239: \"$ac_try\"") >&5 + { (eval echo "$as_me:5259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5242: \$? = $ac_status" >&5 + echo "$as_me:5262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5248,7 +5268,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:5251: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:5271: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -5290,7 +5310,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${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:5293: checking if ld -search_paths_first works" >&5 + echo "$as_me:5313: 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 @@ -5299,7 +5319,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 5302 "configure" +#line 5322 "configure" #include "confdefs.h" int @@ -5311,16 +5331,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5314: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5334: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5317: \$? = $ac_status" >&5 + echo "$as_me:5337: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5320: \"$ac_try\"") >&5 + { (eval echo "$as_me:5340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5323: \$? = $ac_status" >&5 + echo "$as_me:5343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -5331,7 +5351,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:5334: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:5354: 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" @@ -5526,7 +5546,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 5529 "configure" +#line 5549 "configure" #include "confdefs.h" #include int @@ -5538,16 +5558,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5541: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5561: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5544: \$? = $ac_status" >&5 + echo "$as_me:5564: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5547: \"$ac_try\"") >&5 + { (eval echo "$as_me:5567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5550: \$? = $ac_status" >&5 + echo "$as_me:5570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5584,7 +5604,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; *) - { echo "$as_me:5587: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:5607: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -5592,12 +5612,12 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} esac if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:5595: checking if we need a space after rpath option" >&5 + echo "$as_me:5615: 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 ${LD_RPATH_OPT}$libdir" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5600 "configure" +#line 5620 "configure" #include "confdefs.h" int @@ -5609,16 +5629,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5632: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5615: \$? = $ac_status" >&5 + echo "$as_me:5635: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5618: \"$ac_try\"") >&5 + { (eval echo "$as_me:5638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5621: \$? = $ac_status" >&5 + echo "$as_me:5641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -5628,7 +5648,7 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:5631: result: $cf_rpath_space" >&5 + echo "$as_me:5651: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}" @@ -5637,7 +5657,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:5640: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:5660: 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 @@ -5647,7 +5667,7 @@ fi ############################################################################### ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:5650: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:5670: 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. @@ -5657,10 +5677,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:5660: result: $with_overwrite" >&5 +echo "$as_me:5680: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:5663: checking if external terminfo-database is used" >&5 +echo "$as_me:5683: 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. @@ -5670,7 +5690,7 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:5673: result: $use_database" >&5 +echo "$as_me:5693: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 case $host_os in #(vi @@ -5692,7 +5712,7 @@ if test "$use_database" != no ; then #define USE_DATABASE 1 EOF - echo "$as_me:5695: checking which terminfo source-file will be installed" >&5 + echo "$as_me:5715: 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 --with-database or --without-database was given. @@ -5700,10 +5720,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:5703: result: $TERMINFO_SRC" >&5 + echo "$as_me:5723: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:5706: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:5726: 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. @@ -5713,13 +5733,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:5716: result: $with_hashed_db" >&5 + echo "$as_me:5736: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:5722: checking for list of fallback descriptions" >&5 +echo "$as_me:5742: 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. @@ -5729,11 +5749,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:5732: result: $with_fallback" >&5 +echo "$as_me:5752: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` -echo "$as_me:5736: checking if you want modern xterm or antique" >&5 +echo "$as_me:5756: 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. @@ -5747,7 +5767,7 @@ case $with_xterm_new in no) with_xterm_new=xterm-old;; *) with_xterm_new=xterm-new;; esac -echo "$as_me:5750: result: $with_xterm_new" >&5 +echo "$as_me:5770: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new @@ -5757,7 +5777,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:5760: checking for list of terminfo directories" >&5 +echo "$as_me:5780: 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. @@ -5797,7 +5817,7 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5800: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:5820: 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; }; } ;; @@ -5810,13 +5830,13 @@ IFS="$ac_save_ifs" eval 'TERMINFO_DIRS="$cf_dst_path"' -echo "$as_me:5813: result: $TERMINFO_DIRS" >&5 +echo "$as_me:5833: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 +echo "$as_me:5839: 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. @@ -5852,7 +5872,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5855: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:5875: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5861,7 +5881,7 @@ esac fi TERMINFO="$withval" -echo "$as_me:5864: result: $TERMINFO" >&5 +echo "$as_me:5884: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:5894: 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. @@ -5883,7 +5903,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 5886 "configure" +#line 5906 "configure" #include "confdefs.h" #include @@ -5897,15 +5917,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5900: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5903: \$? = $ac_status" >&5 + echo "$as_me:5923: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5905: \"$ac_try\"") >&5 + { (eval echo "$as_me:5925: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5908: \$? = $ac_status" >&5 + echo "$as_me:5928: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -5917,7 +5937,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:5920: result: $with_big_core" >&5 +echo "$as_me:5940: 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 @@ -5926,7 +5946,7 @@ EOF ### ISO C only guarantees 512-char strings, we have tables which load faster ### when constructed using "big" strings. More than the C compiler, the awk ### program is a limit on most vendor UNIX systems. Check that we can build. -echo "$as_me:5929: checking if big-strings option selected" >&5 +echo "$as_me:5949: checking if big-strings option selected" >&5 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 # Check whether --enable-big-strings or --disable-big-strings was given. @@ -5950,14 +5970,14 @@ else esac fi; -echo "$as_me:5953: result: $with_big_strings" >&5 +echo "$as_me:5973: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:5960: checking if you want termcap-fallback support" >&5 +echo "$as_me:5980: 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. @@ -5967,13 +5987,13 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:5970: result: $with_termcap" >&5 +echo "$as_me:5990: 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:5976: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:5996: 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 @@ -5985,7 +6005,7 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:5988: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:6008: 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 @@ -5994,7 +6014,7 @@ cat >>confdefs.h <<\EOF #define USE_TERMCAP 1 EOF -echo "$as_me:5997: checking for list of termcap files" >&5 +echo "$as_me:6017: 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. @@ -6034,7 +6054,7 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6037: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:6057: 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; }; } ;; @@ -6047,14 +6067,14 @@ IFS="$ac_save_ifs" eval 'TERMPATH="$cf_dst_path"' -echo "$as_me:6050: result: $TERMPATH" >&5 +echo "$as_me:6070: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <&5 +echo "$as_me:6077: 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. @@ -6064,13 +6084,13 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; -echo "$as_me:6067: result: $with_getcap" >&5 +echo "$as_me:6087: 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:6073: checking if translated termcaps will be cached in ~/.terminfo" >&5 +echo "$as_me:6093: 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. @@ -6080,7 +6100,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; -echo "$as_me:6083: result: $with_getcap_cache" >&5 +echo "$as_me:6103: 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 @@ -6089,7 +6109,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:6092: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:6112: 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. @@ -6099,13 +6119,13 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:6102: result: $with_home_terminfo" >&5 +echo "$as_me:6122: 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:6108: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:6128: 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. @@ -6115,7 +6135,7 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:6118: result: $with_root_environ" >&5 +echo "$as_me:6138: 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 @@ -6129,13 +6149,13 @@ for ac_func in \ unlink do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6132: checking for $ac_func" >&5 +echo "$as_me:6152: 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 6138 "configure" +#line 6158 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6166,16 +6186,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6169: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6189: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6172: \$? = $ac_status" >&5 + echo "$as_me:6192: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6175: \"$ac_try\"") >&5 + { (eval echo "$as_me:6195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6178: \$? = $ac_status" >&5 + echo "$as_me:6198: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6185,7 +6205,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6188: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6208: 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:6225: 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 6211 "configure" +#line 6231 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6239,16 +6259,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6242: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6262: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6245: \$? = $ac_status" >&5 + echo "$as_me:6265: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6248: \"$ac_try\"") >&5 + { (eval echo "$as_me:6268: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6251: \$? = $ac_status" >&5 + echo "$as_me:6271: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6258,7 +6278,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6261: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6281: 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:6292: 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 @@ -6282,7 +6302,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 6285 "configure" +#line 6305 "configure" #include "confdefs.h" #include @@ -6312,15 +6332,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6315: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6318: \$? = $ac_status" >&5 + echo "$as_me:6338: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6320: \"$ac_try\"") >&5 + { (eval echo "$as_me:6340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6323: \$? = $ac_status" >&5 + echo "$as_me:6343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -6338,7 +6358,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:6341: result: $cf_cv_link_funcs" >&5 +echo "$as_me:6361: 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 @@ -6356,7 +6376,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:6359: checking if tic should use symbolic links" >&5 + echo "$as_me:6379: 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. @@ -6366,21 +6386,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:6369: result: $with_symlinks" >&5 + echo "$as_me:6389: 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:6376: checking if tic should use hard links" >&5 + echo "$as_me:6396: 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:6383: result: $with_links" >&5 + echo "$as_me:6403: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -6393,7 +6413,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:6396: checking if you want broken-linker support code" >&5 +echo "$as_me:6416: 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. @@ -6403,7 +6423,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER-no} fi; -echo "$as_me:6406: result: $with_broken_linker" >&5 +echo "$as_me:6426: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -6423,14 +6443,14 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me-configure}:6426: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me-configure}:6446: testing cygwin linker is broken anyway ..." 1>&5 ;; esac fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:6433: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:6453: 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. @@ -6440,7 +6460,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:6443: result: $with_bsdpad" >&5 +echo "$as_me:6463: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF #define BSD_TPUTS 1 @@ -6457,66 +6477,19 @@ NCURSES_WINT_T=0 # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:6460: 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 -else - - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" - cat >conftest.$ac_ext <<_ACEOF -#line 6469 "configure" -#include "confdefs.h" - -int -main () -{ - -#ifndef U_D_OPTIONS -make an undefined-error -#endif -#ifdef D_U_OPTIONS -make a defined-error -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6488: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6491: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6494: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6497: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_cc_u_d_options=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - cf_cv_cc_u_d_options=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$cf_save_CPPFLAGS" - -fi -echo "$as_me:6511: result: $cf_cv_cc_u_d_options" >&5 -echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 - cf_XOPEN_SOURCE=500 cf_POSIX_C_SOURCE=199506L +cf_xopen_source= case $host_os in #(vi aix[456]*) #(vi - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" + cf_xopen_source="-D_ALL_SOURCE" + ;; +darwin[0-8].*) #(vi + cf_xopen_source="-D_APPLE_C_SOURCE" + ;; +darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -6524,27 +6497,27 @@ freebsd*|dragonfly*) #(vi # _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" + cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ;; hpux11*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500" + cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; hpux*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" + cf_xopen_source="-D_HPUX_SOURCE" ;; irix[56].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" + cf_xopen_source="-D_SGI_SOURCE" ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:6540: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:6513: 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 6547 "configure" +#line 6520 "configure" #include "confdefs.h" #include int @@ -6559,16 +6532,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6562: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6535: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6565: \$? = $ac_status" >&5 + echo "$as_me:6538: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6568: \"$ac_try\"") >&5 + { (eval echo "$as_me:6541: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6571: \$? = $ac_status" >&5 + echo "$as_me:6544: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -6577,7 +6550,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 6580 "configure" +#line 6553 "configure" #include "confdefs.h" #include int @@ -6592,16 +6565,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6598: \$? = $ac_status" >&5 + echo "$as_me:6571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6601: \"$ac_try\"") >&5 + { (eval echo "$as_me:6574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6604: \$? = $ac_status" >&5 + echo "$as_me:6577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -6616,7 +6589,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6619: result: $cf_cv_gnu_source" >&5 +echo "$as_me:6592: 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" @@ -6631,26 +6604,26 @@ openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; osf[45]*) #(vi - CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" + cf_xopen_source="-D_OSF_SOURCE" ;; nto-qnx*) #(vi - CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" + cf_xopen_source="-D_QNX_SOURCE" ;; sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; solaris*) #(vi - CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" + cf_xopen_source="-D__EXTENSIONS__" ;; *) - echo "$as_me:6646: checking if we should define _XOPEN_SOURCE" >&5 + echo "$as_me:6619: 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 6653 "configure" +#line 6626 "configure" #include "confdefs.h" #include int @@ -6665,16 +6638,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6641: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6671: \$? = $ac_status" >&5 + echo "$as_me:6644: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6674: \"$ac_try\"") >&5 + { (eval echo "$as_me:6647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6677: \$? = $ac_status" >&5 + echo "$as_me:6650: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -6683,7 +6656,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 6686 "configure" +#line 6659 "configure" #include "confdefs.h" #include int @@ -6698,16 +6671,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6701: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6674: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6704: \$? = $ac_status" >&5 + echo "$as_me:6677: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6707: \"$ac_try\"") >&5 + { (eval echo "$as_me:6680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6710: \$? = $ac_status" >&5 + echo "$as_me:6683: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -6722,23 +6695,98 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6725: result: $cf_cv_xopen_source" >&5 +echo "$as_me:6698: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&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'` + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_temp_xopen_source +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 + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` -# remove _XOPEN_SOURCE symbol from $CPPFLAGS CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + 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="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi - 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 @@ -6746,26 +6794,24 @@ 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'` + 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'` + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:6759: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:6805: 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 "${as_me-configure}:6765: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me-configure}:6811: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6768 "configure" +#line 6814 "configure" #include "confdefs.h" #include int @@ -6780,16 +6826,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6783: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6829: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6786: \$? = $ac_status" >&5 + echo "$as_me:6832: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6789: \"$ac_try\"") >&5 + { (eval echo "$as_me:6835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6792: \$? = $ac_status" >&5 + echo "$as_me:6838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -6810,7 +6856,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 6813 "configure" +#line 6859 "configure" #include "confdefs.h" #include int @@ -6825,16 +6871,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6828: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6831: \$? = $ac_status" >&5 + echo "$as_me:6877: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6834: \"$ac_try\"") >&5 + { (eval echo "$as_me:6880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6837: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6845,15 +6891,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me-configure}:6848: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me-configure}:6894: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me-configure}:6853: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me-configure}:6899: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6856 "configure" +#line 6902 "configure" #include "confdefs.h" #include int @@ -6868,16 +6914,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6871: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6917: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6874: \$? = $ac_status" >&5 + echo "$as_me:6920: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6877: \"$ac_try\"") >&5 + { (eval echo "$as_me:6923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6880: \$? = $ac_status" >&5 + echo "$as_me:6926: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6893,33 +6939,188 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6896: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:6942: 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 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" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_cv_posix_c_source +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 + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + 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="$CPPFLAGS $cf_new_cppflags" fi +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + +fi + + ;; +esac + +if test -n "$cf_xopen_source" ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_xopen_source +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 + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + 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="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + +fi # Work around breakage on OS X -echo "$as_me:6915: checking if SIGWINCH is defined" >&5 +echo "$as_me:7116: 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 6922 "configure" +#line 7123 "configure" #include "confdefs.h" #include @@ -6934,23 +7135,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6937: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6940: \$? = $ac_status" >&5 + echo "$as_me:7141: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6943: \"$ac_try\"") >&5 + { (eval echo "$as_me:7144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6946: \$? = $ac_status" >&5 + echo "$as_me:7147: \$? = $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 6953 "configure" +#line 7154 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6968,16 +7169,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6971: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7172: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6974: \$? = $ac_status" >&5 + echo "$as_me:7175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6977: \"$ac_try\"") >&5 + { (eval echo "$as_me:7178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6980: \$? = $ac_status" >&5 + echo "$as_me:7181: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -6991,11 +7192,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6994: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:7195: 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:6998: checking for actual SIGWINCH definition" >&5 +echo "$as_me:7199: 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 @@ -7006,7 +7207,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 7009 "configure" +#line 7210 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -7028,16 +7229,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7232: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7034: \$? = $ac_status" >&5 + echo "$as_me:7235: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7037: \"$ac_try\"") >&5 + { (eval echo "$as_me:7238: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7040: \$? = $ac_status" >&5 + echo "$as_me:7241: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -7051,7 +7252,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:7054: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:7255: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -7061,13 +7262,13 @@ fi # Checks for CODESET support. - echo "$as_me:7064: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:7265: 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 7070 "configure" +#line 7271 "configure" #include "confdefs.h" #include int @@ -7079,16 +7280,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7082: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7283: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7085: \$? = $ac_status" >&5 + echo "$as_me:7286: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7088: \"$ac_try\"") >&5 + { (eval echo "$as_me:7289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7091: \$? = $ac_status" >&5 + echo "$as_me:7292: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -7099,7 +7300,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7102: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:7303: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -7113,7 +7314,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:7116: checking if you want wide-character code" >&5 +echo "$as_me:7317: 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. @@ -7123,7 +7324,7 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:7126: result: $with_widec" >&5 +echo "$as_me:7327: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 if test "$with_widec" = yes ; then LIB_SUFFIX="w${LIB_SUFFIX}" @@ -7131,10 +7332,10 @@ if test "$with_widec" = yes ; then #define USE_WIDEC_SUPPORT 1 EOF -echo "$as_me:7134: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:7335: 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 7137 "configure" +#line 7338 "configure" #include "confdefs.h" #include @@ -7150,16 +7351,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7153: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7354: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7156: \$? = $ac_status" >&5 + echo "$as_me:7357: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7159: \"$ac_try\"") >&5 + { (eval echo "$as_me:7360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7162: \$? = $ac_status" >&5 + echo "$as_me:7363: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -7168,16 +7369,16 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:7171: result: $cf_result" >&5 +echo "$as_me:7372: 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:7177: checking checking for compatible value versus " >&5 + echo "$as_me:7378: 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 7180 "configure" +#line 7381 "configure" #include "confdefs.h" #include @@ -7193,16 +7394,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7196: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7397: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7199: \$? = $ac_status" >&5 + echo "$as_me:7400: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7202: \"$ac_try\"") >&5 + { (eval echo "$as_me:7403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7205: \$? = $ac_status" >&5 + echo "$as_me:7406: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -7211,7 +7412,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:7214: result: $cf_result" >&5 + echo "$as_me:7415: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -7225,13 +7426,13 @@ fi for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7228: checking for $ac_func" >&5 +echo "$as_me:7429: 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 7234 "configure" +#line 7435 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7262,16 +7463,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7265: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7466: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7268: \$? = $ac_status" >&5 + echo "$as_me:7469: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7271: \"$ac_try\"") >&5 + { (eval echo "$as_me:7472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7274: \$? = $ac_status" >&5 + echo "$as_me:7475: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7281,7 +7482,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7284: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7485: 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:7497: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7301,7 +7502,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7304 "configure" +#line 7505 "configure" #include "confdefs.h" #include @@ -7314,16 +7515,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7518: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7320: \$? = $ac_status" >&5 + echo "$as_me:7521: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7323: \"$ac_try\"") >&5 + { (eval echo "$as_me:7524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7326: \$? = $ac_status" >&5 + echo "$as_me:7527: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -7335,10 +7536,10 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me-configure}:7338: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me-configure}:7539: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7341 "configure" +#line 7542 "configure" #include "confdefs.h" #include @@ -7351,16 +7552,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7354: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7357: \$? = $ac_status" >&5 + echo "$as_me:7558: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7360: \"$ac_try\"") >&5 + { (eval echo "$as_me:7561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7363: \$? = $ac_status" >&5 + echo "$as_me:7564: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes else @@ -7371,9 +7572,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me-configure}:7374: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me-configure}:7575: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me-configure}:7376: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me-configure}:7577: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -7481,11 +7682,11 @@ cf_search="$cf_header_path_list $cf_search" if test -d $cf_cv_header_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me-configure}:7484: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me-configure}:7685: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 7488 "configure" +#line 7689 "configure" #include "confdefs.h" #include @@ -7498,21 +7699,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7501: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7702: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7504: \$? = $ac_status" >&5 + echo "$as_me:7705: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7507: \"$ac_try\"") >&5 + { (eval echo "$as_me:7708: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7510: \$? = $ac_status" >&5 + echo "$as_me:7711: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me-configure}:7515: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me-configure}:7716: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -7530,7 +7731,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me-configure}:7533: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me-configure}:7734: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7626,13 +7827,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me-configure}:7629: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me-configure}:7830: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 7635 "configure" +#line 7836 "configure" #include "confdefs.h" #include @@ -7645,21 +7846,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7648: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7849: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7651: \$? = $ac_status" >&5 + echo "$as_me:7852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7654: \"$ac_try\"") >&5 + { (eval echo "$as_me:7855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7657: \$? = $ac_status" >&5 + echo "$as_me:7858: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me-configure}:7662: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me-configure}:7863: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -7697,7 +7898,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7700: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:7901: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -7731,7 +7932,7 @@ if test -n "$cf_cv_header_path_utf8" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 7734 "configure" +#line 7935 "configure" #include "confdefs.h" #include int @@ -7743,16 +7944,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7746: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7947: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7749: \$? = $ac_status" >&5 + echo "$as_me:7950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7752: \"$ac_try\"") >&5 + { (eval echo "$as_me:7953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7755: \$? = $ac_status" >&5 + echo "$as_me:7956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7769,7 +7970,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:7772: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me-configure}:7973: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7803,7 +8004,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:7806: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me-configure}:8007: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7820,14 +8021,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:7823: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:8024: 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 7830 "configure" +#line 8031 "configure" #include "confdefs.h" #include @@ -7845,23 +8046,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7848: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8049: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7851: \$? = $ac_status" >&5 + echo "$as_me:8052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7854: \"$ac_try\"") >&5 + { (eval echo "$as_me:8055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7857: \$? = $ac_status" >&5 + echo "$as_me:8058: \$? = $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 7864 "configure" +#line 8065 "configure" #include "confdefs.h" #include @@ -7880,16 +8081,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7883: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8084: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7886: \$? = $ac_status" >&5 + echo "$as_me:8087: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7889: \"$ac_try\"") >&5 + { (eval echo "$as_me:8090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7892: \$? = $ac_status" >&5 + echo "$as_me:8093: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -7901,7 +8102,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7904: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:8105: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -7918,14 +8119,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:7921: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:8122: 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 7928 "configure" +#line 8129 "configure" #include "confdefs.h" #include @@ -7943,23 +8144,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7946: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8147: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7949: \$? = $ac_status" >&5 + echo "$as_me:8150: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7952: \"$ac_try\"") >&5 + { (eval echo "$as_me:8153: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7955: \$? = $ac_status" >&5 + echo "$as_me:8156: \$? = $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 7962 "configure" +#line 8163 "configure" #include "confdefs.h" #include @@ -7978,16 +8179,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7981: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7984: \$? = $ac_status" >&5 + echo "$as_me:8185: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7987: \"$ac_try\"") >&5 + { (eval echo "$as_me:8188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7990: \$? = $ac_status" >&5 + echo "$as_me:8191: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -7999,7 +8200,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8002: result: $cf_cv_wchar_t" >&5 +echo "$as_me:8203: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -8021,14 +8222,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:8024: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:8225: 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 8031 "configure" +#line 8232 "configure" #include "confdefs.h" #include @@ -8046,23 +8247,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8049: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8250: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8052: \$? = $ac_status" >&5 + echo "$as_me:8253: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8055: \"$ac_try\"") >&5 + { (eval echo "$as_me:8256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8058: \$? = $ac_status" >&5 + echo "$as_me:8259: \$? = $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 8065 "configure" +#line 8266 "configure" #include "confdefs.h" #include @@ -8081,16 +8282,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8084: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8285: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8087: \$? = $ac_status" >&5 + echo "$as_me:8288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8090: \"$ac_try\"") >&5 + { (eval echo "$as_me:8291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8093: \$? = $ac_status" >&5 + echo "$as_me:8294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -8102,7 +8303,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8105: result: $cf_cv_wint_t" >&5 +echo "$as_me:8306: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -8141,7 +8342,7 @@ case $cf_cv_abi_version in ;; esac -echo "$as_me:8144: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:8345: 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. @@ -8151,7 +8352,7 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$default_with_lp64 fi; -echo "$as_me:8154: result: $with_lp64" >&5 +echo "$as_me:8355: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "$with_lp64" = yes ; then @@ -8167,7 +8368,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:8170: checking for special C compiler options needed for large files" >&5 + echo "$as_me:8371: 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 @@ -8179,7 +8380,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 8182 "configure" +#line 8383 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -8199,16 +8400,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8202: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8403: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8205: \$? = $ac_status" >&5 + echo "$as_me:8406: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8208: \"$ac_try\"") >&5 + { (eval echo "$as_me:8409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8211: \$? = $ac_status" >&5 + echo "$as_me:8412: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -8218,16 +8419,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8422: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8224: \$? = $ac_status" >&5 + echo "$as_me:8425: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8227: \"$ac_try\"") >&5 + { (eval echo "$as_me:8428: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8230: \$? = $ac_status" >&5 + echo "$as_me:8431: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -8241,13 +8442,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:8244: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:8445: 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:8250: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:8451: 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 @@ -8255,7 +8456,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 8258 "configure" +#line 8459 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -8275,16 +8476,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8278: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8479: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8281: \$? = $ac_status" >&5 + echo "$as_me:8482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8284: \"$ac_try\"") >&5 + { (eval echo "$as_me:8485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8287: \$? = $ac_status" >&5 + echo "$as_me:8488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -8293,7 +8494,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 8296 "configure" +#line 8497 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -8314,16 +8515,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8317: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8518: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8320: \$? = $ac_status" >&5 + echo "$as_me:8521: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8323: \"$ac_try\"") >&5 + { (eval echo "$as_me:8524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8326: \$? = $ac_status" >&5 + echo "$as_me:8527: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -8334,7 +8535,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:8337: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:8538: 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 @@ -8344,7 +8545,7 @@ EOF fi rm -f conftest* - echo "$as_me:8347: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:8548: 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 @@ -8352,7 +8553,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 8355 "configure" +#line 8556 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -8372,16 +8573,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8375: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8576: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8378: \$? = $ac_status" >&5 + echo "$as_me:8579: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8381: \"$ac_try\"") >&5 + { (eval echo "$as_me:8582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8384: \$? = $ac_status" >&5 + echo "$as_me:8585: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -8390,7 +8591,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 8393 "configure" +#line 8594 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -8411,16 +8612,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8414: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8615: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8417: \$? = $ac_status" >&5 + echo "$as_me:8618: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8420: \"$ac_try\"") >&5 + { (eval echo "$as_me:8621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8423: \$? = $ac_status" >&5 + echo "$as_me:8624: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -8431,7 +8632,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:8434: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:8635: 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 @@ -8444,7 +8645,7 @@ rm -f conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:8447: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:8648: 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 @@ -8452,7 +8653,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 8455 "configure" +#line 8656 "configure" #include "confdefs.h" #include int @@ -8464,16 +8665,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8467: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8470: \$? = $ac_status" >&5 + echo "$as_me:8671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8473: \"$ac_try\"") >&5 + { (eval echo "$as_me:8674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8476: \$? = $ac_status" >&5 + echo "$as_me:8677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -8482,7 +8683,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 8485 "configure" +#line 8686 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -8495,16 +8696,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8498: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8699: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8501: \$? = $ac_status" >&5 + echo "$as_me:8702: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8504: \"$ac_try\"") >&5 + { (eval echo "$as_me:8705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8507: \$? = $ac_status" >&5 + echo "$as_me:8708: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -8515,7 +8716,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:8518: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:8719: 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 @@ -8529,13 +8730,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:8532: checking for fseeko" >&5 +echo "$as_me:8733: 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 8538 "configure" +#line 8739 "configure" #include "confdefs.h" #include int @@ -8547,16 +8748,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8550: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8751: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8553: \$? = $ac_status" >&5 + echo "$as_me:8754: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8556: \"$ac_try\"") >&5 + { (eval echo "$as_me:8757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8559: \$? = $ac_status" >&5 + echo "$as_me:8760: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -8566,7 +8767,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8569: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:8770: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -8587,14 +8788,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:8590: checking whether to use struct dirent64" >&5 + echo "$as_me:8791: 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 8597 "configure" +#line 8798 "configure" #include "confdefs.h" #include @@ -8615,16 +8816,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8618: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8621: \$? = $ac_status" >&5 + echo "$as_me:8822: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8624: \"$ac_try\"") >&5 + { (eval echo "$as_me:8825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8627: \$? = $ac_status" >&5 + echo "$as_me:8828: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -8635,7 +8836,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8638: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:8839: 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 @@ -8644,7 +8845,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:8647: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:8848: 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. @@ -8654,14 +8855,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:8657: result: $with_tparm_varargs" >&5 +echo "$as_me:8858: 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 --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:8664: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:8865: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 # Check whether --enable-tic-depends or --disable-tic-depends was given. @@ -8671,14 +8872,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:8674: result: $with_tic_depends" >&5 +echo "$as_me:8875: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --with-bool to override bool's type -echo "$as_me:8681: checking for type of bool" >&5 +echo "$as_me:8882: 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. @@ -8688,10 +8889,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:8691: result: $NCURSES_BOOL" >&5 +echo "$as_me:8892: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:8694: checking for alternate terminal capabilities file" >&5 +echo "$as_me:8895: 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. @@ -8702,11 +8903,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:8705: result: $TERMINFO_CAPS" >&5 +echo "$as_me:8906: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:8709: checking for type of chtype" >&5 +echo "$as_me:8910: 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. @@ -8716,11 +8917,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=auto fi; -echo "$as_me:8719: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:8920: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:8723: checking for type of ospeed" >&5 +echo "$as_me:8924: 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. @@ -8730,11 +8931,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:8733: result: $NCURSES_OSPEED" >&5 +echo "$as_me:8934: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:8737: checking for type of mmask_t" >&5 +echo "$as_me:8938: 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. @@ -8744,11 +8945,11 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=auto fi; -echo "$as_me:8747: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:8948: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 ### use option --with-ccharw-max to override CCHARW_MAX size -echo "$as_me:8751: checking for size CCHARW_MAX" >&5 +echo "$as_me:8952: checking for size CCHARW_MAX" >&5 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 # Check whether --with-ccharw-max or --without-ccharw-max was given. @@ -8758,11 +8959,11 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:8761: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:8962: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 ### Enable compiling-in rcs id's -echo "$as_me:8765: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:8966: 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. @@ -8772,7 +8973,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:8775: result: $with_rcs_ids" >&5 +echo "$as_me:8976: 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 @@ -8780,7 +8981,7 @@ EOF ############################################################################### -echo "$as_me:8783: checking format of man-pages" >&5 +echo "$as_me:8984: 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. @@ -8869,14 +9070,14 @@ unknown) ;; esac -echo "$as_me:8872: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:9073: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:8875: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:9076: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:8879: checking for manpage renaming" >&5 +echo "$as_me:9080: 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. @@ -8904,7 +9105,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:8907: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:9108: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi @@ -8918,10 +9119,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} fi fi -echo "$as_me:8921: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:9122: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:8924: checking if manpage aliases will be installed" >&5 +echo "$as_me:9125: 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. @@ -8932,7 +9133,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:8935: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:9136: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 if test "$LN_S" = "ln -s"; then @@ -8943,7 +9144,7 @@ fi MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:8946: checking if manpage symlinks should be used" >&5 +echo "$as_me:9147: 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. @@ -8956,17 +9157,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:8959: WARNING: cannot make symlinks" >&5 + { echo "$as_me:9160: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:8965: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:9166: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:8969: checking for manpage tbl" >&5 +echo "$as_me:9170: 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. @@ -8977,7 +9178,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:8980: result: $MANPAGE_TBL" >&5 +echo "$as_me:9181: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -9288,7 +9489,7 @@ chmod 755 $cf_edit_man ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:9291: checking if you want to build with function extensions" >&5 +echo "$as_me:9492: 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. @@ -9298,7 +9499,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:9301: result: $with_ext_funcs" >&5 +echo "$as_me:9502: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -9336,7 +9537,7 @@ else GENERATED_EXT_FUNCS= fi -echo "$as_me:9339: checking if you want to build with experimental SCREEN extensions" >&5 +echo "$as_me:9540: checking if you want to build with experimental SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -9346,7 +9547,7 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=no fi; -echo "$as_me:9349: result: $with_sp_funcs" >&5 +echo "$as_me:9550: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "$with_sp_funcs" = yes ; then NCURSES_SP_FUNCS=1 @@ -9360,7 +9561,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:9363: checking if you want to build with experimental terminal-driver" >&5 +echo "$as_me:9564: checking if you want to build with experimental terminal-driver" >&5 echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -9370,7 +9571,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:9373: result: $with_term_driver" >&5 +echo "$as_me:9574: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "$with_term_driver" = yes ; then cat >>confdefs.h <<\EOF @@ -9378,14 +9579,14 @@ if test "$with_term_driver" = yes ; then EOF if test "$with_sp_funcs" != yes ; then - { { echo "$as_me:9381: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:9582: error: The term-driver option relies upon sp-funcs" >&5 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} { (exit 1); exit 1; }; } fi fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:9388: checking for extended use of const keyword" >&5 +echo "$as_me:9589: 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. @@ -9395,7 +9596,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:9398: result: $with_ext_const" >&5 +echo "$as_me:9599: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -9403,7 +9604,7 @@ if test "$with_ext_const" = yes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:9406: checking if you want to use extended colors" >&5 +echo "$as_me:9607: checking if you want to use extended colors" >&5 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -9413,12 +9614,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=no fi; -echo "$as_me:9416: result: $with_ext_colors" >&5 +echo "$as_me:9617: 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:9421: error: This option applies only to wide-character library" >&5 + { { echo "$as_me:9622: error: This option applies only to wide-character library" >&5 echo "$as_me: error: This option applies only to wide-character library" >&2;} { (exit 1); exit 1; }; } else @@ -9429,7 +9630,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:9432: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:9633: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -9444,7 +9645,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:9447: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:9648: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -9454,7 +9655,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=no fi; -echo "$as_me:9457: result: $with_ext_mouse" >&5 +echo "$as_me:9658: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "$with_ext_mouse" = yes ; then @@ -9465,7 +9666,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:9468: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:9669: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -9473,7 +9674,7 @@ fi fi -echo "$as_me:9476: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:9677: 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. @@ -9483,19 +9684,19 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:9486: result: $with_no_padding" >&5 +echo "$as_me:9687: 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:9492: checking for ANSI C header files" >&5 +echo "$as_me:9693: 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 9498 "configure" +#line 9699 "configure" #include "confdefs.h" #include #include @@ -9503,13 +9704,13 @@ else #include _ACEOF -if { (eval echo "$as_me:9506: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9707: \"$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:9512: \$? = $ac_status" >&5 + echo "$as_me:9713: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9531,7 +9732,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 9534 "configure" +#line 9735 "configure" #include "confdefs.h" #include @@ -9549,7 +9750,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 9552 "configure" +#line 9753 "configure" #include "confdefs.h" #include @@ -9570,7 +9771,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 9573 "configure" +#line 9774 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -9596,15 +9797,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9599: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9800: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9602: \$? = $ac_status" >&5 + echo "$as_me:9803: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9604: \"$ac_try\"") >&5 + { (eval echo "$as_me:9805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9607: \$? = $ac_status" >&5 + echo "$as_me:9808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9617,7 +9818,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:9620: result: $ac_cv_header_stdc" >&5 +echo "$as_me:9821: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -9633,28 +9834,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:9636: checking for $ac_header" >&5 +echo "$as_me:9837: 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 9642 "configure" +#line 9843 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9648: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9849: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9651: \$? = $ac_status" >&5 + echo "$as_me:9852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9654: \"$ac_try\"") >&5 + { (eval echo "$as_me:9855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9657: \$? = $ac_status" >&5 + echo "$as_me:9858: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -9664,7 +9865,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9667: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9868: 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:9878: 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 9683 "configure" +#line 9884 "configure" #include "confdefs.h" $ac_includes_default int @@ -9695,16 +9896,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9698: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9899: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9701: \$? = $ac_status" >&5 + echo "$as_me:9902: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9704: \"$ac_try\"") >&5 + { (eval echo "$as_me:9905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9707: \$? = $ac_status" >&5 + echo "$as_me:9908: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -9714,10 +9915,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9717: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:9918: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:9720: checking size of signed char" >&5 +echo "$as_me:9921: 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 @@ -9726,7 +9927,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 9729 "configure" +#line 9930 "configure" #include "confdefs.h" $ac_includes_default int @@ -9738,21 +9939,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9741: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9942: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9744: \$? = $ac_status" >&5 + echo "$as_me:9945: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9747: \"$ac_try\"") >&5 + { (eval echo "$as_me:9948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9750: \$? = $ac_status" >&5 + echo "$as_me:9951: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9755 "configure" +#line 9956 "configure" #include "confdefs.h" $ac_includes_default int @@ -9764,16 +9965,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9767: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9968: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9770: \$? = $ac_status" >&5 + echo "$as_me:9971: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9773: \"$ac_try\"") >&5 + { (eval echo "$as_me:9974: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9776: \$? = $ac_status" >&5 + echo "$as_me:9977: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -9789,7 +9990,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9792 "configure" +#line 9993 "configure" #include "confdefs.h" $ac_includes_default int @@ -9801,16 +10002,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9804: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9807: \$? = $ac_status" >&5 + echo "$as_me:10008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9810: \"$ac_try\"") >&5 + { (eval echo "$as_me:10011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9813: \$? = $ac_status" >&5 + echo "$as_me:10014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -9826,7 +10027,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 9829 "configure" +#line 10030 "configure" #include "confdefs.h" $ac_includes_default int @@ -9838,16 +10039,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9841: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10042: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9844: \$? = $ac_status" >&5 + echo "$as_me:10045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9847: \"$ac_try\"") >&5 + { (eval echo "$as_me:10048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9850: \$? = $ac_status" >&5 + echo "$as_me:10051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -9860,12 +10061,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:9863: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:10064: 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 9868 "configure" +#line 10069 "configure" #include "confdefs.h" $ac_includes_default int @@ -9881,15 +10082,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9884: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9887: \$? = $ac_status" >&5 + echo "$as_me:10088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9889: \"$ac_try\"") >&5 + { (eval echo "$as_me:10090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9892: \$? = $ac_status" >&5 + echo "$as_me:10093: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -9905,7 +10106,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:9908: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:10109: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:10120: 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. @@ -9926,12 +10127,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:9929: result: $with_signed_char" >&5 +echo "$as_me:10130: 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:9934: checking if you want SIGWINCH handler" >&5 +echo "$as_me:10135: 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. @@ -9941,14 +10142,14 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:9944: result: $with_sigwinch" >&5 +echo "$as_me:10145: 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:9951: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:10152: 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. @@ -9958,7 +10159,7 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:9961: result: $with_tcap_names" >&5 +echo "$as_me:10162: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 @@ -9966,7 +10167,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1 ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:9969: checking if you want all development code" >&5 +echo "$as_me:10170: 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. @@ -9976,11 +10177,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:9979: result: $with_develop" >&5 +echo "$as_me:10180: 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:9983: checking if you want hard-tabs code" >&5 +echo "$as_me:10184: 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. @@ -9990,14 +10191,14 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:9993: result: $enable_hard_tabs" >&5 +echo "$as_me:10194: 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:10000: checking if you want limited support for xmc" >&5 +echo "$as_me:10201: 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. @@ -10007,7 +10208,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:10010: result: $enable_xmc_glitch" >&5 +echo "$as_me:10211: 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 @@ -10016,7 +10217,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:10019: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:10220: 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. @@ -10026,14 +10227,14 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:10029: result: $with_assumed_color" >&5 +echo "$as_me:10230: 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:10036: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:10237: 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. @@ -10043,14 +10244,14 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:10046: result: $with_hashmap" >&5 +echo "$as_me:10247: 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:10053: checking if you want colorfgbg code" >&5 +echo "$as_me:10254: 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. @@ -10060,14 +10261,14 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:10063: result: $with_colorfgbg" >&5 +echo "$as_me:10264: 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-interop to turn on use of bindings used for interop -echo "$as_me:10070: checking if you want interop bindings" >&5 +echo "$as_me:10271: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -10077,7 +10278,7 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=no fi; -echo "$as_me:10080: result: $with_exp_interop" >&5 +echo "$as_me:10281: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 @@ -10086,7 +10287,7 @@ test "$with_exp_interop" = yes && NCURSES_INTEROP_FUNCS=1 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:10089: checking if you want to link with the pthread library" >&5 +echo "$as_me:10290: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -10096,27 +10297,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:10099: result: $with_pthread" >&5 +echo "$as_me:10300: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:10103: checking for pthread.h" >&5 + echo "$as_me:10304: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10109 "configure" +#line 10310 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:10113: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10314: \"$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:10119: \$? = $ac_status" >&5 + echo "$as_me:10320: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10135,7 +10336,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:10138: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:10339: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then @@ -10143,12 +10344,12 @@ if test $ac_cv_header_pthread_h = yes; then #define HAVE_PTHREADS_H 1 EOF - echo "$as_me:10146: checking if we can link with the pthread library" >&5 + echo "$as_me:10347: checking if we can link with the pthread library" >&5 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10151 "configure" +#line 10352 "configure" #include "confdefs.h" #include @@ -10164,16 +10365,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10167: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10368: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10170: \$? = $ac_status" >&5 + echo "$as_me:10371: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10173: \"$ac_try\"") >&5 + { (eval echo "$as_me:10374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10176: \$? = $ac_status" >&5 + echo "$as_me:10377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -10183,7 +10384,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:10186: result: $with_pthread" >&5 + echo "$as_me:10387: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" = yes ; then @@ -10193,7 +10394,7 @@ echo "${ECHO_T}$with_pthread" >&6 EOF else - { { echo "$as_me:10196: error: Cannot link with pthread library" >&5 + { { echo "$as_me:10397: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -10202,7 +10403,7 @@ fi fi -echo "$as_me:10205: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:10406: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -10212,18 +10413,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:10215: result: $use_weak_symbols" >&5 +echo "$as_me:10416: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:10219: checking if $CC supports weak symbols" >&5 +echo "$as_me:10420: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10226 "configure" +#line 10427 "configure" #include "confdefs.h" #include @@ -10249,16 +10450,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10252: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10453: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10255: \$? = $ac_status" >&5 + echo "$as_me:10456: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10258: \"$ac_try\"") >&5 + { (eval echo "$as_me:10459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10261: \$? = $ac_status" >&5 + echo "$as_me:10462: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -10269,7 +10470,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10272: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:10473: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -10299,7 +10500,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:10302: checking if you want experimental reentrant code" >&5 +echo "$as_me:10503: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -10309,7 +10510,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:10312: result: $with_reentrant" >&5 +echo "$as_me:10513: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -10333,7 +10534,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:10336: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:10537: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -10348,7 +10549,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:10351: checking for prefix used to wrap public variables" >&5 + echo "$as_me:10552: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -10358,7 +10559,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:10361: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:10562: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -10368,7 +10569,7 @@ cat >>confdefs.h <&5 +echo "$as_me:10572: 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. @@ -10378,7 +10579,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:10381: result: $with_safe_sprintf" >&5 +echo "$as_me:10582: 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 @@ -10387,7 +10588,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:10390: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:10591: 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. @@ -10397,7 +10598,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:10400: result: $with_scroll_hints" >&5 +echo "$as_me:10601: 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 @@ -10405,7 +10606,7 @@ EOF fi -echo "$as_me:10408: checking if you want experimental wgetch-events code" >&5 +echo "$as_me:10609: 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. @@ -10415,7 +10616,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:10418: result: $with_wgetch_events" >&5 +echo "$as_me:10619: 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 @@ -10424,7 +10625,7 @@ EOF ############################################################################### ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:10427: checking if you want to display full commands during build" >&5 +echo "$as_me:10628: 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. @@ -10441,11 +10642,11 @@ else test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" fi -echo "$as_me:10444: result: $with_echo" >&5 +echo "$as_me:10645: result: $with_echo" >&5 echo "${ECHO_T}$with_echo" >&6 ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:10448: checking if you want to see compiler warnings" >&5 +echo "$as_me:10649: 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. @@ -10453,7 +10654,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:10456: result: $with_warnings" >&5 +echo "$as_me:10657: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -10464,12 +10665,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:10467: checking if this is really Intel C compiler" >&5 + echo "$as_me:10668: 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 10472 "configure" +#line 10673 "configure" #include "confdefs.h" int @@ -10486,16 +10687,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10489: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10492: \$? = $ac_status" >&5 + echo "$as_me:10693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10495: \"$ac_try\"") >&5 + { (eval echo "$as_me:10696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10498: \$? = $ac_status" >&5 + echo "$as_me:10699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -10506,14 +10707,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:10509: result: $INTEL_COMPILER" >&5 + echo "$as_me:10710: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:10734: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -10546,12 +10747,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:10549: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10552: \$? = $ac_status" >&5 + echo "$as_me:10753: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10554: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10755: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -10560,7 +10761,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:10563: checking for $CC warning options..." >&5 + { echo "$as_me:10764: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" @@ -10580,12 +10781,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:10583: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10784: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10586: \$? = $ac_status" >&5 + echo "$as_me:10787: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10588: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10789: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -10596,7 +10797,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me-configure}:10599: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me-configure}:10800: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -10616,12 +10817,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:10619: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:10820: 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 10624 "configure" +#line 10825 "configure" #include "confdefs.h" int @@ -10638,16 +10839,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10641: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10842: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10644: \$? = $ac_status" >&5 + echo "$as_me:10845: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10647: \"$ac_try\"") >&5 + { (eval echo "$as_me:10848: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10650: \$? = $ac_status" >&5 + echo "$as_me:10851: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -10658,7 +10859,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:10661: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:10862: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -10672,7 +10873,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:10894: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -10707,12 +10908,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:10710: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10713: \$? = $ac_status" >&5 + echo "$as_me:10914: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10715: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10916: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -10721,7 +10922,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:10724: checking for $CXX warning options..." >&5 + { echo "$as_me:10925: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -10750,16 +10951,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:10753: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10954: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10756: \$? = $ac_status" >&5 + echo "$as_me:10957: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10758: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10959: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:10762: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10963: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -10795,10 +10996,10 @@ cat > conftest.i <&5 + { echo "$as_me:10999: 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:11051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10853: \$? = $ac_status" >&5 + echo "$as_me:11054: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10855: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:11056: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -10888,7 +11089,7 @@ rm -rf conftest* fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:10891: checking if you want to enable runtime assertions" >&5 +echo "$as_me:11092: 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. @@ -10898,7 +11099,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:10901: result: $with_assertions" >&5 +echo "$as_me:11102: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -10916,7 +11117,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:10919: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:11120: 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. @@ -10932,7 +11133,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:10935: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:11136: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -10958,8 +11159,8 @@ no) 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 + && 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" @@ -10974,6 +11175,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -10989,8 +11200,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -11016,23 +11227,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:11019: checking for dmalloc.h" >&5 + echo "$as_me:11230: 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 11025 "configure" +#line 11236 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:11029: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11240: \"$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:11035: \$? = $ac_status" >&5 + echo "$as_me:11246: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11051,11 +11262,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11054: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:11265: 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:11058: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:11269: 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 @@ -11063,7 +11274,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11066 "configure" +#line 11277 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11082,16 +11293,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11296: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11088: \$? = $ac_status" >&5 + echo "$as_me:11299: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11091: \"$ac_try\"") >&5 + { (eval echo "$as_me:11302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11094: \$? = $ac_status" >&5 + echo "$as_me:11305: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -11102,7 +11313,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11105: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:11316: 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:11331: 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. @@ -11133,7 +11344,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:11136: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:11347: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -11159,8 +11370,8 @@ no) 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 + && 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" @@ -11175,6 +11386,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -11190,8 +11411,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -11217,23 +11438,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:11220: checking for dbmalloc.h" >&5 + echo "$as_me:11441: 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 11226 "configure" +#line 11447 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:11230: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11451: \"$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:11236: \$? = $ac_status" >&5 + echo "$as_me:11457: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11252,11 +11473,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11255: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:11476: 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:11259: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:11480: 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 @@ -11264,7 +11485,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11267 "configure" +#line 11488 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11283,16 +11504,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11286: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11507: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11289: \$? = $ac_status" >&5 + echo "$as_me:11510: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11292: \"$ac_try\"") >&5 + { (eval echo "$as_me:11513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11295: \$? = $ac_status" >&5 + echo "$as_me:11516: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -11303,7 +11524,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11306: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:11527: 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:11542: 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. @@ -11334,7 +11555,7 @@ EOF else with_valgrind= fi; -echo "$as_me:11337: result: ${with_valgrind:-no}" >&5 +echo "$as_me:11558: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -11360,8 +11581,8 @@ no) 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 + && 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" @@ -11376,6 +11597,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -11391,8 +11622,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -11417,7 +11648,7 @@ fi ;; esac -echo "$as_me:11420: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:11651: 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. @@ -11427,7 +11658,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:11430: result: $with_no_leaks" >&5 +echo "$as_me:11661: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -11472,7 +11703,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:11475: checking whether to add trace feature to all models" >&5 +echo "$as_me:11706: 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. @@ -11482,7 +11713,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:11485: result: $cf_with_trace" >&5 +echo "$as_me:11716: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -11505,8 +11736,8 @@ no) 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 + && 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" @@ -11521,6 +11752,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -11536,8 +11777,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -11567,13 +11808,13 @@ case $cf_cv_system_name in #(vi *mingw32*) #(vi ;; *) -echo "$as_me:11570: checking for gettimeofday" >&5 +echo "$as_me:11811: 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 11576 "configure" +#line 11817 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -11604,16 +11845,16 @@ f = gettimeofday; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11848: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11610: \$? = $ac_status" >&5 + echo "$as_me:11851: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11613: \"$ac_try\"") >&5 + { (eval echo "$as_me:11854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11616: \$? = $ac_status" >&5 + echo "$as_me:11857: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -11623,7 +11864,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11626: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:11867: 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 @@ -11632,7 +11873,7 @@ EOF else -echo "$as_me:11635: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:11876: 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 @@ -11640,7 +11881,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11643 "configure" +#line 11884 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11659,16 +11900,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11662: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11903: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11665: \$? = $ac_status" >&5 + echo "$as_me:11906: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11668: \"$ac_try\"") >&5 + { (eval echo "$as_me:11909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11671: \$? = $ac_status" >&5 + echo "$as_me:11912: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -11679,7 +11920,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11682: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:11923: 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 @@ -11693,14 +11934,14 @@ fi ;; esac -echo "$as_me:11696: checking if -lm needed for math functions" >&5 +echo "$as_me:11937: 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 11703 "configure" +#line 11944 "configure" #include "confdefs.h" #include @@ -11715,16 +11956,16 @@ double x = rand(); printf("result = %g\n", sin(x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11718: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11959: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11721: \$? = $ac_status" >&5 + echo "$as_me:11962: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11724: \"$ac_try\"") >&5 + { (eval echo "$as_me:11965: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11727: \$? = $ac_status" >&5 + echo "$as_me:11968: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -11734,7 +11975,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11737: result: $cf_cv_need_libm" >&5 +echo "$as_me:11978: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -11742,13 +11983,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:11745: checking for ANSI C header files" >&5 +echo "$as_me:11986: 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 11751 "configure" +#line 11992 "configure" #include "confdefs.h" #include #include @@ -11756,13 +11997,13 @@ else #include _ACEOF -if { (eval echo "$as_me:11759: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12000: \"$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:11765: \$? = $ac_status" >&5 + echo "$as_me:12006: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11784,7 +12025,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 11787 "configure" +#line 12028 "configure" #include "confdefs.h" #include @@ -11802,7 +12043,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 11805 "configure" +#line 12046 "configure" #include "confdefs.h" #include @@ -11823,7 +12064,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 11826 "configure" +#line 12067 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -11849,15 +12090,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11852: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12093: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11855: \$? = $ac_status" >&5 + echo "$as_me:12096: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11857: \"$ac_try\"") >&5 + { (eval echo "$as_me:12098: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11860: \$? = $ac_status" >&5 + echo "$as_me:12101: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11870,7 +12111,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:11873: result: $ac_cv_header_stdc" >&5 +echo "$as_me:12114: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -11883,13 +12124,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:11886: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:12127: 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 11892 "configure" +#line 12133 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -11904,16 +12145,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12148: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11910: \$? = $ac_status" >&5 + echo "$as_me:12151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11913: \"$ac_try\"") >&5 + { (eval echo "$as_me:12154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11916: \$? = $ac_status" >&5 + echo "$as_me:12157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -11923,7 +12164,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11926: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12167: 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:12180: 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 @@ -11944,7 +12185,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11947 "configure" +#line 12188 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11963,16 +12204,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11966: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12207: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11969: \$? = $ac_status" >&5 + echo "$as_me:12210: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11972: \"$ac_try\"") >&5 + { (eval echo "$as_me:12213: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11975: \$? = $ac_status" >&5 + echo "$as_me:12216: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -11983,14 +12224,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11986: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:12227: 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:11993: checking for opendir in -lx" >&5 + echo "$as_me:12234: 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 @@ -11998,7 +12239,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12001 "configure" +#line 12242 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12017,16 +12258,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12020: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12261: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12023: \$? = $ac_status" >&5 + echo "$as_me:12264: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12026: \"$ac_try\"") >&5 + { (eval echo "$as_me:12267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12029: \$? = $ac_status" >&5 + echo "$as_me:12270: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -12037,7 +12278,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12040: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:12281: 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" @@ -12045,13 +12286,13 @@ fi fi -echo "$as_me:12048: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:12289: 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 12054 "configure" +#line 12295 "configure" #include "confdefs.h" #include #include @@ -12067,16 +12308,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12070: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12311: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12073: \$? = $ac_status" >&5 + echo "$as_me:12314: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12076: \"$ac_try\"") >&5 + { (eval echo "$as_me:12317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12079: \$? = $ac_status" >&5 + echo "$as_me:12320: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -12086,7 +12327,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12089: result: $ac_cv_header_time" >&5 +echo "$as_me:12330: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -12096,14 +12337,14 @@ EOF fi -echo "$as_me:12099: checking for regular-expression headers" >&5 +echo "$as_me:12340: 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 12106 "configure" +#line 12347 "configure" #include "confdefs.h" #include #include @@ -12121,16 +12362,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12124: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12365: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12127: \$? = $ac_status" >&5 + echo "$as_me:12368: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12130: \"$ac_try\"") >&5 + { (eval echo "$as_me:12371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12133: \$? = $ac_status" >&5 + echo "$as_me:12374: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regex.h" else @@ -12138,7 +12379,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 12141 "configure" +#line 12382 "configure" #include "confdefs.h" #include int @@ -12153,16 +12394,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12156: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12397: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12159: \$? = $ac_status" >&5 + echo "$as_me:12400: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12162: \"$ac_try\"") >&5 + { (eval echo "$as_me:12403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12165: \$? = $ac_status" >&5 + echo "$as_me:12406: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regexp.h" else @@ -12172,7 +12413,7 @@ cat conftest.$ac_ext >&5 cf_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12175 "configure" +#line 12416 "configure" #include "confdefs.h" #include int @@ -12187,16 +12428,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12431: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12193: \$? = $ac_status" >&5 + echo "$as_me:12434: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12196: \"$ac_try\"") >&5 + { (eval echo "$as_me:12437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12199: \$? = $ac_status" >&5 + echo "$as_me:12440: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex="regexpr.h" else @@ -12212,7 +12453,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12215: result: $cf_cv_regex" >&5 +echo "$as_me:12456: result: $cf_cv_regex" >&5 echo "${ECHO_T}$cf_cv_regex" >&6 case $cf_cv_regex in regex.h) cat >>confdefs.h <<\EOF @@ -12248,23 +12489,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12251: checking for $ac_header" >&5 +echo "$as_me:12492: 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 12257 "configure" +#line 12498 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12261: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12502: \"$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:12267: \$? = $ac_status" >&5 + echo "$as_me:12508: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12283,7 +12524,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12286: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12527: 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:12300: checking for main in -lcposix" >&5 +echo "$as_me:12541: 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 @@ -12305,7 +12546,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12308 "configure" +#line 12549 "configure" #include "confdefs.h" int @@ -12317,16 +12558,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12320: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12561: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12323: \$? = $ac_status" >&5 + echo "$as_me:12564: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12326: \"$ac_try\"") >&5 + { (eval echo "$as_me:12567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12329: \$? = $ac_status" >&5 + echo "$as_me:12570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -12337,7 +12578,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12340: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:12581: 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:12592: 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 @@ -12356,7 +12597,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12359 "configure" +#line 12600 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12375,16 +12616,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12378: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12619: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12381: \$? = $ac_status" >&5 + echo "$as_me:12622: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12384: \"$ac_try\"") >&5 + { (eval echo "$as_me:12625: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12387: \$? = $ac_status" >&5 + echo "$as_me:12628: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -12395,21 +12636,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12398: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:12639: 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:12405: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:12646: 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 12412 "configure" +#line 12653 "configure" #include "confdefs.h" #include @@ -12429,16 +12670,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12432: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12435: \$? = $ac_status" >&5 + echo "$as_me:12676: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12438: \"$ac_try\"") >&5 + { (eval echo "$as_me:12679: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12441: \$? = $ac_status" >&5 + echo "$as_me:12682: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -12450,7 +12691,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12453: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:12694: 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 @@ -12464,7 +12705,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:12467: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:12708: 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 @@ -12472,7 +12713,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 12475 "configure" +#line 12716 "configure" #include "confdefs.h" #include #include @@ -12521,16 +12762,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:12524: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12527: \$? = $ac_status" >&5 + echo "$as_me:12768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12530: \"$ac_try\"") >&5 + { (eval echo "$as_me:12771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12533: \$? = $ac_status" >&5 + echo "$as_me:12774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -12547,21 +12788,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:12550: result: none needed" >&5 + echo "$as_me:12791: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:12553: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:12794: 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:12558: checking for an ANSI C-conforming const" >&5 +echo "$as_me:12799: 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 12564 "configure" +#line 12805 "configure" #include "confdefs.h" int @@ -12619,16 +12860,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12625: \$? = $ac_status" >&5 + echo "$as_me:12866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12628: \"$ac_try\"") >&5 + { (eval echo "$as_me:12869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12631: \$? = $ac_status" >&5 + echo "$as_me:12872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -12638,7 +12879,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12641: result: $ac_cv_c_const" >&5 +echo "$as_me:12882: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -12648,7 +12889,7 @@ EOF fi -echo "$as_me:12651: checking for inline" >&5 +echo "$as_me:12892: 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 @@ -12656,7 +12897,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 12659 "configure" +#line 12900 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -12665,16 +12906,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12671: \$? = $ac_status" >&5 + echo "$as_me:12912: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12674: \"$ac_try\"") >&5 + { (eval echo "$as_me:12915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12677: \$? = $ac_status" >&5 + echo "$as_me:12918: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -12685,7 +12926,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:12688: result: $ac_cv_c_inline" >&5 +echo "$as_me:12929: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -12708,7 +12949,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:12711: checking if gcc supports options to tune inlining" >&5 + echo "$as_me:12952: checking if gcc supports options to tune inlining" >&5 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12717,7 +12958,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 12720 "configure" +#line 12961 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -12729,16 +12970,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12732: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12973: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12735: \$? = $ac_status" >&5 + echo "$as_me:12976: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12738: \"$ac_try\"") >&5 + { (eval echo "$as_me:12979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12741: \$? = $ac_status" >&5 + echo "$as_me:12982: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -12750,7 +12991,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:12753: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:12994: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -12770,8 +13011,8 @@ no) 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 + && 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" @@ -12786,6 +13027,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -12801,8 +13052,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -12826,7 +13077,7 @@ fi fi fi -echo "$as_me:12829: checking for signal global datatype" >&5 +echo "$as_me:13080: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12838,7 +13089,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 12841 "configure" +#line 13092 "configure" #include "confdefs.h" #include @@ -12861,16 +13112,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12864: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12867: \$? = $ac_status" >&5 + echo "$as_me:13118: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12870: \"$ac_try\"") >&5 + { (eval echo "$as_me:13121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12873: \$? = $ac_status" >&5 + echo "$as_me:13124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -12884,7 +13135,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12887: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:13138: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:13146: 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 @@ -12902,7 +13153,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 12905 "configure" +#line 13156 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -12937,15 +13188,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12940: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12943: \$? = $ac_status" >&5 + echo "$as_me:13194: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12945: \"$ac_try\"") >&5 + { (eval echo "$as_me:13196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12948: \$? = $ac_status" >&5 + echo "$as_me:13199: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -12960,7 +13211,7 @@ fi fi -echo "$as_me:12963: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:13214: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:13226: 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 12982 "configure" +#line 13233 "configure" #include "confdefs.h" int @@ -12991,16 +13242,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12994: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13245: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12997: \$? = $ac_status" >&5 + echo "$as_me:13248: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13000: \"$ac_try\"") >&5 + { (eval echo "$as_me:13251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13003: \$? = $ac_status" >&5 + echo "$as_me:13254: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -13012,7 +13263,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13015: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:13266: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -13028,14 +13279,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:13031: checking if external errno is declared" >&5 +echo "$as_me:13282: 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 13038 "configure" +#line 13289 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -13053,16 +13304,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13056: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13059: \$? = $ac_status" >&5 + echo "$as_me:13310: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13062: \"$ac_try\"") >&5 + { (eval echo "$as_me:13313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13065: \$? = $ac_status" >&5 + echo "$as_me:13316: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -13073,7 +13324,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13076: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:13327: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -13088,14 +13339,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:13091: checking if external errno exists" >&5 +echo "$as_me:13342: 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 13098 "configure" +#line 13349 "configure" #include "confdefs.h" #undef errno @@ -13110,16 +13361,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13113: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13116: \$? = $ac_status" >&5 + echo "$as_me:13367: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13119: \"$ac_try\"") >&5 + { (eval echo "$as_me:13370: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13122: \$? = $ac_status" >&5 + echo "$as_me:13373: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -13130,7 +13381,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13133: result: $cf_cv_have_errno" >&5 +echo "$as_me:13384: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -13143,7 +13394,7 @@ EOF fi -echo "$as_me:13146: checking if data-only library module links" >&5 +echo "$as_me:13397: 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 @@ -13151,20 +13402,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:13408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13160: \$? = $ac_status" >&5 + echo "$as_me:13411: \$? = $ac_status" >&5 (exit $ac_status); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:13431: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13183: \$? = $ac_status" >&5 + echo "$as_me:13434: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -13193,7 +13444,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 13196 "configure" +#line 13447 "configure" #include "confdefs.h" int main() @@ -13204,15 +13455,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13207: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13458: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13210: \$? = $ac_status" >&5 + echo "$as_me:13461: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13212: \"$ac_try\"") >&5 + { (eval echo "$as_me:13463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13215: \$? = $ac_status" >&5 + echo "$as_me:13466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -13227,7 +13478,7 @@ fi fi -echo "$as_me:13230: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:13481: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -13262,13 +13513,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13265: checking for $ac_func" >&5 +echo "$as_me:13516: 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 13271 "configure" +#line 13522 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -13299,16 +13550,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13302: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13553: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13305: \$? = $ac_status" >&5 + echo "$as_me:13556: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13308: \"$ac_try\"") >&5 + { (eval echo "$as_me:13559: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13311: \$? = $ac_status" >&5 + echo "$as_me:13562: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13318,7 +13569,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13321: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13572: 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:13584: 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 13340 "configure" +#line 13591 "configure" #include "confdefs.h" #include @@ -13357,16 +13608,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13363: \$? = $ac_status" >&5 + echo "$as_me:13614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13366: \"$ac_try\"") >&5 + { (eval echo "$as_me:13617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13369: \$? = $ac_status" >&5 + echo "$as_me:13620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -13378,7 +13629,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13381: result: $cf_cv_cgetent" >&5 +echo "$as_me:13632: 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 @@ -13386,14 +13637,14 @@ EOF fi -echo "$as_me:13389: checking for isascii" >&5 +echo "$as_me:13640: 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 13396 "configure" +#line 13647 "configure" #include "confdefs.h" #include int @@ -13405,16 +13656,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13408: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13659: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13411: \$? = $ac_status" >&5 + echo "$as_me:13662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13414: \"$ac_try\"") >&5 + { (eval echo "$as_me:13665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13417: \$? = $ac_status" >&5 + echo "$as_me:13668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -13425,17 +13676,17 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13428: result: $cf_cv_have_isascii" >&5 +echo "$as_me:13679: 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:13435: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:13686: 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 13438 "configure" +#line 13689 "configure" #include "confdefs.h" #include @@ -13449,16 +13700,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13452: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13703: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13455: \$? = $ac_status" >&5 + echo "$as_me:13706: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13458: \"$ac_try\"") >&5 + { (eval echo "$as_me:13709: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13461: \$? = $ac_status" >&5 + echo "$as_me:13712: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -13466,7 +13717,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13469 "configure" +#line 13720 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -13481,16 +13732,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13484: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13735: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13487: \$? = $ac_status" >&5 + echo "$as_me:13738: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13490: \"$ac_try\"") >&5 + { (eval echo "$as_me:13741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13493: \$? = $ac_status" >&5 + echo "$as_me:13744: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes cat >>confdefs.h <<\EOF @@ -13505,11 +13756,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:13508: result: $sigact_bad" >&5 +echo "$as_me:13759: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:13512: checking if nanosleep really works" >&5 +echo "$as_me:13763: 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 @@ -13519,7 +13770,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 13522 "configure" +#line 13773 "configure" #include "confdefs.h" #include @@ -13544,15 +13795,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13547: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13550: \$? = $ac_status" >&5 + echo "$as_me:13801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13552: \"$ac_try\"") >&5 + { (eval echo "$as_me:13803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13555: \$? = $ac_status" >&5 + echo "$as_me:13806: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -13564,7 +13815,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:13567: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:13818: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF @@ -13578,23 +13829,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13581: checking for $ac_header" >&5 +echo "$as_me:13832: 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 13587 "configure" +#line 13838 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13591: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13842: \"$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:13597: \$? = $ac_status" >&5 + echo "$as_me:13848: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13613,7 +13864,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13616: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13867: 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:13882: 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 13637 "configure" +#line 13888 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13641: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13892: \"$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:13647: \$? = $ac_status" >&5 + echo "$as_me:13898: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13663,7 +13914,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13666: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13917: 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:13935: 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 13687 "configure" +#line 13938 "configure" #include "confdefs.h" #include int @@ -13696,16 +13947,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13950: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13702: \$? = $ac_status" >&5 + echo "$as_me:13953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13705: \"$ac_try\"") >&5 + { (eval echo "$as_me:13956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13708: \$? = $ac_status" >&5 + echo "$as_me:13959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -13713,7 +13964,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13716 "configure" +#line 13967 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -13727,16 +13978,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13733: \$? = $ac_status" >&5 + echo "$as_me:13984: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13736: \"$ac_try\"") >&5 + { (eval echo "$as_me:13987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13739: \$? = $ac_status" >&5 + echo "$as_me:13990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -13751,19 +14002,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:13754: result: $termios_bad" >&5 + echo "$as_me:14005: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:13759: checking for tcgetattr" >&5 +echo "$as_me:14010: 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 13766 "configure" +#line 14017 "configure" #include "confdefs.h" #include @@ -13791,16 +14042,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13794: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13797: \$? = $ac_status" >&5 + echo "$as_me:14048: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13800: \"$ac_try\"") >&5 + { (eval echo "$as_me:14051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13803: \$? = $ac_status" >&5 + echo "$as_me:14054: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -13810,20 +14061,20 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13813: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:14064: 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:13819: checking for vsscanf function or workaround" >&5 +echo "$as_me:14070: 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 13826 "configure" +#line 14077 "configure" #include "confdefs.h" #include @@ -13839,16 +14090,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13845: \$? = $ac_status" >&5 + echo "$as_me:14096: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13848: \"$ac_try\"") >&5 + { (eval echo "$as_me:14099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13851: \$? = $ac_status" >&5 + echo "$as_me:14102: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -13856,7 +14107,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13859 "configure" +#line 14110 "configure" #include "confdefs.h" #include @@ -13878,16 +14129,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13881: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13884: \$? = $ac_status" >&5 + echo "$as_me:14135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13887: \"$ac_try\"") >&5 + { (eval echo "$as_me:14138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13890: \$? = $ac_status" >&5 + echo "$as_me:14141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -13895,7 +14146,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13898 "configure" +#line 14149 "configure" #include "confdefs.h" #include @@ -13917,16 +14168,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13920: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13923: \$? = $ac_status" >&5 + echo "$as_me:14174: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13926: \"$ac_try\"") >&5 + { (eval echo "$as_me:14177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13929: \$? = $ac_status" >&5 + echo "$as_me:14180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -13941,7 +14192,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:13944: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:14195: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in #(vi @@ -13959,7 +14210,7 @@ EOF ;; esac -echo "$as_me:13962: checking for working mkstemp" >&5 +echo "$as_me:14213: 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 @@ -13967,13 +14218,13 @@ else rm -f conftest* if test "$cross_compiling" = yes; then - echo "$as_me:13970: checking for mkstemp" >&5 + echo "$as_me:14221: 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 13976 "configure" +#line 14227 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -14004,16 +14255,16 @@ f = mkstemp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14010: \$? = $ac_status" >&5 + echo "$as_me:14261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14013: \"$ac_try\"") >&5 + { (eval echo "$as_me:14264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14016: \$? = $ac_status" >&5 + echo "$as_me:14267: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -14023,12 +14274,12 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14026: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:14277: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14031 "configure" +#line 14282 "configure" #include "confdefs.h" #include @@ -14066,15 +14317,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14069: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14320: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14072: \$? = $ac_status" >&5 + echo "$as_me:14323: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14074: \"$ac_try\"") >&5 + { (eval echo "$as_me:14325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14077: \$? = $ac_status" >&5 + echo "$as_me:14328: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -14089,7 +14340,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:14092: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:14343: 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 @@ -14107,21 +14358,21 @@ else fi if test "$cross_compiling" = yes ; then - { echo "$as_me:14110: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:14361: 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:14113: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:14364: 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:14119: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:14370: 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 14124 "configure" +#line 14375 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -14138,15 +14389,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14141: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14392: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14144: \$? = $ac_status" >&5 + echo "$as_me:14395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14146: \"$ac_try\"") >&5 + { (eval echo "$as_me:14397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14149: \$? = $ac_status" >&5 + echo "$as_me:14400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -14159,7 +14410,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:14162: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:14413: 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 @@ -14170,13 +14421,13 @@ EOF fi fi -echo "$as_me:14173: checking return type of signal handlers" >&5 +echo "$as_me:14424: 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 14179 "configure" +#line 14430 "configure" #include "confdefs.h" #include #include @@ -14198,16 +14449,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14201: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14452: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14204: \$? = $ac_status" >&5 + echo "$as_me:14455: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14207: \"$ac_try\"") >&5 + { (eval echo "$as_me:14458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14210: \$? = $ac_status" >&5 + echo "$as_me:14461: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -14217,21 +14468,21 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14220: result: $ac_cv_type_signal" >&5 +echo "$as_me:14471: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <&5 +echo "$as_me:14478: 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 14234 "configure" +#line 14485 "configure" #include "confdefs.h" #include @@ -14244,16 +14495,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14247: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14498: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14250: \$? = $ac_status" >&5 + echo "$as_me:14501: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14253: \"$ac_try\"") >&5 + { (eval echo "$as_me:14504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14256: \$? = $ac_status" >&5 + echo "$as_me:14507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -14264,13 +14515,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14267: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:14518: 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:14273: checking declaration of size-change" >&5 +echo "$as_me:14524: 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 @@ -14285,7 +14536,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 14288 "configure" +#line 14539 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -14329,16 +14580,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14332: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14335: \$? = $ac_status" >&5 + echo "$as_me:14586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14338: \"$ac_try\"") >&5 + { (eval echo "$as_me:14589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14341: \$? = $ac_status" >&5 + echo "$as_me:14592: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -14357,7 +14608,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14360: result: $cf_cv_sizechange" >&5 +echo "$as_me:14611: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then cat >>confdefs.h <<\EOF @@ -14374,13 +14625,13 @@ EOF esac fi -echo "$as_me:14377: checking for memmove" >&5 +echo "$as_me:14628: 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 14383 "configure" +#line 14634 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -14411,16 +14662,16 @@ f = memmove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14414: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14417: \$? = $ac_status" >&5 + echo "$as_me:14668: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14420: \"$ac_try\"") >&5 + { (eval echo "$as_me:14671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14423: \$? = $ac_status" >&5 + echo "$as_me:14674: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -14430,19 +14681,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14433: result: $ac_cv_func_memmove" >&5 +echo "$as_me:14684: 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:14439: checking for bcopy" >&5 +echo "$as_me:14690: 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 14445 "configure" +#line 14696 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -14473,16 +14724,16 @@ f = bcopy; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14476: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14727: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14479: \$? = $ac_status" >&5 + echo "$as_me:14730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14482: \"$ac_try\"") >&5 + { (eval echo "$as_me:14733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14485: \$? = $ac_status" >&5 + echo "$as_me:14736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -14492,11 +14743,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14495: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:14746: 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:14499: checking if bcopy does overlapping moves" >&5 + echo "$as_me:14750: 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 @@ -14506,7 +14757,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14509 "configure" +#line 14760 "configure" #include "confdefs.h" int main() { @@ -14520,15 +14771,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14523: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14774: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14526: \$? = $ac_status" >&5 + echo "$as_me:14777: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14528: \"$ac_try\"") >&5 + { (eval echo "$as_me:14779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14531: \$? = $ac_status" >&5 + echo "$as_me:14782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -14541,7 +14792,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:14544: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:14795: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -14562,7 +14813,7 @@ EOF fi -echo "$as_me:14565: checking if poll really works" >&5 +echo "$as_me:14816: 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 @@ -14572,7 +14823,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14575 "configure" +#line 14826 "configure" #include "confdefs.h" #include @@ -14593,15 +14844,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14596: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14847: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14599: \$? = $ac_status" >&5 + echo "$as_me:14850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14601: \"$ac_try\"") >&5 + { (eval echo "$as_me:14852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14604: \$? = $ac_status" >&5 + echo "$as_me:14855: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -14613,7 +14864,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:14616: result: $cf_cv_working_poll" >&5 +echo "$as_me:14867: 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 @@ -14621,7 +14872,7 @@ EOF # special check for test/ditto.c -echo "$as_me:14624: checking for openpty in -lutil" >&5 +echo "$as_me:14875: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14629,7 +14880,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14632 "configure" +#line 14883 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14648,16 +14899,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14651: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14902: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14654: \$? = $ac_status" >&5 + echo "$as_me:14905: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14657: \"$ac_try\"") >&5 + { (eval echo "$as_me:14908: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14660: \$? = $ac_status" >&5 + echo "$as_me:14911: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -14668,7 +14919,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14671: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:14922: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test $ac_cv_lib_util_openpty = yes; then cf_cv_lib_util=yes @@ -14676,7 +14927,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:14679: checking for openpty header" >&5 +echo "$as_me:14930: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14687,7 +14938,7 @@ else for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 14690 "configure" +#line 14941 "configure" #include "confdefs.h" #include <$cf_header> @@ -14704,16 +14955,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14707: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14958: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14710: \$? = $ac_status" >&5 + echo "$as_me:14961: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14713: \"$ac_try\"") >&5 + { (eval echo "$as_me:14964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14716: \$? = $ac_status" >&5 + echo "$as_me:14967: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -14731,7 +14982,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:14734: result: $cf_cv_func_openpty" >&5 +echo "$as_me:14985: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -14783,7 +15034,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 14786 "configure" +#line 15037 "configure" #include "confdefs.h" #include int @@ -14795,16 +15046,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14798: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15049: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14801: \$? = $ac_status" >&5 + echo "$as_me:15052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14804: \"$ac_try\"") >&5 + { (eval echo "$as_me:15055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14807: \$? = $ac_status" >&5 + echo "$as_me:15058: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -14821,7 +15072,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:14824: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me-configure}:15075: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -14855,7 +15106,7 @@ if test -n "$with_hashed_db/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:14858: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me-configure}:15109: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -14866,23 +15117,23 @@ fi fi esac -echo "$as_me:14869: checking for db.h" >&5 +echo "$as_me:15120: 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 14875 "configure" +#line 15126 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14879: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15130: \"$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:14885: \$? = $ac_status" >&5 + echo "$as_me:15136: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14901,11 +15152,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14904: result: $ac_cv_header_db_h" >&5 +echo "$as_me:15155: 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:14908: checking for version of db" >&5 +echo "$as_me:15159: 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 @@ -14916,10 +15167,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 do -echo "${as_me-configure}:14919: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me-configure}:15170: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 14922 "configure" +#line 15173 "configure" #include "confdefs.h" $ac_includes_default @@ -14949,16 +15200,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14952: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15203: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14955: \$? = $ac_status" >&5 + echo "$as_me:15206: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14958: \"$ac_try\"") >&5 + { (eval echo "$as_me:15209: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14961: \$? = $ac_status" >&5 + echo "$as_me:15212: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -14972,16 +15223,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14975: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:15226: 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:14979: error: Cannot determine version of db" >&5 + { { echo "$as_me:15230: 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:14984: checking for db libraries" >&5 +echo "$as_me:15235: 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 @@ -14995,10 +15246,10 @@ do LIBS="-l$cf_db_libs $LIBS" fi -echo "${as_me-configure}:14998: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me-configure}:15249: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 15001 "configure" +#line 15252 "configure" #include "confdefs.h" $ac_includes_default @@ -15053,16 +15304,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15056: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15307: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15059: \$? = $ac_status" >&5 + echo "$as_me:15310: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15062: \"$ac_try\"") >&5 + { (eval echo "$as_me:15313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15065: \$? = $ac_status" >&5 + echo "$as_me:15316: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -15082,11 +15333,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:15085: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:15336: 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:15089: error: Cannot determine library for db" >&5 + { { echo "$as_me:15340: 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 @@ -15096,7 +15347,7 @@ fi else - { { echo "$as_me:15099: error: Cannot find db.h" >&5 + { { echo "$as_me:15350: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -15111,7 +15362,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:15114: checking if we should include stdbool.h" >&5 +echo "$as_me:15365: 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 @@ -15119,7 +15370,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 15122 "configure" +#line 15373 "configure" #include "confdefs.h" int @@ -15131,23 +15382,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15134: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15385: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15137: \$? = $ac_status" >&5 + echo "$as_me:15388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15140: \"$ac_try\"") >&5 + { (eval echo "$as_me:15391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15143: \$? = $ac_status" >&5 + echo "$as_me:15394: \$? = $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 15150 "configure" +#line 15401 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -15163,16 +15414,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15166: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15417: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15169: \$? = $ac_status" >&5 + echo "$as_me:15420: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15172: \"$ac_try\"") >&5 + { (eval echo "$as_me:15423: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15175: \$? = $ac_status" >&5 + echo "$as_me:15426: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -15186,13 +15437,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:15189: result: yes" >&5 +then echo "$as_me:15440: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:15191: result: no" >&5 +else echo "$as_me:15442: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15195: checking for builtin bool type" >&5 +echo "$as_me:15446: 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 @@ -15200,7 +15451,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 15203 "configure" +#line 15454 "configure" #include "confdefs.h" #include @@ -15215,16 +15466,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15221: \$? = $ac_status" >&5 + echo "$as_me:15472: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15224: \"$ac_try\"") >&5 + { (eval echo "$as_me:15475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15227: \$? = $ac_status" >&5 + echo "$as_me:15478: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -15237,9 +15488,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:15240: result: yes" >&5 +then echo "$as_me:15491: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:15242: result: no" >&5 +else echo "$as_me:15493: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15261,16 +15512,16 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:15264: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:15515: 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 else cf_save="$LIBS" - LIBS="$LIBS -l$cf_stdcpp_libname" + LIBS="-l$cf_stdcpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15273 "configure" +#line 15524 "configure" #include "confdefs.h" #include @@ -15286,16 +15537,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15540: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15292: \$? = $ac_status" >&5 + echo "$as_me:15543: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15295: \"$ac_try\"") >&5 + { (eval echo "$as_me:15546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15298: \$? = $ac_status" >&5 + echo "$as_me:15549: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -15307,12 +15558,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:15310: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:15561: 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:15315: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:15566: 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 @@ -15328,15 +15579,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:15331: \"$ac_try\"") >&5 +if { (eval echo "$as_me:15582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15334: \$? = $ac_status" >&5 + echo "$as_me:15585: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:15336: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:15587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15339: \$? = $ac_status" >&5 + echo "$as_me:15590: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -15347,10 +15598,10 @@ rm -f conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:15350: result: yes" >&5 + echo "$as_me:15601: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:15353: result: no" >&5 + echo "$as_me:15604: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15370,12 +15621,12 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:15373: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:15624: 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" + LIBS="-l$cf_gpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15378 "configure" +#line 15629 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -15389,16 +15640,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15392: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15643: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15395: \$? = $ac_status" >&5 + echo "$as_me:15646: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15398: \"$ac_try\"") >&5 + { (eval echo "$as_me:15649: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15401: \$? = $ac_status" >&5 + echo "$as_me:15652: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="$CXXLIBS -l$cf_gpp_libname" @@ -15417,7 +15668,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15420 "configure" +#line 15671 "configure" #include "confdefs.h" #include @@ -15431,16 +15682,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15434: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15685: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15437: \$? = $ac_status" >&5 + echo "$as_me:15688: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15440: \"$ac_try\"") >&5 + { (eval echo "$as_me:15691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15443: \$? = $ac_status" >&5 + echo "$as_me:15694: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="$CXXLIBS -l$cf_gpp_libname" @@ -15457,7 +15708,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:15460: result: $cf_cxx_library" >&5 + echo "$as_me:15711: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -15473,7 +15724,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:15476: checking how to run the C++ preprocessor" >&5 +echo "$as_me:15727: 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 @@ -15490,18 +15741,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 15493 "configure" +#line 15744 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:15498: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15749: \"$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:15504: \$? = $ac_status" >&5 + echo "$as_me:15755: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -15524,17 +15775,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 15527 "configure" +#line 15778 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15531: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15782: \"$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:15537: \$? = $ac_status" >&5 + echo "$as_me:15788: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -15571,7 +15822,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:15574: result: $CXXCPP" >&5 +echo "$as_me:15825: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -15581,18 +15832,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 15584 "configure" +#line 15835 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:15589: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15840: \"$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:15595: \$? = $ac_status" >&5 + echo "$as_me:15846: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -15615,17 +15866,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 15618 "configure" +#line 15869 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15622: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15873: \"$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:15628: \$? = $ac_status" >&5 + echo "$as_me:15879: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -15653,7 +15904,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:15656: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:15907: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -15668,23 +15919,23 @@ ac_main_return=return for ac_header in iostream typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15671: checking for $ac_header" >&5 +echo "$as_me:15922: 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 15677 "configure" +#line 15928 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15681: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15932: \"$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:15687: \$? = $ac_status" >&5 + echo "$as_me:15938: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -15703,7 +15954,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15706: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15957: 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:15968: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15720 "configure" +#line 15971 "configure" #include "confdefs.h" #include @@ -15734,16 +15985,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15988: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15740: \$? = $ac_status" >&5 + echo "$as_me:15991: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15743: \"$ac_try\"") >&5 + { (eval echo "$as_me:15994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15746: \$? = $ac_status" >&5 + echo "$as_me:15997: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -15752,7 +16003,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:15755: result: $cf_iostream_namespace" >&5 + echo "$as_me:16006: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then cat >>confdefs.h <<\EOF @@ -15762,7 +16013,7 @@ EOF fi fi -echo "$as_me:15765: checking if we should include stdbool.h" >&5 +echo "$as_me:16016: 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 @@ -15770,7 +16021,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 15773 "configure" +#line 16024 "configure" #include "confdefs.h" int @@ -15782,23 +16033,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15788: \$? = $ac_status" >&5 + echo "$as_me:16039: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15791: \"$ac_try\"") >&5 + { (eval echo "$as_me:16042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15794: \$? = $ac_status" >&5 + echo "$as_me:16045: \$? = $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 15801 "configure" +#line 16052 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -15814,16 +16065,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16068: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15820: \$? = $ac_status" >&5 + echo "$as_me:16071: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15823: \"$ac_try\"") >&5 + { (eval echo "$as_me:16074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15826: \$? = $ac_status" >&5 + echo "$as_me:16077: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -15837,13 +16088,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:15840: result: yes" >&5 +then echo "$as_me:16091: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:15842: result: no" >&5 +else echo "$as_me:16093: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15846: checking for builtin bool type" >&5 +echo "$as_me:16097: 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 @@ -15851,7 +16102,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 15854 "configure" +#line 16105 "configure" #include "confdefs.h" #include @@ -15866,16 +16117,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15869: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16120: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15872: \$? = $ac_status" >&5 + echo "$as_me:16123: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15875: \"$ac_try\"") >&5 + { (eval echo "$as_me:16126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15878: \$? = $ac_status" >&5 + echo "$as_me:16129: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -15888,13 +16139,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:15891: result: yes" >&5 +then echo "$as_me:16142: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:15893: result: no" >&5 +else echo "$as_me:16144: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15897: checking for size of bool" >&5 +echo "$as_me:16148: 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 @@ -15905,7 +16156,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15908 "configure" +#line 16159 "configure" #include "confdefs.h" #include @@ -15947,15 +16198,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15950: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16201: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15953: \$? = $ac_status" >&5 + echo "$as_me:16204: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15955: \"$ac_try\"") >&5 + { (eval echo "$as_me:16206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15958: \$? = $ac_status" >&5 + echo "$as_me:16209: \$? = $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 @@ -15973,18 +16224,18 @@ fi fi rm -f cf_test.out -echo "$as_me:15976: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:16227: 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:15982: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:16233: 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:15987: checking for special defines needed for etip.h" >&5 +echo "$as_me:16238: 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" @@ -15996,7 +16247,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 15999 "configure" +#line 16250 "configure" #include "confdefs.h" #include @@ -16010,16 +16261,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16013: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16264: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16016: \$? = $ac_status" >&5 + echo "$as_me:16267: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16019: \"$ac_try\"") >&5 + { (eval echo "$as_me:16270: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16022: \$? = $ac_status" >&5 + echo "$as_me:16273: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:16294: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:16048: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:16299: 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 @@ -16062,7 +16313,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16065 "configure" +#line 16316 "configure" #include "confdefs.h" class TEST { @@ -16081,15 +16332,15 @@ void main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16084: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16087: \$? = $ac_status" >&5 + echo "$as_me:16338: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16089: \"$ac_try\"") >&5 + { (eval echo "$as_me:16340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16092: \$? = $ac_status" >&5 + echo "$as_me:16343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -16108,7 +16359,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:16111: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:16362: 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 @@ -16117,7 +16368,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:16120: checking if $CXX accepts static_cast" >&5 +echo "$as_me:16371: 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 @@ -16131,7 +16382,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 16134 "configure" +#line 16385 "configure" #include "confdefs.h" class NCursesPanel @@ -16175,16 +16426,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16178: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16181: \$? = $ac_status" >&5 + echo "$as_me:16432: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16184: \"$ac_try\"") >&5 + { (eval echo "$as_me:16435: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16187: \$? = $ac_status" >&5 + echo "$as_me:16438: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -16202,7 +16453,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:16205: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:16456: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -16250,7 +16501,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:16253: checking for size of bool" >&5 +echo "$as_me:16504: 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 @@ -16261,7 +16512,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16264 "configure" +#line 16515 "configure" #include "confdefs.h" #include @@ -16303,15 +16554,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16557: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16309: \$? = $ac_status" >&5 + echo "$as_me:16560: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16311: \"$ac_try\"") >&5 + { (eval echo "$as_me:16562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16314: \$? = $ac_status" >&5 + echo "$as_me:16565: \$? = $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 @@ -16329,25 +16580,25 @@ fi fi rm -f cf_test.out -echo "$as_me:16332: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:16583: 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:16338: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:16589: 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:16344: checking for fallback type of bool" >&5 + echo "$as_me:16595: 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:16350: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:16601: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -16376,7 +16627,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:16379: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:16630: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -16386,7 +16637,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:16389: checking for $ac_word" >&5 +echo "$as_me:16640: 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 @@ -16401,7 +16652,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:16404: found $ac_dir/$ac_word" >&5 +echo "$as_me:16655: found $ac_dir/$ac_word" >&5 break done @@ -16410,10 +16661,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:16413: result: $gnat_exists" >&5 + echo "$as_me:16664: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:16416: result: no" >&5 + echo "$as_me:16667: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16421,11 +16672,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_ada_make= else -echo "$as_me:16424: checking for gnat version" >&5 +echo "$as_me:16675: 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:16428: result: $cf_gnat_version" >&5 +echo "$as_me:16679: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -16448,7 +16699,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:16451: checking for $ac_word" >&5 +echo "$as_me:16702: 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 @@ -16463,7 +16714,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:16466: found $ac_dir/$ac_word" >&5 +echo "$as_me:16717: found $ac_dir/$ac_word" >&5 break done @@ -16472,10 +16723,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:16475: result: $M4_exists" >&5 + echo "$as_me:16726: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:16478: result: no" >&5 + echo "$as_me:16729: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16484,7 +16735,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:16487: checking if GNAT works" >&5 + echo "$as_me:16738: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -f conftest* @@ -16512,14 +16763,14 @@ else fi rm -f conftest* - echo "$as_me:16515: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:16766: 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:16522: checking if GNAT pragma Unreferenced works" >&5 + echo "$as_me:16773: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 rm -f conftest* @@ -16546,7 +16797,7 @@ else fi rm -f conftest* - echo "$as_me:16549: result: $cf_cv_pragma_unreferenced" >&5 + echo "$as_me:16800: 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). @@ -16599,7 +16850,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:16602: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:16853: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16641,7 +16892,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:16644: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:16895: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16666,7 +16917,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:16669: checking for library subsets" >&5 +echo "$as_me:16920: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -16707,7 +16958,7 @@ fi test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:16710: result: $LIB_SUBSETS" >&5 +echo "$as_me:16961: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -16745,7 +16996,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:16748: checking default library suffix" >&5 +echo "$as_me:16999: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -16756,10 +17007,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:16759: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:17010: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:16762: checking default library-dependency suffix" >&5 +echo "$as_me:17013: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -16812,10 +17063,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:16815: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:17066: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:16818: checking default object directory" >&5 +echo "$as_me:17069: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -16831,12 +17082,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:16834: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:17085: 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:16839: checking c++ library-dependency suffix" >&5 +echo "$as_me:17090: 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 @@ -16893,7 +17144,7 @@ else test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" fi -echo "$as_me:16896: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:17147: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -17048,12 +17299,12 @@ fi ;; esac -echo "$as_me:17051: checking where we will install curses.h" >&5 +echo "$as_me:17302: 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:17056: result: $includedir" >&5 +echo "$as_me:17307: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -17061,7 +17312,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:17064: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:17315: 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 @@ -17078,7 +17329,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:17081: checking for src modules" >&5 +echo "$as_me:17332: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -17141,7 +17392,7 @@ EOF fi fi done -echo "$as_me:17144: result: $cf_cv_src_modules" >&5 +echo "$as_me:17395: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -17239,8 +17490,8 @@ no) 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 + && 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" @@ -17255,6 +17506,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -17270,8 +17531,8 @@ yes) 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 + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -17294,18 +17555,18 @@ fi ### If we're building with rpath, try to link non-standard libs that way too. if test "$DFT_LWR_MODEL" = "shared"; then -echo "$as_me:17297: checking for updated LDFLAGS" >&5 +echo "$as_me:17558: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LDFLAGS" ; then -echo "$as_me:17300: result: maybe" >&5 +echo "$as_me:17561: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me-configure}:17304: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me-configure}:17565: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me-configure}:17308: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me-configure}:17569: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 case "$EXTRA_LDFLAGS" in #(vi -Wl,-rpath,*) #(vi @@ -17327,7 +17588,7 @@ if test -n "$cf_rpath_hack" ; then do test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 -echo "${as_me-configure}:17330: testing Filtering $cf_rpath_src ..." 1>&5 +echo "${as_me-configure}:17591: testing Filtering $cf_rpath_src ..." 1>&5 case $cf_rpath_src in #(vi -L*) #(vi @@ -17338,7 +17599,7 @@ echo "${as_me-configure}:17330: testing Filtering $cf_rpath_src ..." 1>&5 fi test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 -echo "${as_me-configure}:17341: testing ...Filter $cf_rpath_tmp ..." 1>&5 +echo "${as_me-configure}:17602: testing ...Filter $cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" ;; @@ -17348,15 +17609,15 @@ echo "${as_me-configure}:17341: testing ...Filter $cf_rpath_tmp ..." 1>&5 LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me-configure}:17351: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me-configure}:17612: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me-configure}:17355: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me-configure}:17616: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 fi else -echo "$as_me:17359: result: no" >&5 +echo "$as_me:17620: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17476,7 +17737,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:17479: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:17740: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -17652,7 +17913,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:17655: error: ambiguous option: $1 + { { echo "$as_me:17916: 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;} @@ -17671,7 +17932,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:17674: error: unrecognized option: $1 + -*) { { echo "$as_me:17935: 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;} @@ -17770,7 +18031,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:17773: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18034: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18164,7 +18425,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:18167: creating $ac_file" >&5 + { echo "$as_me:18428: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -18182,7 +18443,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:18185: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:18446: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18195,7 +18456,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18198: error: cannot find input file: $f" >&5 + { { echo "$as_me:18459: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18261,7 +18522,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:18264: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:18525: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -18272,7 +18533,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:18275: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:18536: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18285,7 +18546,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18288: error: cannot find input file: $f" >&5 + { { echo "$as_me:18549: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18343,7 +18604,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:18346: $ac_file is unchanged" >&5 + { echo "$as_me:18607: $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/dist.mk b/dist.mk index ed8939b3..67c0913c 100644 --- a/dist.mk +++ b/dist.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # +# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.739 2010/01/02 18:52:02 tom Exp $ +# $Id: dist.mk,v 1.741 2010/01/09 16:28:29 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 = 7 -NCURSES_PATCH = 20100102 +NCURSES_PATCH = 20100109 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -57,8 +57,7 @@ GNATHTML= `type -p gnathtml || type -p gnathtml.pl` # has the effect of lengthening the text portion of the page -- so man2html # would remove some text. The man program on Redhat 6.1 appears to work with # man2html if we set the top/bottom margins to 6 (the default is 7). Newer -# versions of 'man' on Linux leave no margin (and make it harder to sync with -# pages). +# versions of 'man' leave no margin (and make it harder to sync with pages). MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' ALL = ANNOUNCE doc/html/announce.html doc/ncurses-intro.doc doc/hackguide.doc manhtml adahtml diff --git a/doc/html/ada/funcs/C.htm b/doc/html/ada/funcs/C.htm index eba0274a..04646263 100644 --- a/doc/html/ada/funcs/C.htm +++ b/doc/html/ada/funcs/C.htm @@ -29,14 +29,14 @@
  • Copy_Arg
  • Count - terminal_interface-curses-forms.adb:774
  • Count - terminal_interface-curses-menus.adb:912 -
  • Create - terminal_interface-curses.ads:569 -
  • Create - terminal_interface-curses-forms.ads:293 -
  • Create - terminal_interface-curses-forms.ads:623
  • Create - terminal_interface-curses-forms-field_types-enumeration-ada.ads:48
  • Create - terminal_interface-curses-forms-field_types-enumeration.ads:64 +
  • Create - terminal_interface-curses-forms.ads:293 +
  • Create - terminal_interface-curses-forms.ads:623
  • Create - terminal_interface-curses-menus.ads:191
  • Create - terminal_interface-curses-menus.ads:638
  • Create - terminal_interface-curses-panels.ads:67 +
  • Create - terminal_interface-curses.ads:569
  • Current - terminal_interface-curses-forms.ads:729
  • Current - terminal_interface-curses-menus.ads:294
  • Current_Fld diff --git a/doc/html/ada/funcs/D.htm b/doc/html/ada/funcs/D.htm index ea426477..4003553b 100644 --- a/doc/html/ada/funcs/D.htm +++ b/doc/html/ada/funcs/D.htm @@ -16,12 +16,12 @@
  • Def_Shell_Mode
  • Delayoutput
  • Delay_Output -
  • Delete - terminal_interface-curses.ads:588
  • Delete - terminal_interface-curses-forms.ads:315
  • Delete - terminal_interface-curses-forms.ads:634
  • Delete - terminal_interface-curses-menus.ads:203
  • Delete - terminal_interface-curses-menus.ads:645
  • Delete - terminal_interface-curses-panels.ads:139 +
  • Delete - terminal_interface-curses.ads:588
  • Delete_Character - terminal_interface-curses.ads:1334
  • Delete_Character - terminal_interface-curses.ads:1339
  • Delete_Line @@ -38,8 +38,8 @@
  • Driver - terminal_interface-curses-forms.ads:711
  • Driver - terminal_interface-curses-menus.ads:660
  • Driver - terminal_interface-curses-menus.adb:973 -
  • Duplicate - terminal_interface-curses.ads:614
  • Duplicate - terminal_interface-curses-forms.ads:321 +
  • Duplicate - terminal_interface-curses.ads:614
  • Dupwin
  • Dup_Field
  • Dynamic_Info diff --git a/doc/html/ada/funcs/P.htm b/doc/html/ada/funcs/P.htm index 6f057c37..f781d9c0 100644 --- a/doc/html/ada/funcs/P.htm +++ b/doc/html/ada/funcs/P.htm @@ -31,10 +31,6 @@
  • Pos_Menu_Cursor
  • Prefresh
  • Prev_Router -
  • Put - terminal_interface-curses-text_io.ads:108 -
  • Put - terminal_interface-curses-text_io.ads:109 -
  • Put - terminal_interface-curses-text_io.ads:115 -
  • Put - terminal_interface-curses-text_io.ads:116
  • Put - terminal_interface-curses-text_io-complex_io.ads:54
  • Put - terminal_interface-curses-text_io-complex_io.ads:61
  • Put - terminal_interface-curses-text_io-decimal_io.ads:50 @@ -49,6 +45,10 @@
  • Put - terminal_interface-curses-text_io-integer_io.ads:55
  • Put - terminal_interface-curses-text_io-modular_io.ads:49
  • Put - terminal_interface-curses-text_io-modular_io.ads:55 +
  • Put - terminal_interface-curses-text_io.ads:108 +
  • Put - terminal_interface-curses-text_io.ads:109 +
  • Put - terminal_interface-curses-text_io.ads:115 +
  • Put - terminal_interface-curses-text_io.ads:116
  • putp
  • putwin
  • Put_Buf diff --git a/doc/html/ada/funcs/S.htm b/doc/html/ada/funcs/S.htm index 9b08e4f2..b3a542df 100644 --- a/doc/html/ada/funcs/S.htm +++ b/doc/html/ada/funcs/S.htm @@ -20,9 +20,9 @@
  • scr_init
  • scr_restore
  • scr_set -
  • Set_Background - terminal_interface-curses.ads:1108
  • Set_Background - terminal_interface-curses-forms.ads:446
  • Set_Background - terminal_interface-curses-menus.ads:443 +
  • Set_Background - terminal_interface-curses.ads:1108
  • Set_Buffer
  • Set_Cbreak_Mode
  • Set_Character_Attributes @@ -60,7 +60,6 @@
  • Set_Field_Userptr
  • Set_Fld_Buffer
  • Set_Fld_Status -
  • Set_Fld_Type - terminal_interface-curses-forms-field_types.adb:151
  • Set_Fld_Type - terminal_interface-curses-forms-field_types-alpha.adb:52
  • Set_Fld_Type - terminal_interface-curses-forms-field_types-alphanumeric.adb:52
  • Set_Fld_Type - terminal_interface-curses-forms-field_types-enumeration.adb:97 @@ -68,6 +67,7 @@
  • Set_Fld_Type - terminal_interface-curses-forms-field_types-ipv4_address.adb:52
  • Set_Fld_Type - terminal_interface-curses-forms-field_types-numeric.adb:55
  • Set_Fld_Type - terminal_interface-curses-forms-field_types-user.adb:53 +
  • Set_Fld_Type - terminal_interface-curses-forms-field_types.adb:151
  • Set_Flush_On_Interrupt_Mode
  • Set_Foreground - terminal_interface-curses-forms.ads:426
  • Set_Foreground - terminal_interface-curses-menus.ads:423 diff --git a/doc/html/ada/funcs/T.htm b/doc/html/ada/funcs/T.htm index bb8dea12..22401c4b 100644 --- a/doc/html/ada/funcs/T.htm +++ b/doc/html/ada/funcs/T.htm @@ -29,6 +29,8 @@
  • Touch - terminal_interface-curses.ads:1145
  • Touch_Soft_Label_Keys
  • tputs +
  • traceC +
  • tracef
  • Trace_On
  • Trace_Put
  • Transform diff --git a/doc/html/ada/main.htm b/doc/html/ada/main.htm index d850608c..701fe7d1 100644 --- a/doc/html/ada/main.htm +++ b/doc/html/ada/main.htm @@ -29,11 +29,7 @@
    You should start your browsing with one of these files: diff --git a/doc/html/ada/table.html b/doc/html/ada/table.html index ff6d0bd4..ce8d91f4 100644 --- a/doc/html/ada/table.html +++ b/doc/html/ada/table.html @@ -10,6 +10,8 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> + + @@ -22,15 +24,15 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> + - - - + + @@ -50,9 +52,9 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + @@ -64,9 +66,9 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + @@ -96,17 +98,17 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + - + @@ -132,9 +134,9 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + @@ -150,20 +152,19 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + - + + - - @@ -171,10 +172,10 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + @@ -208,9 +209,9 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + @@ -258,10 +259,10 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - - + + @@ -285,7 +286,6 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - @@ -295,16 +295,16 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + + - @@ -319,8 +319,8 @@ PUBLIC "-//IETF//DTD HTML 3.0//EN"> - + diff --git a/doc/html/ada/terminal_interface-curses-aux__adb.htm b/doc/html/ada/terminal_interface-curses-aux__adb.htm index 6b22ff8e..fda608af 100644 --- a/doc/html/ada/terminal_interface-curses-aux__adb.htm +++ b/doc/html/ada/terminal_interface-curses-aux__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,13 +40,13 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------packagebodyTerminal_Interface.Curses.Auxis---- Some helpers - procedureFill_String (Cp : in chars_ptr; + procedureFill_String (Cp : chars_ptr; Str : out String) is-- Fill the string with the characters referenced by the diff --git a/doc/html/ada/terminal_interface-curses-aux__ads.htm b/doc/html/ada/terminal_interface-curses-aux__ads.htm index f2160cd6..3441c5f6 100644 --- a/doc/html/ada/terminal_interface-curses-aux__ads.htm +++ b/doc/html/ada/terminal_interface-curses-aux__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.16 @ +-- @Revision: 1.17 @-- Binding Version 01.00-------------------------------------------------------------------------------- curses binding. @@ -48,22 +48,22 @@ -- Run the generator instead.-- |with System; -withInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; withUnchecked_Conversion; packageTerminal_Interface.Curses.Auxispragma Preelaborate (Terminal_Interface.Curses.Aux); - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; - subtypeC_IntisInterfaces.C.int; - subtypeC_ShortisInterfaces.C.short; - subtypeC_Long_IntisInterfaces.C.long; - subtypeC_Size_TisInterfaces.C.size_t; - subtypeC_UIntisInterfaces.C.unsigned; - subtypeC_ULongisInterfaces.C.unsigned_long; - subtypeC_Char_PtrisInterfaces.C.Strings.chars_ptr; + subtypeC_IntisInterfaces.C.int; + subtypeC_ShortisInterfaces.C.short; + subtypeC_Long_IntisInterfaces.C.long; + subtypeC_Size_TisInterfaces.C.size_t; + subtypeC_UIntisInterfaces.C.unsigned; + subtypeC_ULongisInterfaces.C.unsigned_long; + subtypeC_Char_PtrisInterfaces.C.Strings.chars_ptr; typeC_Void_Ptrisnew System.Address; typeC_ChtypeisnewC_ULong; typeC_AttrTypeisnewC_ULong; @@ -118,7 +118,7 @@ Unchecked_Conversion (Source => C_AttrType, Target => Attributed_Character); - procedureFill_String (Cp : in chars_ptr; + procedureFill_String (Cp : chars_ptr; Str : out String); -- Fill the Str parameter with the string denoted by the chars_ptr-- C-Style string. diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__adb.htm index dfb50a99..172fcee4 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.9 @ --- @Date: 2008/07/26 18:50:25 @ +-- @Revision: 1.10 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.Alphais - procedureSet_Field_Type (Fld : inField; - Typ : inAlpha_Field) + procedureSet_Field_Type (Fld : Field; + Typ : Alpha_Field) isC_Alpha_Field_Type : C_Field_Type; pragma Import (C, C_Alpha_Field_Type, "TYPE_ALPHA"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__ads.htm index 911a24c4..9a861b53 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-alpha__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------packageTerminal_Interface.Curses.Forms.Field_Types.Alphais @@ -51,8 +51,8 @@ Minimum_Field_Width : Natural := 0; endrecord; - procedureSet_Field_Type (Fld : inField; - Typ : inAlpha_Field); + procedureSet_Field_Type (Fld : Field; + Typ : Alpha_Field); pragma Inline (Set_Field_Type); endTerminal_Interface.Curses.Forms.Field_Types.Alpha; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__adb.htm index 6d9ff0d4..d47c8790 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.9 @ --- @Date: 2008/07/26 18:50:15 @ +-- @Revision: 1.10 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.AlphaNumericis - procedureSet_Field_Type (Fld : inField; - Typ : inAlphaNumeric_Field) + procedureSet_Field_Type (Fld : Field; + Typ : AlphaNumeric_Field) isC_AlphaNumeric_Field_Type : C_Field_Type; pragma Import (C, C_AlphaNumeric_Field_Type, "TYPE_ALNUM"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__ads.htm index 596eef2a..fb13c7c4 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------packageTerminal_Interface.Curses.Forms.Field_Types.AlphaNumericis @@ -52,8 +52,8 @@ Minimum_Field_Width : Natural := 0; endrecord; - procedureSet_Field_Type (Fld : inField; - Typ : inAlphaNumeric_Field); + procedureSet_Field_Type (Fld : Field; + Typ : AlphaNumeric_Field); pragma Inline (Set_Field_Type); endTerminal_Interface.Curses.Forms.Field_Types.AlphaNumeric; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm index 948aa3af..87721a22 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,12 +40,12 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.7 @ +-- @Revision: 1.8 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Unchecked_Deallocation; -withInterfaces.C; useInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C; useInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.Enumerationis @@ -93,8 +93,8 @@ Enum.Arr := null; endRelease; - procedureSet_Field_Type (Fld : inField; - Typ : inEnumeration_Field) + procedureSet_Field_Type (Fld : Field; + Typ : Enumeration_Field) isC_Enum_Type : C_Field_Type; pragma Import (C, C_Enum_Type, "TYPE_ENUM"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm index 1322bfe2..953ebbec 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,10 +40,10 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C.Strings; +withInterfaces.C.Strings; packageTerminal_Interface.Curses.Forms.Field_Types.Enumerationispragma Preelaborate @@ -86,12 +86,12 @@ -- The next type defintions are all ncurses extensions. They are typically-- not available in other curses implementations. - procedureSet_Field_Type (Fld : inField; - Typ : inEnumeration_Field); + procedureSet_Field_Type (Fld : Field; + Typ : Enumeration_Field); pragma Inline (Set_Field_Type); private - typeCPA_AccessisaccessInterfaces.C.Strings.chars_ptr_array; + typeCPA_AccessisaccessInterfaces.C.Strings.chars_ptr_array; typeEnumeration_FieldisnewField_Typewithrecord diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__adb.htm index 6bae1490..dbe6f6d0 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.9 @ --- @Date: 2008/07/26 18:50:06 @ +-- @Revision: 1.10 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.IntFieldis - procedureSet_Field_Type (Fld : inField; - Typ : inInteger_Field) + procedureSet_Field_Type (Fld : Field; + Typ : Integer_Field) isC_Integer_Field_Type : C_Field_Type; pragma Import (C, C_Integer_Field_Type, "TYPE_INTEGER"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__ads.htm index 7db8a141..86239785 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-intfield__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------packageTerminal_Interface.Curses.Forms.Field_Types.IntFieldis @@ -53,8 +53,8 @@ Upper_Limit : Integer; endrecord; - procedureSet_Field_Type (Fld : inField; - Typ : inInteger_Field); + procedureSet_Field_Type (Fld : Field; + Typ : Integer_Field); pragma Inline (Set_Field_Type); endTerminal_Interface.Curses.Forms.Field_Types.IntField; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__adb.htm index e684676d..e5a59877 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.9 @ --- @Date: 2008/07/26 18:49:47 @ +-- @Revision: 1.10 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.IPV4_Addressis - procedureSet_Field_Type (Fld : inField; - Typ : inInternet_V4_Address_Field) + procedureSet_Field_Type (Fld : Field; + Typ : Internet_V4_Address_Field) isC_IPV4_Field_Type : C_Field_Type; pragma Import (C, C_IPV4_Field_Type, "TYPE_IPV4"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__ads.htm index 57bae182..8f9e0510 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------packageTerminal_Interface.Curses.Forms.Field_Types.IPV4_Addressis @@ -49,8 +49,8 @@ typeInternet_V4_Address_FieldisnewField_Typewithnullrecord; - procedureSet_Field_Type (Fld : inField; - Typ : inInternet_V4_Address_Field); + procedureSet_Field_Type (Fld : Field; + Typ : Internet_V4_Address_Field); pragma Inline (Set_Field_Type); endTerminal_Interface.Curses.Forms.Field_Types.IPV4_Address; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__adb.htm index 115638ff..6b81cc57 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,19 +40,19 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ --- @Date: 2008/07/26 18:49:57 @ +-- @Revision: 1.11 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.Numericis - procedureSet_Field_Type (Fld : inField; - Typ : inNumeric_Field) + procedureSet_Field_Type (Fld : Field; + Typ : Numeric_Field) is - typeDoubleisnewInterfaces.C.double; + typeDoubleisnewInterfaces.C.double; C_Numeric_Field_Type : C_Field_Type; pragma Import (C, C_Numeric_Field_Type, "TYPE_NUMERIC"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__ads.htm index f2610732..e3f37a27 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-numeric__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------packageTerminal_Interface.Curses.Forms.Field_Types.Numericis @@ -53,8 +53,8 @@ Upper_Limit : Float; endrecord; - procedureSet_Field_Type (Fld : inField; - Typ : inNumeric_Field); + procedureSet_Field_Type (Fld : Field; + Typ : Numeric_Field); pragma Inline (Set_Field_Type); endTerminal_Interface.Curses.Forms.Field_Types.Numeric; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__adb.htm index 96269a7c..9bd3141d 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,18 +40,18 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.8 @ +-- @Revision: 1.9 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; useInterfaces.C; +withInterfaces.C; useInterfaces.C; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Forms.Field_Types.RegExpis - procedureSet_Field_Type (Fld : inField; - Typ : inRegular_Expression_Field) + procedureSet_Field_Type (Fld : Field; + Typ : Regular_Expression_Field) is - typeChar_PtrisaccessallInterfaces.C.char; + typeChar_PtrisaccessallInterfaces.C.char; C_Regexp_Field_Type : C_Field_Type; pragma Import (C, C_Regexp_Field_Type, "TYPE_REGEXP"); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__ads.htm index e54cb8ca..dd273dcb 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-regexp__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------packageTerminal_Interface.Curses.Forms.Field_Types.RegExpis @@ -53,8 +53,8 @@ Regular_Expression : String_Access; endrecord; - procedureSet_Field_Type (Fld : inField; - Typ : inRegular_Expression_Field); + procedureSet_Field_Type (Fld : Field; + Typ : Regular_Expression_Field); pragma Inline (Set_Field_Type); endTerminal_Interface.Curses.Forms.Field_Types.RegExp; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm index 7f39ab4a..f7126694 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm @@ -44,13 +44,13 @@ -- @Date: 2008/07/26 18:49:20 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; packageTerminal_Interface.Curses.Forms.Field_Types.User.Choiceispragma Preelaborate (Terminal_Interface.Curses.Forms.Field_Types.User.Choice); - subtypeC_IntisInterfaces.C.int; + subtypeC_IntisInterfaces.C.int; typeUser_Defined_Field_Type_With_ChoiceisabstractnewUser_Defined_Field_Typewithnullrecord; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm index 994307cc..26fa221d 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.15 @ --- @Date: 2008/07/26 18:49:28 @ +-- @Revision: 1.16 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Unchecked_Conversion; @@ -49,8 +49,8 @@ packagebodyTerminal_Interface.Curses.Forms.Field_Types.Useris - procedureSet_Field_Type (Fld : inField; - Typ : inUser_Defined_Field_Type) + procedureSet_Field_Type (Fld : Field; + Typ : User_Defined_Field_Type) isfunctionAllocate_Arg (T : User_Defined_Field_Type'Class) returnArgument_Access; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm index faa2fc9c..64c94dd7 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,15 +40,15 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.12 @ --- @Date: 2008/07/26 18:49:38 @ +-- @Revision: 1.13 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; packageTerminal_Interface.Curses.Forms.Field_Types.Userispragma Preelaborate (Terminal_Interface.Curses.Forms.Field_Types.User); - subtypeC_IntisInterfaces.C.int; + subtypeC_IntisInterfaces.C.int; typeUser_Defined_Field_TypeisabstractnewField_Typewithnullrecord; -- This is the root of the mechanism we use to create field types in @@ -72,8 +72,8 @@ -- If True is returned, the character is considered as valid for the-- field, otherwise as invalid. - procedureSet_Field_Type (Fld : inField; - Typ : inUser_Defined_Field_Type); + procedureSet_Field_Type (Fld : Field; + Typ : User_Defined_Field_Type); -- This should work for all types derived from User_Defined_Field_Type.-- No need to reimplement it for your derived type. diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm index 4af3ca44..0f11e4fa 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.20 @ --- @Date: 2008/07/26 18:50:33 @ +-- @Revision: 1.21 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; @@ -73,7 +73,7 @@ -- |-- |-- | - functionGet_Type (Fld : inField) returnField_Type_Access + functionGet_Type (Fld : Field) returnField_Type_AccessisLow_Level : constantC_Field_Type := Get_Fieldtype (Fld); Arg : Argument_Access; @@ -121,7 +121,7 @@ returnUsr; endCopy_Arg; - procedureFree_Arg (Usr : in System.Address) + procedureFree_Arg (Usr : System.Address) isprocedure Free_Type isnew Ada.Unchecked_Deallocation (Field_Type'Class, Field_Type_Access); diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm index 03220c56..02d74513 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,15 +40,15 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.14 @ +-- @Revision: 1.15 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; packageTerminal_Interface.Curses.Forms.Field_Typesispragma Preelaborate (Terminal_Interface.Curses.Forms.Field_Types); - usetypeInterfaces.C.int; - subtypeC_IntisInterfaces.C.int; + usetypeInterfaces.C.int; + subtypeC_IntisInterfaces.C.int; -- |=====================================================================-- | Man page form_fieldtype.3x @@ -68,8 +68,8 @@ typeField_Type_AccessisaccessallField_Type'Class; -- #1A NAME="AFU_1"#2| - procedureSet_Field_Type (Fld : inField; - Fld_Type : inField_Type) isabstract; + procedureSet_Field_Type (Fld : Field; + Fld_Type : Field_Type) isabstract; -- AKA: set_field_type()-- But: we hide the vararg mechanism of the C interface. You always-- have to pass a single Field_Type parameter. @@ -81,7 +81,7 @@ -- |=====================================================================-- #1A NAME="AFU_2"#2| - functionGet_Type (Fld : inField) returnField_Type_Access; + functionGet_Type (Fld : Field) returnField_Type_Access; -- AKA: field_type()-- AKA: field_arg()-- In Ada95 we can combine these. If you try to retrieve the field type @@ -123,8 +123,8 @@ -- |typeLow_Level_Field_Typeisrecord - Status : Interfaces.C.short; - Ref_Count : Interfaces.C.long; + Status : Interfaces.C.short; + Ref_Count : Interfaces.C.long; Left, Right : System.Address; Makearg : Makearg_Function; Copyarg : Copyarg_Function; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_user_data__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_user_data__adb.htm index 6bf72eb5..b556d976 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_user_data__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_user_data__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.12 @ +-- @Revision: 1.13 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; @@ -54,10 +54,10 @@ -- |-- |-- | - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; - procedureSet_User_Data (Fld : inField; - Data : inUser_Access) + procedureSet_User_Data (Fld : Field; + Data : User_Access) isfunctionSet_Field_Userptr (Fld : Field; Usr : User_Access) returnC_Int; @@ -72,7 +72,7 @@ -- |-- |-- | - functionGet_User_Data (Fld : inField) returnUser_Access + functionGet_User_Data (Fld : Field) returnUser_AccessisfunctionField_Userptr (Fld : Field) returnUser_Access; pragma Import (C, Field_Userptr, "field_userptr"); @@ -80,7 +80,7 @@ returnField_Userptr (Fld); endGet_User_Data; - procedureGet_User_Data (Fld : inField; + procedureGet_User_Data (Fld : Field; Data : outUser_Access) isbegin diff --git a/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm index 16f88510..07237801 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.15 @ +-- @Revision: 1.16 @-- Binding Version 01.00------------------------------------------------------------------------------ @@ -55,18 +55,18 @@ -- |=====================================================================-- #1A NAME="AFU_1"#2| - procedureSet_User_Data (Fld : inField; - Data : inUser_Access); + procedureSet_User_Data (Fld : Field; + Data : User_Access); -- AKA: set_field_userptrpragma Inline (Set_User_Data); -- #1A NAME="AFU_2"#2| - procedureGet_User_Data (Fld : inField; + procedureGet_User_Data (Fld : Field; Data : outUser_Access); -- AKA: field_userptr-- #1A NAME="AFU_3"#2| - functionGet_User_Data (Fld : inField) returnUser_Access; + functionGet_User_Data (Fld : Field) returnUser_Access; -- AKA: field_userptr-- Sama as functionpragma Inline (Get_User_Data); diff --git a/doc/html/ada/terminal_interface-curses-forms-form_user_data__adb.htm b/doc/html/ada/terminal_interface-curses-forms-form_user_data__adb.htm index 51b72885..09a441e8 100644 --- a/doc/html/ada/terminal_interface-curses-forms-form_user_data__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-form_user_data__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.12 @ +-- @Revision: 1.13 @-- Binding Version 01.00-------------------------------------------------------------------------------- | @@ -52,13 +52,13 @@ packagebodyTerminal_Interface.Curses.Forms.Form_User_Datais - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; -- |-- |-- | - procedureSet_User_Data (Frm : inForm; - Data : inUser_Access) + procedureSet_User_Data (Frm : Form; + Data : User_Access) isfunctionSet_Form_Userptr (Frm : Form; Data : User_Access) returnC_Int; @@ -73,7 +73,7 @@ -- |-- |-- | - functionGet_User_Data (Frm : inForm) returnUser_Access + functionGet_User_Data (Frm : Form) returnUser_AccessisfunctionForm_Userptr (Frm : Form) returnUser_Access; pragma Import (C, Form_Userptr, "form_userptr"); @@ -81,7 +81,7 @@ returnForm_Userptr (Frm); endGet_User_Data; - procedureGet_User_Data (Frm : inForm; + procedureGet_User_Data (Frm : Form; Data : outUser_Access) isbegin diff --git a/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm b/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm index 89b3220c..bc0be4c0 100644 --- a/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.14 @ +-- @Revision: 1.15 @-- Binding Version 01.00------------------------------------------------------------------------------ @@ -55,18 +55,18 @@ -- |=====================================================================-- #1A NAME="AFU_1"#2| - procedureSet_User_Data (Frm : inForm; - Data : inUser_Access); + procedureSet_User_Data (Frm : Form; + Data : User_Access); -- AKA: set_form_userptrpragma Inline (Set_User_Data); -- #1A NAME="AFU_2"#2| - procedureGet_User_Data (Frm : inForm; + procedureGet_User_Data (Frm : Form; Data : outUser_Access); -- AKA: form_userptr-- #1A NAME="AFU_3"#2| - functionGet_User_Data (Frm : inForm) returnUser_Access; + functionGet_User_Data (Frm : Form) returnUser_Access; -- AKA: form_userptr-- Same as functionpragma Inline (Get_User_Data); diff --git a/doc/html/ada/terminal_interface-curses-forms__adb.htm b/doc/html/ada/terminal_interface-curses-forms__adb.htm index 39f6467b..0db8b031 100644 --- a/doc/html/ada/terminal_interface-curses-forms__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2004,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.26 @ --- @Date: 2008/07/26 18:50:44 @ +-- @Revision: 1.27 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Unchecked_Deallocation; with Ada.Unchecked_Conversion; -withInterfaces.C; useInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; -withInterfaces.C.Pointers; +withInterfaces.C; useInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C.Pointers; withTerminal_Interface.Curses.Aux; @@ -59,7 +59,7 @@ type C_Field_Array isarray (Natural range <>) ofaliasedField; package F_Array isnew - Interfaces.C.Pointers (Natural, Field, C_Field_Array, Null_Field); + Interfaces.C.Pointers (Natural, Field, C_Field_Array, Null_Field); -------------------------------------------------------------------------------- | @@ -83,7 +83,7 @@ Ada.Unchecked_Conversion (C_Int, Form_Option_Set); - procedureRequest_Name (Key : inForm_Request_Code; + procedureRequest_Name (Key : Form_Request_Code; Name : out String) isfunctionForm_Request_Name (Key : C_Int) return chars_ptr; @@ -195,8 +195,8 @@ -- |-- |-- | - procedureSet_Justification (Fld : inField; - Just : inField_Justification := None) + procedureSet_Justification (Fld : Field; + Just : Field_Justification := None) isfunctionSet_Field_Just (Fld : Field; Just : C_Int) returnC_Int; @@ -228,11 +228,11 @@ -- |-- |procedureSet_Buffer - (Fld : inField; - Buffer : inBuffer_Number := Buffer_Number'First; - Str : in String) + (Fld : Field; + Buffer : Buffer_Number := Buffer_Number'First; + Str : String) is - typeChar_PtrisaccessallInterfaces.C.char; + typeChar_PtrisaccessallInterfaces.C.char; functionSet_Fld_Buffer (Fld : Field; Bufnum : C_Int; S : Char_Ptr) @@ -253,8 +253,8 @@ -- |-- |procedureGet_Buffer - (Fld : inField; - Buffer : inBuffer_Number := Buffer_Number'First; + (Fld : Field; + Buffer : Buffer_Number := Buffer_Number'First; Str : out String) isfunctionField_Buffer (Fld : Field; @@ -265,8 +265,8 @@ endGet_Buffer; functionGet_Buffer - (Fld : inField; - Buffer : inBuffer_Number := Buffer_Number'First) return String + (Fld : Field; + Buffer : Buffer_Number := Buffer_Number'First) return String isfunctionField_Buffer (Fld : Field; B : C_Int) return chars_ptr; @@ -277,8 +277,8 @@ -- |-- |-- | - procedureSet_Status (Fld : inField; - Status : in Boolean := True) + procedureSet_Status (Fld : Field; + Status : Boolean := True) isfunctionSet_Fld_Status (Fld : Field; St : C_Int) returnC_Int; @@ -309,8 +309,8 @@ -- |-- |-- | - procedureSet_Maximum_Size (Fld : inField; - Max : in Natural := 0) + procedureSet_Maximum_Size (Fld : Field; + Max : Natural := 0) isfunctionSet_Field_Max (Fld : Field; M : C_Int) returnC_Int; @@ -329,8 +329,8 @@ -- |-- |-- | - procedureSet_Options (Fld : inField; - Options : inField_Option_Set) + procedureSet_Options (Fld : Field; + Options : Field_Option_Set) isfunctionSet_Field_Opts (Fld : Field; Opt : C_Int) returnC_Int; @@ -347,8 +347,8 @@ -- |-- |-- | - procedureSwitch_Options (Fld : inField; - Options : inField_Option_Set; + procedureSwitch_Options (Fld : Field; + Options : Field_Option_Set; On : Boolean := True) isfunctionField_Opts_On (Fld : Field; @@ -373,7 +373,7 @@ -- |-- |-- | - procedureGet_Options (Fld : inField; + procedureGet_Options (Fld : Field; Options : outField_Option_Set) isfunctionField_Opts (Fld : Field) returnC_Int; @@ -402,9 +402,9 @@ -- |-- |procedureSet_Foreground - (Fld : inField; - Fore : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Fld : Field; + Fore : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionSet_Field_Fore (Fld : Field; Attr : C_Chtype) returnC_Int; @@ -423,7 +423,7 @@ -- |-- |-- | - procedureForeground (Fld : inField; + procedureForeground (Fld : Field; Fore : outCharacter_Attribute_Set) isfunctionField_Fore (Fld : Field) returnC_Chtype; @@ -432,7 +432,7 @@ Fore := Chtype_To_AttrChar (Field_Fore (Fld)).Attr; endForeground; - procedureForeground (Fld : inField; + procedureForeground (Fld : Field; Fore : outCharacter_Attribute_Set; Color : outColor_Pair) is @@ -446,9 +446,9 @@ -- |-- |procedureSet_Background - (Fld : inField; - Back : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Fld : Field; + Back : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionSet_Field_Back (Fld : Field; Attr : C_Chtype) returnC_Int; @@ -467,7 +467,7 @@ -- |-- |-- | - procedureBackground (Fld : inField; + procedureBackground (Fld : Field; Back : outCharacter_Attribute_Set) isfunctionField_Back (Fld : Field) returnC_Chtype; @@ -476,7 +476,7 @@ Back := Chtype_To_AttrChar (Field_Back (Fld)).Attr; endBackground; - procedureBackground (Fld : inField; + procedureBackground (Fld : Field; Back : outCharacter_Attribute_Set; Color : outColor_Pair) is @@ -489,8 +489,8 @@ -- |-- |-- | - procedureSet_Pad_Character (Fld : inField; - Pad : in Character := Space) + procedureSet_Pad_Character (Fld : Field; + Pad : Character := Space) isfunctionSet_Field_Pad (Fld : Field; Ch : C_Int) returnC_Int; @@ -506,7 +506,7 @@ -- |-- |-- | - procedurePad_Character (Fld : inField; + procedurePad_Character (Fld : Field; Pad : out Character) isfunctionField_Pad (Fld : Field) returnC_Int; @@ -521,7 +521,7 @@ -- |-- |-- | - procedureInfo (Fld : inField; + procedureInfo (Fld : Field; Lines : outLine_Count; Columns : outColumn_Count; First_Row : outLine_Position; @@ -555,7 +555,7 @@ -- |-- |-- | - procedureDynamic_Info (Fld : inField; + procedureDynamic_Info (Fld : Field; Lines : outLine_Count; Columns : outColumn_Count; Max : out Natural) @@ -584,8 +584,8 @@ -- |-- |-- | - procedureSet_Window (Frm : inForm; - Win : inWindow) + procedureSet_Window (Frm : Form; + Win : Window) isfunctionSet_Form_Win (Frm : Form; Win : Window) returnC_Int; @@ -612,8 +612,8 @@ -- |-- |-- | - procedureSet_Sub_Window (Frm : inForm; - Win : inWindow) + procedureSet_Sub_Window (Frm : Form; + Win : Window) isfunctionSet_Form_Sub (Frm : Form; Win : Window) returnC_Int; @@ -640,7 +640,7 @@ -- |-- |-- | - procedureScale (Frm : inForm; + procedureScale (Frm : Form; Lines : outLine_Count; Columns : outColumn_Count) is @@ -664,8 +664,8 @@ -- |-- |-- | - procedureSet_Field_Init_Hook (Frm : inForm; - Proc : inForm_Hook_Function) + procedureSet_Field_Init_Hook (Frm : Form; + Proc : Form_Hook_Function) isfunctionSet_Field_Init (Frm : Form; Proc : Form_Hook_Function) returnC_Int; @@ -680,8 +680,8 @@ -- |-- |-- | - procedureSet_Field_Term_Hook (Frm : inForm; - Proc : inForm_Hook_Function) + procedureSet_Field_Term_Hook (Frm : Form; + Proc : Form_Hook_Function) isfunctionSet_Field_Term (Frm : Form; Proc : Form_Hook_Function) returnC_Int; @@ -696,8 +696,8 @@ -- |-- |-- | - procedureSet_Form_Init_Hook (Frm : inForm; - Proc : inForm_Hook_Function) + procedureSet_Form_Init_Hook (Frm : Form; + Proc : Form_Hook_Function) isfunctionSet_Form_Init (Frm : Form; Proc : Form_Hook_Function) returnC_Int; @@ -712,8 +712,8 @@ -- |-- |-- | - procedureSet_Form_Term_Hook (Frm : inForm; - Proc : inForm_Hook_Function) + procedureSet_Form_Term_Hook (Frm : Form; + Proc : Form_Hook_Function) isfunctionSet_Form_Term (Frm : Form; Proc : Form_Hook_Function) returnC_Int; @@ -732,8 +732,8 @@ -- |-- |-- | - procedureRedefine (Frm : inForm; - Flds : inField_Array_Access) + procedureRedefine (Frm : Form; + Flds : Field_Array_Access) isfunctionSet_Frm_Fields (Frm : Form; Items : System.Address) returnC_Int; @@ -784,9 +784,9 @@ -- |-- |-- | - procedureMove (Fld : inField; - Line : inLine_Position; - Column : inColumn_Position) + procedureMove (Fld : Field; + Line : Line_Position; + Column : Column_Position) isfunctionMove (Fld : Field; L, C : C_Int) returnC_Int; pragma Import (C, Move, "move_field"); @@ -844,8 +844,8 @@ -- |-- |-- | - procedureSet_Options (Frm : inForm; - Options : inForm_Option_Set) + procedureSet_Options (Frm : Form; + Options : Form_Option_Set) isfunctionSet_Form_Opts (Frm : Form; Opt : C_Int) returnC_Int; @@ -862,8 +862,8 @@ -- |-- |-- | - procedureSwitch_Options (Frm : inForm; - Options : inForm_Option_Set; + procedureSwitch_Options (Frm : Form; + Options : Form_Option_Set; On : Boolean := True) isfunctionForm_Opts_On (Frm : Form; @@ -888,7 +888,7 @@ -- |-- |-- | - procedureGet_Options (Frm : inForm; + procedureGet_Options (Frm : Form; Options : outForm_Option_Set) isfunctionForm_Opts (Frm : Form) returnC_Int; @@ -915,8 +915,8 @@ -- |-- |-- | - procedurePost (Frm : inForm; - Post : in Boolean := True) + procedurePost (Frm : Form; + Post : Boolean := True) isfunctionM_Post (Frm : Form) returnC_Int; pragma Import (C, M_Post, "post_form"); @@ -1025,8 +1025,8 @@ -- |-- |-- | - procedureSet_Current (Frm : inForm; - Fld : inField) + procedureSet_Current (Frm : Form; + Fld : Field) isfunctionSet_Current_Fld (Frm : Form; Fld : Field) returnC_Int; pragma Import (C, Set_Current_Fld, "set_current_field"); @@ -1040,7 +1040,7 @@ -- |-- |-- | - functionCurrent (Frm : inForm) returnField + functionCurrent (Frm : Form) returnFieldisfunctionCurrent_Fld (Frm : Form) returnField; pragma Import (C, Current_Fld, "current_field"); @@ -1055,8 +1055,8 @@ -- |-- |-- | - procedureSet_Page (Frm : inForm; - Page : inPage_Number := Page_Number'First) + procedureSet_Page (Frm : Form; + Page : Page_Number := Page_Number'First) isfunctionSet_Frm_Page (Frm : Form; Pg : C_Int) returnC_Int; pragma Import (C, Set_Frm_Page, "set_form_page"); @@ -1104,8 +1104,8 @@ -- |-- |-- | - procedureSet_New_Page (Fld : inField; - New_Page : in Boolean := True) + procedureSet_New_Page (Fld : Field; + New_Page : Boolean := True) isfunctionSet_Page (Fld : Field; Flg : C_Int) returnC_Int; pragma Import (C, Set_Page, "set_new_page"); @@ -1134,7 +1134,7 @@ endIs_New_Page; procedureFree (FA : inoutField_Array_Access; - Free_Fields : in Boolean := False) + Free_Fields : Boolean := False) isprocedure Release isnew Ada.Unchecked_Deallocation (Field_Array, Field_Array_Access); diff --git a/doc/html/ada/terminal_interface-curses-forms__ads.htm b/doc/html/ada/terminal_interface-curses-forms__ads.htm index 2a9a5b27..0d798db4 100644 --- a/doc/html/ada/terminal_interface-curses-forms__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.29 @ --- @Date: 2006/06/25 14:30:21 @ +-- @Revision: 1.30 @ +-- @Date: 2009/12/26 17:31:35 @-- Binding Version 01.00-------------------------------------------------------------------------------- form binding. @@ -139,7 +139,7 @@ typeField_Array_Accessisaccess Field_Array; procedureFree (FA : inoutField_Array_Access; - Free_Fields : in Boolean := False); + Free_Fields : Boolean := False); -- Release the memory for an allocated field array-- If Free_Fields is True, call Delete() for all the fields in-- the array. @@ -278,7 +278,7 @@ REQ_NEXT_CHOICE : Form_Request_CoderenamesF_Next_Choice; REQ_PREV_CHOICE : Form_Request_CoderenamesF_Previous_Choice; - procedureRequest_Name (Key : inForm_Request_Code; + procedureRequest_Name (Key : Form_Request_Code; Name : out String); functionRequest_Name (Key : Form_Request_Code) return String; @@ -341,8 +341,8 @@ -- |=====================================================================-- #1A NAME="AFU_6"#2| - procedureSet_Justification (Fld : inField; - Just : inField_Justification := None); + procedureSet_Justification (Fld : Field; + Just : Field_Justification := None); -- AKA: set_field_just()pragma Inline (Set_Justification); @@ -357,29 +357,29 @@ -- #1A NAME="AFU_8"#2|procedureSet_Buffer - (Fld : inField; - Buffer : inBuffer_Number := Buffer_Number'First; - Str : in String); + (Fld : Field; + Buffer : Buffer_Number := Buffer_Number'First; + Str : String); -- AKA: set_field_buffer()-- Not inlined-- #1A NAME="AFU_9"#2|procedureGet_Buffer - (Fld : inField; - Buffer : inBuffer_Number := Buffer_Number'First; + (Fld : Field; + Buffer : Buffer_Number := Buffer_Number'First; Str : out String); -- AKA: field_buffer()functionGet_Buffer - (Fld : inField; - Buffer : inBuffer_Number := Buffer_Number'First) return String; + (Fld : Field; + Buffer : Buffer_Number := Buffer_Number'First) return String; -- AKA: field_buffer()-- Same but as functionpragma Inline (Get_Buffer); -- #1A NAME="AFU_10"#2| - procedureSet_Status (Fld : inField; - Status : in Boolean := True); + procedureSet_Status (Fld : Field; + Status : Boolean := True); -- AKA: set_field_status()pragma Inline (Set_Status); @@ -389,8 +389,8 @@ pragma Inline (Changed); -- #1A NAME="AFU_12"#2| - procedureSet_Maximum_Size (Fld : inField; - Max : in Natural := 0); + procedureSet_Maximum_Size (Fld : Field; + Max : Natural := 0); -- AKA: set_field_max()pragma Inline (Set_Maximum_Size); @@ -399,21 +399,21 @@ -- |=====================================================================-- #1A NAME="AFU_13"#2| - procedureSet_Options (Fld : inField; - Options : inField_Option_Set); + procedureSet_Options (Fld : Field; + Options : Field_Option_Set); -- AKA: set_field_opts()-- An overloaded version is defined later. Pragma Inline appears there-- #1A NAME="AFU_14"#2| - procedureSwitch_Options (Fld : inField; - Options : inField_Option_Set; + procedureSwitch_Options (Fld : Field; + Options : Field_Option_Set; On : Boolean := True); -- AKA: field_opts_on()-- AKA: field_opts_off()-- An overloaded version is defined later. Pragma Inline appears there-- #1A NAME="AFU_15"#2| - procedureGet_Options (Fld : inField; + procedureGet_Options (Fld : Field; Options : outField_Option_Set); -- AKA: field_opts() @@ -429,19 +429,19 @@ -- #1A NAME="AFU_17"#2|procedureSet_Foreground - (Fld : inField; - Fore : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Fld : Field; + Fore : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: set_field_fore()pragma Inline (Set_Foreground); -- #1A NAME="AFU_18"#2| - procedureForeground (Fld : inField; + procedureForeground (Fld : Field; Fore : outCharacter_Attribute_Set); -- AKA: field_fore()-- #1A NAME="AFU_19"#2| - procedureForeground (Fld : inField; + procedureForeground (Fld : Field; Fore : outCharacter_Attribute_Set; Color : outColor_Pair); -- AKA: field_fore() @@ -449,32 +449,32 @@ -- #1A NAME="AFU_20"#2|procedureSet_Background - (Fld : inField; - Back : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Fld : Field; + Back : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: set_field_back()pragma Inline (Set_Background); -- #1A NAME="AFU_21"#2| - procedureBackground (Fld : inField; + procedureBackground (Fld : Field; Back : outCharacter_Attribute_Set); -- AKA: field_back()-- #1A NAME="AFU_22"#2| - procedureBackground (Fld : inField; + procedureBackground (Fld : Field; Back : outCharacter_Attribute_Set; Color : outColor_Pair); -- AKA: field_back()pragma Inline (Background); -- #1A NAME="AFU_23"#2| - procedureSet_Pad_Character (Fld : inField; - Pad : in Character := Space); + procedureSet_Pad_Character (Fld : Field; + Pad : Character := Space); -- AKA: set_field_pad()pragma Inline (Set_Pad_Character); -- #1A NAME="AFU_24"#2| - procedurePad_Character (Fld : inField; + procedurePad_Character (Fld : Field; Pad : out Character); -- AKA: field_pad()pragma Inline (Pad_Character); @@ -484,7 +484,7 @@ -- |=====================================================================-- #1A NAME="AFU_25"#2| - procedureInfo (Fld : inField; + procedureInfo (Fld : Field; Lines : outLine_Count; Columns : outColumn_Count; First_Row : outLine_Position; @@ -495,7 +495,7 @@ pragma Inline (Info); -- #1A NAME="AFU_26"#2| - procedureDynamic_Info (Fld : inField; + procedureDynamic_Info (Fld : Field; Lines : outLine_Count; Columns : outColumn_Count; Max : out Natural); @@ -507,8 +507,8 @@ -- |=====================================================================-- #1A NAME="AFU_27"#2| - procedureSet_Window (Frm : inForm; - Win : inWindow); + procedureSet_Window (Frm : Form; + Win : Window); -- AKA: set_form_win()pragma Inline (Set_Window); @@ -518,8 +518,8 @@ pragma Inline (Get_Window); -- #1A NAME="AFU_29"#2| - procedureSet_Sub_Window (Frm : inForm; - Win : inWindow); + procedureSet_Sub_Window (Frm : Form; + Win : Window); -- AKA: set_form_sub()pragma Inline (Set_Sub_Window); @@ -529,7 +529,7 @@ pragma Inline (Get_Sub_Window); -- #1A NAME="AFU_31"#2| - procedureScale (Frm : inForm; + procedureScale (Frm : Form; Lines : outLine_Count; Columns : outColumn_Count); -- AKA: scale_form() @@ -539,30 +539,30 @@ -- | Man page form_hook.3x-- |===================================================================== - typeForm_Hook_Functionisaccessprocedure (Frm : inForm); + typeForm_Hook_Functionisaccessprocedure (Frm : Form); pragma Convention (C, Form_Hook_Function); -- #1A NAME="AFU_32"#2| - procedureSet_Field_Init_Hook (Frm : inForm; - Proc : inForm_Hook_Function); + procedureSet_Field_Init_Hook (Frm : Form; + Proc : Form_Hook_Function); -- AKA: set_field_init()pragma Inline (Set_Field_Init_Hook); -- #1A NAME="AFU_33"#2| - procedureSet_Field_Term_Hook (Frm : inForm; - Proc : inForm_Hook_Function); + procedureSet_Field_Term_Hook (Frm : Form; + Proc : Form_Hook_Function); -- AKA: set_field_term()pragma Inline (Set_Field_Term_Hook); -- #1A NAME="AFU_34"#2| - procedureSet_Form_Init_Hook (Frm : inForm; - Proc : inForm_Hook_Function); + procedureSet_Form_Init_Hook (Frm : Form; + Proc : Form_Hook_Function); -- AKA: set_form_init()pragma Inline (Set_Form_Init_Hook); -- #1A NAME="AFU_35"#2| - procedureSet_Form_Term_Hook (Frm : inForm; - Proc : inForm_Hook_Function); + procedureSet_Form_Term_Hook (Frm : Form; + Proc : Form_Hook_Function); -- AKA: set_form_term()pragma Inline (Set_Form_Term_Hook); @@ -591,14 +591,14 @@ -- |=====================================================================-- #1A NAME="AFU_40"#2| - procedureRedefine (Frm : inForm; - Flds : inField_Array_Access); + procedureRedefine (Frm : Form; + Flds : Field_Array_Access); -- AKA: set_form_fields()pragma Inline (Redefine); -- #1A NAME="AFU_41"#2| - procedureSet_Fields (Frm : inForm; - Flds : inField_Array_Access) renamesRedefine; + procedureSet_Fields (Frm : Form; + Flds : Field_Array_Access) renamesRedefine; -- AKA: set_form_fields()-- pragma Inline (Set_Fields); @@ -614,9 +614,9 @@ pragma Inline (Field_Count); -- #1A NAME="AFU_44"#2| - procedureMove (Fld : inField; - Line : inLine_Position; - Column : inColumn_Position); + procedureMove (Fld : Field; + Line : Line_Position; + Column : Column_Position); -- AKA: move_field()pragma Inline (Move); @@ -646,21 +646,21 @@ -- |=====================================================================-- #1A NAME="AFU_48"#2| - procedureSet_Options (Frm : inForm; - Options : inForm_Option_Set); + procedureSet_Options (Frm : Form; + Options : Form_Option_Set); -- AKA: set_form_opts()pragma Inline (Set_Options); -- #1A NAME="AFU_49"#2| - procedureSwitch_Options (Frm : inForm; - Options : inForm_Option_Set; + procedureSwitch_Options (Frm : Form; + Options : Form_Option_Set; On : Boolean := True); -- AKA: form_opts_on()-- AKA: form_opts_off()pragma Inline (Switch_Options); -- #1A NAME="AFU_50"#2| - procedureGet_Options (Frm : inForm; + procedureGet_Options (Frm : Form; Options : outForm_Option_Set); -- AKA: form_opts() @@ -674,8 +674,8 @@ -- |=====================================================================-- #1A NAME="AFU_52"#2| - procedurePost (Frm : inForm; - Post : in Boolean := True); + procedurePost (Frm : Form; + Post : Boolean := True); -- AKA: post_form()-- AKA: unpost_form()pragma Inline (Post); @@ -725,19 +725,19 @@ typePage_Numberisnew Natural; -- #1A NAME="AFU_57"#2| - procedureSet_Current (Frm : inForm; - Fld : inField); + procedureSet_Current (Frm : Form; + Fld : Field); -- AKA: set_current_field()pragma Inline (Set_Current); -- #1A NAME="AFU_58"#2| - functionCurrent (Frm : inForm) returnField; + functionCurrent (Frm : Form) returnField; -- AKA: current_field()pragma Inline (Current); -- #1A NAME="AFU_59"#2| - procedureSet_Page (Frm : inForm; - Page : inPage_Number := Page_Number'First); + procedureSet_Page (Frm : Form; + Page : Page_Number := Page_Number'First); -- AKA: set_form_page()pragma Inline (Set_Page); @@ -759,8 +759,8 @@ -- |=====================================================================-- #1A NAME="AFU_62"#2| - procedureSet_New_Page (Fld : inField; - New_Page : in Boolean := True); + procedureSet_New_Page (Fld : Field; + New_Page : Boolean := True); -- AKA: set_new_page()pragma Inline (Set_New_Page); diff --git a/doc/html/ada/terminal_interface-curses-menus-item_user_data__adb.htm b/doc/html/ada/terminal_interface-curses-menus-item_user_data__adb.htm index b4d3b02c..a630674e 100644 --- a/doc/html/ada/terminal_interface-curses-menus-item_user_data__adb.htm +++ b/doc/html/ada/terminal_interface-curses-menus-item_user_data__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,18 +40,18 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Menus.Item_User_Datais - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; - procedureSet_User_Data (Itm : inItem; - Data : inUser_Access) + procedureSet_User_Data (Itm : Item; + Data : User_Access) isfunctionSet_Item_Userptr (Itm : Item; Addr : User_Access) returnC_Int; @@ -64,7 +64,7 @@ endif; endSet_User_Data; - functionGet_User_Data (Itm : inItem) returnUser_Access + functionGet_User_Data (Itm : Item) returnUser_AccessisfunctionItem_Userptr (Itm : Item) returnUser_Access; pragma Import (C, Item_Userptr, "item_userptr"); @@ -72,7 +72,7 @@ returnItem_Userptr (Itm); endGet_User_Data; - procedureGet_User_Data (Itm : inItem; + procedureGet_User_Data (Itm : Item; Data : outUser_Access) isbegin diff --git a/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm b/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm index f5a067f2..8614e20a 100644 --- a/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm +++ b/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.16 @ --- @Date: 2006/06/25 14:30:22 @ +-- @Revision: 1.17 @ +-- @Date: 2009/12/26 17:31:35 @-- Binding Version 01.00------------------------------------------------------------------------------ @@ -60,18 +60,18 @@ -- |=====================================================================-- #1A NAME="AFU_1"#2| - procedureSet_User_Data (Itm : inItem; - Data : inUser_Access); + procedureSet_User_Data (Itm : Item; + Data : User_Access); -- AKA: set_item_userptrpragma Inline (Set_User_Data); -- #1A NAME="AFU_2"#2| - procedureGet_User_Data (Itm : inItem; + procedureGet_User_Data (Itm : Item; Data : outUser_Access); -- AKA: item_userptr-- #1A NAME="AFU_3"#2| - functionGet_User_Data (Itm : inItem) returnUser_Access; + functionGet_User_Data (Itm : Item) returnUser_Access; -- AKA: item_userptr-- Same as functionpragma Inline (Get_User_Data); diff --git a/doc/html/ada/terminal_interface-curses-menus-menu_user_data__adb.htm b/doc/html/ada/terminal_interface-curses-menus-menu_user_data__adb.htm index 67d6e94f..7c0587a3 100644 --- a/doc/html/ada/terminal_interface-curses-menus-menu_user_data__adb.htm +++ b/doc/html/ada/terminal_interface-curses-menus-menu_user_data__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,17 +40,17 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.12 @ +-- @Revision: 1.13 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.Menus.Menu_User_Datais - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; - procedureSet_User_Data (Men : inMenu; - Data : inUser_Access) + procedureSet_User_Data (Men : Menu; + Data : User_Access) isfunctionSet_Menu_Userptr (Men : Menu; Data : User_Access) returnC_Int; @@ -63,7 +63,7 @@ endif; endSet_User_Data; - functionGet_User_Data (Men : inMenu) returnUser_Access + functionGet_User_Data (Men : Menu) returnUser_AccessisfunctionMenu_Userptr (Men : Menu) returnUser_Access; pragma Import (C, Menu_Userptr, "menu_userptr"); @@ -71,7 +71,7 @@ returnMenu_Userptr (Men); endGet_User_Data; - procedureGet_User_Data (Men : inMenu; + procedureGet_User_Data (Men : Menu; Data : outUser_Access) isbegin diff --git a/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm b/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm index 21133553..72276413 100644 --- a/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm +++ b/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.14 @ +-- @Revision: 1.15 @-- Binding Version 01.00------------------------------------------------------------------------------ @@ -55,18 +55,18 @@ -- |=====================================================================-- #1A NAME="AFU_1"#2| - procedureSet_User_Data (Men : inMenu; - Data : inUser_Access); + procedureSet_User_Data (Men : Menu; + Data : User_Access); -- AKA: set_menu_userptrpragma Inline (Set_User_Data); -- #1A NAME="AFU_2"#2| - procedureGet_User_Data (Men : inMenu; + procedureGet_User_Data (Men : Menu; Data : outUser_Access); -- AKA: menu_userptr-- #1A NAME="AFU_3"#2| - functionGet_User_Data (Men : inMenu) returnUser_Access; + functionGet_User_Data (Men : Menu) returnUser_Access; -- AKA: menu_userptr-- Same as functionpragma Inline (Get_User_Data); diff --git a/doc/html/ada/terminal_interface-curses-menus__adb.htm b/doc/html/ada/terminal_interface-curses-menus__adb.htm index 216210ac..86b3fb28 100644 --- a/doc/html/ada/terminal_interface-curses-menus__adb.htm +++ b/doc/html/ada/terminal_interface-curses-menus__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2004,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.26 @ --- @Date: 2008/07/26 18:50:58 @ +-- @Revision: 1.27 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Unchecked_Deallocation; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; -withInterfaces.C; useInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; -withInterfaces.C.Pointers; +withInterfaces.C; useInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C.Pointers; with Ada.Unchecked_Conversion; @@ -57,10 +57,10 @@ type C_Item_Array isarray (Natural range <>) ofaliasedItem; package I_Array isnew - Interfaces.C.Pointers (Natural, Item, C_Item_Array, Null_Item); + Interfaces.C.Pointers (Natural, Item, C_Item_Array, Null_Item); usetype System.Bit_Order; - subtypechars_ptrisInterfaces.C.Strings.chars_ptr; + subtypechars_ptrisInterfaces.C.Strings.chars_ptr; function MOS_2_CInt isnew Ada.Unchecked_Conversion (Menu_Option_Set, @@ -79,7 +79,7 @@ Item_Option_Set); ------------------------------------------------------------------------------ - procedureRequest_Name (Key : inMenu_Request_Code; + procedureRequest_Name (Key : Menu_Request_Code; Name : out String) isfunctionRequest_Name (Key : C_Int) returnchars_ptr; @@ -99,7 +99,7 @@ functionCreate (Name : String; Description : String := "") returnItemis - typeChar_PtrisaccessallInterfaces.C.char; + typeChar_PtrisaccessallInterfaces.C.char; functionNewitem (Name, Desc : Char_Ptr) returnItem; pragma Import (C, Newitem, "new_item"); @@ -141,11 +141,11 @@ beginPtr := Descname (Itm); ifPtr /= Null_Ptr then - Interfaces.C.Strings.Free (Ptr); + Interfaces.C.Strings.Free (Ptr); endif; Ptr := Itemname (Itm); ifPtr /= Null_Ptr then - Interfaces.C.Strings.Free (Ptr); + Interfaces.C.Strings.Free (Ptr); endif; Res := Freeitem (Itm); ifRes /= E_Okthen @@ -154,8 +154,8 @@ Itm := Null_Item; endDelete; ------------------------------------------------------------------------------- - procedureSet_Value (Itm : inItem; - Value : in Boolean := True) + procedureSet_Value (Itm : Item; + Value : Boolean := True) isfunctionSet_Item_Val (Itm : Item; Val : C_Int) returnC_Int; @@ -193,8 +193,8 @@ endif; endVisible; ------------------------------------------------------------------------------- - procedureSet_Options (Itm : inItem; - Options : inItem_Option_Set) + procedureSet_Options (Itm : Item; + Options : Item_Option_Set) isfunctionSet_Item_Opts (Itm : Item; Opt : C_Int) returnC_Int; @@ -209,8 +209,8 @@ endif; endSet_Options; - procedureSwitch_Options (Itm : inItem; - Options : inItem_Option_Set; + procedureSwitch_Options (Itm : Item; + Options : Item_Option_Set; On : Boolean := True) isfunctionItem_Opts_On (Itm : Item; @@ -233,7 +233,7 @@ endif; endSwitch_Options; - procedureGet_Options (Itm : inItem; + procedureGet_Options (Itm : Item; Options : outItem_Option_Set) isfunctionItem_Opts (Itm : Item) returnC_Int; @@ -252,7 +252,7 @@ returnIos; endGet_Options; ------------------------------------------------------------------------------- - procedureName (Itm : inItem; + procedureName (Itm : Item; Name : out String) isfunctionItemname (Itm : Item) returnchars_ptr; @@ -261,7 +261,7 @@ Fill_String (Itemname (Itm), Name); endName; - functionName (Itm : inItem) return String + functionName (Itm : Item) return String isfunctionItemname (Itm : Item) returnchars_ptr; pragma Import (C, Itemname, "item_name"); @@ -269,7 +269,7 @@ returnFill_String (Itemname (Itm)); endName; - procedureDescription (Itm : inItem; + procedureDescription (Itm : Item; Description : out String) isfunctionDescname (Itm : Item) returnchars_ptr; @@ -278,7 +278,7 @@ Fill_String (Descname (Itm), Description); endDescription; - functionDescription (Itm : inItem) return String + functionDescription (Itm : Item) return String isfunctionDescname (Itm : Item) returnchars_ptr; pragma Import (C, Descname, "item_description"); @@ -286,8 +286,8 @@ returnFill_String (Descname (Itm)); endDescription; ------------------------------------------------------------------------------- - procedureSet_Current (Men : inMenu; - Itm : inItem) + procedureSet_Current (Men : Menu; + Itm : Item) isfunctionSet_Curr_Item (Men : Menu; Itm : Item) returnC_Int; @@ -313,8 +313,8 @@ returnRes; endCurrent; - procedureSet_Top_Row (Men : inMenu; - Line : inLine_Position) + procedureSet_Top_Row (Men : Menu; + Line : Line_Position) isfunctionSet_Toprow (Men : Menu; Line : C_Int) returnC_Int; @@ -353,8 +353,8 @@ return Positive (Natural (Res) + Positive'First); endGet_Index; ------------------------------------------------------------------------------- - procedurePost (Men : inMenu; - Post : in Boolean := True) + procedurePost (Men : Menu; + Post : Boolean := True) isfunctionM_Post (Men : Menu) returnC_Int; pragma Import (C, M_Post, "post_menu"); @@ -373,8 +373,8 @@ endif; endPost; ------------------------------------------------------------------------------- - procedureSet_Options (Men : inMenu; - Options : inMenu_Option_Set) + procedureSet_Options (Men : Menu; + Options : Menu_Option_Set) isfunctionSet_Menu_Opts (Men : Menu; Opt : C_Int) returnC_Int; @@ -389,9 +389,9 @@ endif; endSet_Options; - procedureSwitch_Options (Men : inMenu; - Options : inMenu_Option_Set; - On : in Boolean := True) + procedureSwitch_Options (Men : Menu; + Options : Menu_Option_Set; + On : Boolean := True) isfunctionMenu_Opts_On (Men : Menu; Opt : C_Int) returnC_Int; @@ -413,8 +413,8 @@ endif; endSwitch_Options; - procedureGet_Options (Men : inMenu; - Options : outMenu_Option_Set) + procedureGet_Options (Men : Menu; + Options : outMenu_Option_Set) isfunctionMenu_Opts (Men : Menu) returnC_Int; pragma Import (C, Menu_Opts, "menu_opts"); @@ -432,8 +432,8 @@ returnMos; endGet_Options; ------------------------------------------------------------------------------- - procedureSet_Window (Men : inMenu; - Win : inWindow) + procedureSet_Window (Men : Menu; + Win : Window) isfunctionSet_Menu_Win (Men : Menu; Win : Window) returnC_Int; @@ -456,8 +456,8 @@ returnW; endGet_Window; - procedureSet_Sub_Window (Men : inMenu; - Win : inWindow) + procedureSet_Sub_Window (Men : Menu; + Win : Window) isfunctionSet_Menu_Sub (Men : Menu; Win : Window) returnC_Int; @@ -480,7 +480,7 @@ returnW; endGet_Sub_Window; - procedureScale (Men : inMenu; + procedureScale (Men : Menu; Lines : outLine_Count; Columns : outColumn_Count) is @@ -512,10 +512,10 @@ endPosition_Cursor; ------------------------------------------------------------------------------- - procedureSet_Mark (Men : inMenu; - Mark : in String) + procedureSet_Mark (Men : Menu; + Mark : String) is - typeChar_PtrisaccessallInterfaces.C.char; + typeChar_PtrisaccessallInterfaces.C.char; functionSet_Mark (Men : Menu; Mark : Char_Ptr) returnC_Int; pragma Import (C, Set_Mark, "set_menu_mark"); @@ -531,7 +531,7 @@ endif; endSet_Mark; - procedureMark (Men : inMenu; + procedureMark (Men : Menu; Mark : out String) isfunctionGet_Menu_Mark (Men : Menu) returnchars_ptr; @@ -550,9 +550,9 @@ -------------------------------------------------------------------------------procedureSet_Foreground - (Men : inMenu; - Fore : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Men : Menu; + Fore : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionSet_Menu_Fore (Men : Menu; Attr : C_Chtype) returnC_Int; @@ -568,7 +568,7 @@ endif; endSet_Foreground; - procedureForeground (Men : inMenu; + procedureForeground (Men : Menu; Fore : outCharacter_Attribute_Set) isfunctionMenu_Fore (Men : Menu) returnC_Chtype; @@ -577,7 +577,7 @@ Fore := Chtype_To_AttrChar (Menu_Fore (Men)).Attr; endForeground; - procedureForeground (Men : inMenu; + procedureForeground (Men : Menu; Fore : outCharacter_Attribute_Set; Color : outColor_Pair) is @@ -589,9 +589,9 @@ endForeground; procedureSet_Background - (Men : inMenu; - Back : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Men : Menu; + Back : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionSet_Menu_Back (Men : Menu; Attr : C_Chtype) returnC_Int; @@ -607,7 +607,7 @@ endif; endSet_Background; - procedureBackground (Men : inMenu; + procedureBackground (Men : Menu; Back : outCharacter_Attribute_Set) isfunctionMenu_Back (Men : Menu) returnC_Chtype; @@ -616,7 +616,7 @@ Back := Chtype_To_AttrChar (Menu_Back (Men)).Attr; endBackground; - procedureBackground (Men : inMenu; + procedureBackground (Men : Menu; Back : outCharacter_Attribute_Set; Color : outColor_Pair) is @@ -627,9 +627,9 @@ Color := Chtype_To_AttrChar (Menu_Back (Men)).Color; endBackground; - procedureSet_Grey (Men : inMenu; - Grey : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + procedureSet_Grey (Men : Menu; + Grey : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionSet_Menu_Grey (Men : Menu; Attr : C_Chtype) returnC_Int; @@ -646,7 +646,7 @@ endif; endSet_Grey; - procedureGrey (Men : inMenu; + procedureGrey (Men : Menu; Grey : outCharacter_Attribute_Set) isfunctionMenu_Grey (Men : Menu) returnC_Chtype; @@ -655,7 +655,7 @@ Grey := Chtype_To_AttrChar (Menu_Grey (Men)).Attr; endGrey; - procedureGrey (Men : inMenu; + procedureGrey (Men : Menu; Grey : outCharacter_Attribute_Set; Color : outColor_Pair) is @@ -666,8 +666,8 @@ Color := Chtype_To_AttrChar (Menu_Grey (Men)).Color; endGrey; - procedureSet_Pad_Character (Men : inMenu; - Pad : in Character := Space) + procedureSet_Pad_Character (Men : Menu; + Pad : Character := Space) isfunctionSet_Menu_Pad (Men : Menu; Ch : C_Int) returnC_Int; @@ -681,7 +681,7 @@ endif; endSet_Pad_Character; - procedurePad_Character (Men : inMenu; + procedurePad_Character (Men : Menu; Pad : out Character) isfunctionMenu_Pad (Men : Menu) returnC_Int; @@ -690,10 +690,10 @@ Pad := Character'Val (Menu_Pad (Men)); endPad_Character; ------------------------------------------------------------------------------- - procedureSet_Spacing (Men : inMenu; - Descr : inColumn_Position := 0; - Row : inLine_Position := 0; - Col : inColumn_Position := 0) + procedureSet_Spacing (Men : Menu; + Descr : Column_Position := 0; + Row : Line_Position := 0; + Col : Column_Position := 0) isfunctionSet_Spacing (Men : Menu; D, R, C : C_Int) returnC_Int; @@ -709,7 +709,7 @@ endif; endSet_Spacing; - procedureSpacing (Men : inMenu; + procedureSpacing (Men : Menu; Descr : outColumn_Position; Row : outLine_Position; Col : outColumn_Position) @@ -737,7 +737,7 @@ functionSet_Pattern (Men : Menu; Text : String) return Boolean is - typeChar_PtrisaccessallInterfaces.C.char; + typeChar_PtrisaccessallInterfaces.C.char; functionSet_Pattern (Men : Menu; Pattern : Char_Ptr) returnC_Int; pragma Import (C, Set_Pattern, "set_menu_pattern"); @@ -757,7 +757,7 @@ endcase; endSet_Pattern; - procedurePattern (Men : inMenu; + procedurePattern (Men : Menu; Text : out String) isfunctionGet_Pattern (Men : Menu) returnchars_ptr; @@ -766,9 +766,9 @@ Fill_String (Get_Pattern (Men), Text); endPattern; ------------------------------------------------------------------------------- - procedureSet_Format (Men : inMenu; - Lines : inLine_Count; - Columns : inColumn_Count) + procedureSet_Format (Men : Menu; + Lines : Line_Count; + Columns : Column_Count) isfunctionSet_Menu_Fmt (Men : Menu; Lin : C_Int; @@ -784,7 +784,7 @@ endif; endSet_Format; - procedureFormat (Men : inMenu; + procedureFormat (Men : Menu; Lines : outLine_Count; Columns : outColumn_Count) is @@ -804,8 +804,8 @@ endif; endFormat; ------------------------------------------------------------------------------- - procedureSet_Item_Init_Hook (Men : inMenu; - Proc : inMenu_Hook_Function) + procedureSet_Item_Init_Hook (Men : Menu; + Proc : Menu_Hook_Function) isfunctionSet_Item_Init (Men : Menu; Proc : Menu_Hook_Function) returnC_Int; @@ -818,8 +818,8 @@ endif; endSet_Item_Init_Hook; - procedureSet_Item_Term_Hook (Men : inMenu; - Proc : inMenu_Hook_Function) + procedureSet_Item_Term_Hook (Men : Menu; + Proc : Menu_Hook_Function) isfunctionSet_Item_Term (Men : Menu; Proc : Menu_Hook_Function) returnC_Int; @@ -832,8 +832,8 @@ endif; endSet_Item_Term_Hook; - procedureSet_Menu_Init_Hook (Men : inMenu; - Proc : inMenu_Hook_Function) + procedureSet_Menu_Init_Hook (Men : Menu; + Proc : Menu_Hook_Function) isfunctionSet_Menu_Init (Men : Menu; Proc : Menu_Hook_Function) returnC_Int; @@ -846,8 +846,8 @@ endif; endSet_Menu_Init_Hook; - procedureSet_Menu_Term_Hook (Men : inMenu; - Proc : inMenu_Hook_Function) + procedureSet_Menu_Term_Hook (Men : Menu; + Proc : Menu_Hook_Function) isfunctionSet_Menu_Term (Men : Menu; Proc : Menu_Hook_Function) returnC_Int; @@ -892,8 +892,8 @@ returnMenu_Term (Men); endGet_Menu_Term_Hook; ------------------------------------------------------------------------------- - procedureRedefine (Men : inMenu; - Items : inItem_Array_Access) + procedureRedefine (Men : Menu; + Items : Item_Array_Access) isfunctionSet_Items (Men : Menu; Items : System.Address) returnC_Int; @@ -995,7 +995,7 @@ endDriver; procedureFree (IA : inoutItem_Array_Access; - Free_Items : in Boolean := False) + Free_Items : Boolean := False) isprocedure Release isnew Ada.Unchecked_Deallocation (Item_Array, Item_Array_Access); diff --git a/doc/html/ada/terminal_interface-curses-menus__ads.htm b/doc/html/ada/terminal_interface-curses-menus__ads.htm index 62780fbd..391ca8ee 100644 --- a/doc/html/ada/terminal_interface-curses-menus__ads.htm +++ b/doc/html/ada/terminal_interface-curses-menus__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.27 @ --- @Date: 2007/05/05 20:20:52 @ +-- @Revision: 1.28 @ +-- @Date: 2009/12/26 18:35:22 @-- Binding Version 01.00-------------------------------------------------------------------------------- menu binding. @@ -108,7 +108,7 @@ REQ_NEXT_MATCH : Menu_Request_CoderenamesM_Next_Match; REQ_PREV_MATCH : Menu_Request_CoderenamesM_Previous_Match; - procedureRequest_Name (Key : inMenu_Request_Code; + procedureRequest_Name (Key : Menu_Request_Code; Name : out String); functionRequest_Name (Key : Menu_Request_Code) return String; @@ -214,8 +214,8 @@ -- |=====================================================================-- #1A NAME="AFU_4"#2| - procedureSet_Value (Itm : inItem; - Value : in Boolean := True); + procedureSet_Value (Itm : Item; + Value : Boolean := True); -- AKA: set_item_value()pragma Inline (Set_Value); @@ -238,14 +238,14 @@ -- |=====================================================================-- #1A NAME="AFU_7"#2| - procedureSet_Options (Itm : inItem; - Options : inItem_Option_Set); + procedureSet_Options (Itm : Item; + Options : Item_Option_Set); -- AKA: set_item_opts()-- An overloaded Set_Options is defined later. Pragma Inline appears there-- #1A NAME="AFU_8"#2| - procedureSwitch_Options (Itm : inItem; - Options : inItem_Option_Set; + procedureSwitch_Options (Itm : Item; + Options : Item_Option_Set; On : Boolean := True); -- AKA: item_opts_on()-- AKA: item_opts_off() @@ -253,7 +253,7 @@ -- Pragma Inline appears there-- #1A NAME="AFU_9"#2| - procedureGet_Options (Itm : inItem; + procedureGet_Options (Itm : Item; Options : outItem_Option_Set); -- AKA: item_opts() @@ -267,7 +267,7 @@ -- |=====================================================================-- #1A NAME="AFU_11"#2| - procedureName (Itm : inItem; + procedureName (Itm : Item; Name : out String); -- AKA: item_name()functionName (Itm : Item) return String; @@ -276,7 +276,7 @@ pragma Inline (Name); -- #1A NAME="AFU_12"#2| - procedureDescription (Itm : inItem; + procedureDescription (Itm : Item; Description : out String); -- AKA: item_description(); @@ -290,8 +290,8 @@ -- |=====================================================================-- #1A NAME="AFU_13"#2| - procedureSet_Current (Men : inMenu; - Itm : inItem); + procedureSet_Current (Men : Menu; + Itm : Item); -- AKA: set_current_item()pragma Inline (Set_Current); @@ -301,8 +301,8 @@ pragma Inline (Current); -- #1A NAME="AFU_15"#2| - procedureSet_Top_Row (Men : inMenu; - Line : inLine_Position); + procedureSet_Top_Row (Men : Menu; + Line : Line_Position); -- AKA: set_top_row()pragma Inline (Set_Top_Row); @@ -324,8 +324,8 @@ -- |=====================================================================-- #1A NAME="AFU_18"#2| - procedurePost (Men : inMenu; - Post : in Boolean := True); + procedurePost (Men : Menu; + Post : Boolean := True); -- AKA: post_menu()-- AKA: unpost_menu()pragma Inline (Post); @@ -335,22 +335,22 @@ -- |=====================================================================-- #1A NAME="AFU_19"#2| - procedureSet_Options (Men : inMenu; - Options : inMenu_Option_Set); + procedureSet_Options (Men : Menu; + Options : Menu_Option_Set); -- AKA: set_menu_opts()pragma Inline (Set_Options); -- #1A NAME="AFU_20"#2| - procedureSwitch_Options (Men : inMenu; - Options : inMenu_Option_Set; + procedureSwitch_Options (Men : Menu; + Options : Menu_Option_Set; On : Boolean := True); -- AKA: menu_opts_on()-- AKA: menu_opts_off()pragma Inline (Switch_Options); -- #1A NAME="AFU_21"#2| - procedureGet_Options (Men : inMenu; - Options : outMenu_Option_Set); + procedureGet_Options (Men : Menu; + Options : outMenu_Option_Set); -- AKA: menu_opts()-- #1A NAME="AFU_22"#2| @@ -363,8 +363,8 @@ -- |=====================================================================-- #1A NAME="AFU_23"#2| - procedureSet_Window (Men : inMenu; - Win : inWindow); + procedureSet_Window (Men : Menu; + Win : Window); -- AKA: set_menu_win()pragma Inline (Set_Window); @@ -374,8 +374,8 @@ pragma Inline (Get_Window); -- #1A NAME="AFU_25"#2| - procedureSet_Sub_Window (Men : inMenu; - Win : inWindow); + procedureSet_Sub_Window (Men : Menu; + Win : Window); -- AKA: set_menu_sub()pragma Inline (Set_Sub_Window); @@ -385,7 +385,7 @@ pragma Inline (Get_Sub_Window); -- #1A NAME="AFU_27"#2| - procedureScale (Men : inMenu; + procedureScale (Men : Menu; Lines : outLine_Count; Columns : outColumn_Count); -- AKA: scale_menu() @@ -405,13 +405,13 @@ -- |=====================================================================-- #1A NAME="AFU_29"#2| - procedureSet_Mark (Men : inMenu; - Mark : in String); + procedureSet_Mark (Men : Menu; + Mark : String); -- AKA: set_menu_mark()pragma Inline (Set_Mark); -- #1A NAME="AFU_30"#2| - procedureMark (Men : inMenu; + procedureMark (Men : Menu; Mark : out String); -- AKA: menu_mark() @@ -426,19 +426,19 @@ -- #1A NAME="AFU_31"#2|procedureSet_Foreground - (Men : inMenu; - Fore : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Men : Menu; + Fore : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: set_menu_fore()pragma Inline (Set_Foreground); -- #1A NAME="AFU_32"#2| - procedureForeground (Men : inMenu; + procedureForeground (Men : Menu; Fore : outCharacter_Attribute_Set); -- AKA: menu_fore()-- #1A NAME="AFU_33"#2| - procedureForeground (Men : inMenu; + procedureForeground (Men : Menu; Fore : outCharacter_Attribute_Set; Color : outColor_Pair); -- AKA: menu_fore() @@ -446,19 +446,19 @@ -- #1A NAME="AFU_34"#2|procedureSet_Background - (Men : inMenu; - Back : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Men : Menu; + Back : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: set_menu_back()pragma Inline (Set_Background); -- #1A NAME="AFU_35"#2| - procedureBackground (Men : inMenu; + procedureBackground (Men : Menu; Back : outCharacter_Attribute_Set); -- AKA: menu_back()-- #1A NAME="AFU_36"#2| - procedureBackground (Men : inMenu; + procedureBackground (Men : Menu; Back : outCharacter_Attribute_Set; Color : outColor_Pair); -- AKA: menu_back() @@ -466,33 +466,33 @@ -- #1A NAME="AFU_37"#2|procedureSet_Grey - (Men : inMenu; - Grey : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Men : Menu; + Grey : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: set_menu_grey()pragma Inline (Set_Grey); -- #1A NAME="AFU_38"#2| - procedureGrey (Men : inMenu; + procedureGrey (Men : Menu; Grey : outCharacter_Attribute_Set); -- AKA: menu_grey()-- #1A NAME="AFU_39"#2|procedureGrey - (Men : inMenu; + (Men : Menu; Grey : outCharacter_Attribute_Set; Color : outColor_Pair); -- AKA: menu_grey()pragma Inline (Grey); -- #1A NAME="AFU_40"#2| - procedureSet_Pad_Character (Men : inMenu; - Pad : in Character := Space); + procedureSet_Pad_Character (Men : Menu; + Pad : Character := Space); -- AKA: set_menu_pad()pragma Inline (Set_Pad_Character); -- #1A NAME="AFU_41"#2| - procedurePad_Character (Men : inMenu; + procedurePad_Character (Men : Menu; Pad : out Character); -- AKA: menu_pad()pragma Inline (Pad_Character); @@ -502,15 +502,15 @@ -- |=====================================================================-- #1A NAME="AFU_42"#2| - procedureSet_Spacing (Men : inMenu; - Descr : inColumn_Position := 0; - Row : inLine_Position := 0; - Col : inColumn_Position := 0); + procedureSet_Spacing (Men : Menu; + Descr : Column_Position := 0; + Row : Line_Position := 0; + Col : Column_Position := 0); -- AKA: set_menu_spacing()pragma Inline (Set_Spacing); -- #1A NAME="AFU_43"#2| - procedureSpacing (Men : inMenu; + procedureSpacing (Men : Menu; Descr : outColumn_Position; Row : outLine_Position; Col : outColumn_Position); @@ -529,7 +529,7 @@ pragma Inline (Set_Pattern); -- #1A NAME="AFU_45"#2| - procedurePattern (Men : inMenu; + procedurePattern (Men : Menu; Text : out String); -- AKA: menu_pattern()pragma Inline (Pattern); @@ -539,9 +539,9 @@ -- |=====================================================================-- #1A NAME="AFU_46"#2| - procedureSet_Format (Men : inMenu; - Lines : inLine_Count; - Columns : inColumn_Count); + procedureSet_Format (Men : Menu; + Lines : Line_Count; + Columns : Column_Count); -- Not implemented: 0 argument for Lines or Columns;-- instead use Format to get the current sizes-- The default format is 16 rows, 1 column. Calling @@ -553,7 +553,7 @@ pragma Inline (Set_Format); -- #1A NAME="AFU_47"#2| - procedureFormat (Men : inMenu; + procedureFormat (Men : Menu; Lines : outLine_Count; Columns : outColumn_Count); -- AKA: menu_format() @@ -563,30 +563,30 @@ -- | Man page menu_hook.3x-- |===================================================================== - typeMenu_Hook_Functionisaccessprocedure (Men : inMenu); + typeMenu_Hook_Functionisaccessprocedure (Men : Menu); pragma Convention (C, Menu_Hook_Function); -- #1A NAME="AFU_48"#2| - procedureSet_Item_Init_Hook (Men : inMenu; - Proc : inMenu_Hook_Function); + procedureSet_Item_Init_Hook (Men : Menu; + Proc : Menu_Hook_Function); -- AKA: set_item_init()pragma Inline (Set_Item_Init_Hook); -- #1A NAME="AFU_49"#2| - procedureSet_Item_Term_Hook (Men : inMenu; - Proc : inMenu_Hook_Function); + procedureSet_Item_Term_Hook (Men : Menu; + Proc : Menu_Hook_Function); -- AKA: set_item_term()pragma Inline (Set_Item_Term_Hook); -- #1A NAME="AFU_50"#2| - procedureSet_Menu_Init_Hook (Men : inMenu; - Proc : inMenu_Hook_Function); + procedureSet_Menu_Init_Hook (Men : Menu; + Proc : Menu_Hook_Function); -- AKA: set_menu_init()pragma Inline (Set_Menu_Init_Hook); -- #1A NAME="AFU_51"#2| - procedureSet_Menu_Term_Hook (Men : inMenu; - Proc : inMenu_Hook_Function); + procedureSet_Menu_Term_Hook (Men : Menu; + Proc : Menu_Hook_Function); -- AKA: set_menu_term()pragma Inline (Set_Menu_Term_Hook); @@ -615,13 +615,13 @@ -- |=====================================================================-- #1A NAME="AFU_56"#2| - procedureRedefine (Men : inMenu; - Items : inItem_Array_Access); + procedureRedefine (Men : Menu; + Items : Item_Array_Access); -- AKA: set_menu_items()pragma Inline (Redefine); - procedureSet_Items (Men : inMenu; - Items : inItem_Array_Access) renamesRedefine; + procedureSet_Items (Men : Menu; + Items : Item_Array_Access) renamesRedefine; -- pragma Inline (Set_Items);-- #1A NAME="AFU_57"#2| diff --git a/doc/html/ada/terminal_interface-curses-mouse__adb.htm b/doc/html/ada/terminal_interface-curses-mouse__adb.htm index 4e3a178e..1bd4a0a2 100644 --- a/doc/html/ada/terminal_interface-curses-mouse__adb.htm +++ b/doc/html/ada/terminal_interface-curses-mouse__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2004,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,13 +40,13 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.22 @ --- @Date: 2008/07/26 18:51:11 @ +-- @Revision: 1.24 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; -withInterfaces.C; useInterfaces.C; -useInterfaces; +withInterfaces.C; useInterfaces.C; +useInterfaces; packagebodyTerminal_Interface.Curses.Mouseis @@ -55,7 +55,7 @@ functionHas_Mousereturn Boolean isfunctionMouse_AvailreturnC_Int; - pragma Import (C, Mouse_Avail, "_nc_has_mouse"); + pragma Import (C, Mouse_Avail, "has_mouse"); beginifHas_Key (Key_Mouse) orelseMouse_Avail /= 0 thenreturn True; @@ -79,8 +79,8 @@ returnEvent; endGet_Mouse; - procedureRegister_Reportable_Event (Button : inMouse_Button; - State : inButton_State; + procedureRegister_Reportable_Event (Button : Mouse_Button; + State : Button_State; Mask : inoutEvent_Mask) isButton_Nr : constant Natural := Mouse_Button'Pos (Button); @@ -97,8 +97,8 @@ endif; endRegister_Reportable_Event; - procedureRegister_Reportable_Events (Button : inMouse_Button; - State : in Button_States; + procedureRegister_Reportable_Events (Button : Mouse_Button; + State : Button_States; Mask : inoutEvent_Mask) isbegin @@ -125,7 +125,7 @@ returnOld; endStart_Mouse; - procedureEnd_Mouse (Mask : inEvent_Mask := No_Events) + procedureEnd_Mouse (Mask : Event_Mask := No_Events) isbeginifMask /= No_Eventsthen @@ -133,11 +133,11 @@ endif; endEnd_Mouse; - procedureDispatch_Event (Mask : inEvent_Mask; + procedureDispatch_Event (Mask : Event_Mask; Button : outMouse_Button; State : outButton_State); - procedureDispatch_Event (Mask : inEvent_Mask; + procedureDispatch_Event (Mask : Event_Mask; Button : outMouse_Button; State : outButton_State) isL : Event_Mask; @@ -173,7 +173,7 @@ endif; endDispatch_Event; - procedureGet_Event (Event : inMouse_Event; + procedureGet_Event (Event : Mouse_Event; Y : outLine_Position; X : outColumn_Position; Button : outMouse_Button; @@ -186,7 +186,7 @@ Dispatch_Event (Mask, Button, State); endGet_Event; - procedureUnget_Mouse (Event : inMouse_Event) + procedureUnget_Mouse (Event : Mouse_Event) isfunctionUngetmouse (Ev : Mouse_Event) returnC_Int; pragma Import (C, Ungetmouse, "ungetmouse"); diff --git a/doc/html/ada/terminal_interface-curses-mouse__ads.htm b/doc/html/ada/terminal_interface-curses-mouse__ads.htm index 608bd463..611d93d0 100644 --- a/doc/html/ada/terminal_interface-curses-mouse__ads.htm +++ b/doc/html/ada/terminal_interface-curses-mouse__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.27 @ --- @Date: 2006/06/25 14:30:22 @ +-- @Revision: 1.28 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00-------------------------------------------------------------------------------- mouse binding. @@ -104,8 +104,8 @@ -- Return true if a mouse device is supported, false otherwise.procedureRegister_Reportable_Event - (Button : inMouse_Button; - State : inButton_State; + (Button : Mouse_Button; + State : Button_State; Mask : inoutEvent_Mask); -- Stores the event described by the button and the state in the mask.-- Before you call this the first time, you should init the mask @@ -113,8 +113,8 @@ pragma Inline (Register_Reportable_Event); procedureRegister_Reportable_Events - (Button : inMouse_Button; - State : in Button_States; + (Button : Mouse_Button; + State : Button_States; Mask : inoutEvent_Mask); -- Register all events described by the Button and the State bitmap.-- Before you call this the first time, you should init the mask @@ -130,7 +130,7 @@ -- AKA: mousemask()pragma Inline (Start_Mouse); - procedureEnd_Mouse (Mask : inEvent_Mask := No_Events); + procedureEnd_Mouse (Mask : Event_Mask := No_Events); -- Terminates the mouse, restores the specified event maskpragma Inline (End_Mouse); @@ -139,7 +139,7 @@ -- AKA: getmouse()pragma Inline (Get_Mouse); - procedureGet_Event (Event : inMouse_Event; + procedureGet_Event (Event : Mouse_Event; Y : outLine_Position; X : outColumn_Position; Button : outMouse_Button; @@ -151,7 +151,7 @@ pragma Inline (Get_Event); -- #1A NAME="AFU_3"#2| - procedureUnget_Mouse (Event : inMouse_Event); + procedureUnget_Mouse (Event : Mouse_Event); -- AKA: ungetmouse()pragma Inline (Unget_Mouse); @@ -168,14 +168,14 @@ pragma Inline (Mouse_Interval); private - typeEvent_MaskisnewInterfaces.C.unsigned_long; + typeEvent_MaskisnewInterfaces.C.unsigned_long; typeMouse_Eventisrecord - Id : Integer range Integer (Interfaces.C.short'First) .. - Integer (Interfaces.C.short'Last); - X, Y, Z : Integer range Integer (Interfaces.C.int'First) .. - Integer (Interfaces.C.int'Last); + Id : Integer range Integer (Interfaces.C.short'First) .. + Integer (Interfaces.C.short'Last); + X, Y, Z : Integer range Integer (Interfaces.C.int'First) .. + Integer (Interfaces.C.int'Last); Bstate : Event_Mask; endrecord; pragma Convention (C, Mouse_Event); diff --git a/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm b/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm index 106a924e..4face619 100644 --- a/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm +++ b/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,10 +40,10 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; withTerminal_Interface.Curses.Panels; @@ -51,10 +51,10 @@ packagebodyTerminal_Interface.Curses.Panels.User_Datais - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; - procedureSet_User_Data (Pan : inPanel; - Data : inUser_Access) + procedureSet_User_Data (Pan : Panel; + Data : User_Access) isfunctionSet_Panel_Userptr (Pan : Panel; Addr : User_Access) returnC_Int; @@ -65,7 +65,7 @@ endif; endSet_User_Data; - functionGet_User_Data (Pan : inPanel) returnUser_Access + functionGet_User_Data (Pan : Panel) returnUser_AccessisfunctionPanel_Userptr (Pan : Panel) returnUser_Access; pragma Import (C, Panel_Userptr, "panel_userptr"); @@ -73,7 +73,7 @@ returnPanel_Userptr (Pan); endGet_User_Data; - procedureGet_User_Data (Pan : inPanel; + procedureGet_User_Data (Pan : Panel; Data : outUser_Access) isbegin diff --git a/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm b/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm index c6b8fd46..0fd9c5b3 100644 --- a/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm +++ b/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.14 @ +-- @Revision: 1.15 @-- Binding Version 01.00------------------------------------------------------------------------------ @@ -55,18 +55,18 @@ -- |=====================================================================-- #1A NAME="AFU_1"#2| - procedureSet_User_Data (Pan : inPanel; - Data : inUser_Access); + procedureSet_User_Data (Pan : Panel; + Data : User_Access); -- AKA: set_panel_userptrpragma Inline (Set_User_Data); -- #1A NAME="AFU_2"#2| - procedureGet_User_Data (Pan : inPanel; + procedureGet_User_Data (Pan : Panel; Data : outUser_Access); -- AKA: panel_userptr-- #1A NAME="AFU_3"#2| - functionGet_User_Data (Pan : inPanel) returnUser_Access; + functionGet_User_Data (Pan : Panel) returnUser_Access; -- AKA: panel_userptr-- Same as functionpragma Inline (Get_User_Data); diff --git a/doc/html/ada/terminal_interface-curses-panels__adb.htm b/doc/html/ada/terminal_interface-curses-panels__adb.htm index ff5a1bb3..e380243b 100644 --- a/doc/html/ada/terminal_interface-curses-panels__adb.htm +++ b/doc/html/ada/terminal_interface-curses-panels__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2004 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,16 +40,16 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.13 @ --- @Date: 2004/08/21 21:37:00 @ +-- @Revision: 1.14 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; -withInterfaces.C; +withInterfaces.C; packagebodyTerminal_Interface.Curses.Panelsis - usetypeInterfaces.C.int; + usetypeInterfaces.C.int; functionCreate (Win : Window) returnPanelis @@ -65,7 +65,7 @@ returnPan; endCreate; - procedureBottom (Pan : inPanel) + procedureBottom (Pan : Panel) isfunctionBottompanel (Pan : Panel) returnC_Int; pragma Import (C, Bottompanel, "bottom_panel"); @@ -75,7 +75,7 @@ endif; endBottom; - procedureTop (Pan : inPanel) + procedureTop (Pan : Panel) isfunctionToppanel (Pan : Panel) returnC_Int; pragma Import (C, Toppanel, "top_panel"); @@ -85,7 +85,7 @@ endif; endTop; - procedureShow (Pan : inPanel) + procedureShow (Pan : Panel) isfunctionShowpanel (Pan : Panel) returnC_Int; pragma Import (C, Showpanel, "show_panel"); @@ -95,7 +95,7 @@ endif; endShow; - procedureHide (Pan : inPanel) + procedureHide (Pan : Panel) isfunctionHidepanel (Pan : Panel) returnC_Int; pragma Import (C, Hidepanel, "hide_panel"); @@ -118,8 +118,8 @@ returnWin; endGet_Window; - procedureReplace (Pan : inPanel; - Win : inWindow) + procedureReplace (Pan : Panel; + Win : Window) isfunctionReplace_Pan (Pan : Panel; Win : Window) returnC_Int; @@ -130,9 +130,9 @@ endif; endReplace; - procedureMove (Pan : inPanel; - Line : inLine_Position; - Column : inColumn_Position) + procedureMove (Pan : Panel; + Line : Line_Position; + Column : Column_Position) isfunctionMove (Pan : Panel; Line : C_Int; diff --git a/doc/html/ada/terminal_interface-curses-panels__ads.htm b/doc/html/ada/terminal_interface-curses-panels__ads.htm index 9ee9370c..78930473 100644 --- a/doc/html/ada/terminal_interface-curses-panels__ads.htm +++ b/doc/html/ada/terminal_interface-curses-panels__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.19 @ --- @Date: 2006/06/25 14:30:22 @ +-- @Revision: 1.20 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------with System; @@ -79,17 +79,17 @@ -- pragma Inline (New_Panel);-- #1A NAME="AFU_3"#2| - procedureBottom (Pan : inPanel); + procedureBottom (Pan : Panel); -- AKA: bottom_panel()pragma Inline (Bottom); -- #1A NAME="AFU_4"#2| - procedureTop (Pan : inPanel); + procedureTop (Pan : Panel); -- AKA: top_panel()pragma Inline (Top); -- #1A NAME="AFU_5"#2| - procedureShow (Pan : inPanel); + procedureShow (Pan : Panel); -- AKA: show_panel()pragma Inline (Show); @@ -99,7 +99,7 @@ pragma Import (C, Update_Panels, "update_panels"); -- #1A NAME="AFU_7"#2| - procedureHide (Pan : inPanel); + procedureHide (Pan : Panel); -- AKA: hide_panel()pragma Inline (Hide); @@ -113,15 +113,15 @@ -- pragma Inline (Panel_Window);-- #1A NAME="AFU_10"#2| - procedureReplace (Pan : inPanel; - Win : inWindow); + procedureReplace (Pan : Panel; + Win : Window); -- AKA: replace_panel()pragma Inline (Replace); -- #1A NAME="AFU_11"#2| - procedureMove (Pan : inPanel; - Line : inLine_Position; - Column : inColumn_Position); + procedureMove (Pan : Panel; + Line : Line_Position; + Column : Column_Position); -- AKA: move_panel()pragma Inline (Move); diff --git a/doc/html/ada/terminal_interface-curses-putwin__adb.htm b/doc/html/ada/terminal_interface-curses-putwin__adb.htm index 8f1f9870..27145fa3 100644 --- a/doc/html/ada/terminal_interface-curses-putwin__adb.htm +++ b/doc/html/ada/terminal_interface-curses-putwin__adb.htm @@ -44,12 +44,12 @@ -- Binding Version 01.00with Ada.Streams.Stream_IO.C_Streams; -withInterfaces.C_Streams; +withInterfaces.C_Streams; withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; packagebodyTerminal_Interface.Curses.PutWinis - packageICSrenamesInterfaces.C_Streams; + packageICSrenamesInterfaces.C_Streams; packageACSrenames Ada.Streams.Stream_IO.C_Streams; usetypeC_Int; diff --git a/doc/html/ada/terminal_interface-curses-termcap__adb.htm b/doc/html/ada/terminal_interface-curses-termcap__adb.htm index 27b23024..f409dda0 100644 --- a/doc/html/ada/terminal_interface-curses-termcap__adb.htm +++ b/doc/html/ada/terminal_interface-curses-termcap__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 2000-2004,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 2000-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,14 +40,14 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ --- @Date: 2006/06/25 14:30:22 @ +-- @Revision: 1.12 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; -withInterfaces.C; useInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C; useInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; packagebodyTerminal_Interface.Curses.Termcapis @@ -87,7 +87,7 @@ endGet_Flag; ------------------------------------------------------------------------------ - procedureGet_Number (Name : in String; + procedureGet_Number (Name : String; Value : out Integer; Result : out Boolean) is diff --git a/doc/html/ada/terminal_interface-curses-terminfo__adb.htm b/doc/html/ada/terminal_interface-curses-terminfo__adb.htm index df167883..11036710 100644 --- a/doc/html/ada/terminal_interface-curses-terminfo__adb.htm +++ b/doc/html/ada/terminal_interface-curses-terminfo__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,21 +40,21 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.5 @ --- @Date: 2006/06/25 14:30:22 @ +-- @Revision: 1.6 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; -withInterfaces.C; useInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C; useInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; with Ada.Unchecked_Conversion; packagebodyTerminal_Interface.Curses.Terminfois - functionIs_MinusOne_Pointer (P : in chars_ptr) return Boolean; + functionIs_MinusOne_Pointer (P : chars_ptr) return Boolean; - functionIs_MinusOne_Pointer (P : in chars_ptr) return Boolean is + functionIs_MinusOne_Pointer (P : chars_ptr) return Boolean istypeWeird_Addressisnew System.Storage_Elements.Integer_Address; Invalid_Pointer : constantWeird_Address := -1; function To_Weird isnew Ada.Unchecked_Conversion diff --git a/doc/html/ada/terminal_interface-curses-terminfo__ads.htm b/doc/html/ada/terminal_interface-curses-terminfo__ads.htm index 72edda4f..8738a396 100644 --- a/doc/html/ada/terminal_interface-curses-terminfo__ads.htm +++ b/doc/html/ada/terminal_interface-curses-terminfo__ads.htm @@ -44,7 +44,7 @@ -- Binding Version 01.00------------------------------------------------------------------------------ -withInterfaces.C; +withInterfaces.C; packageTerminal_Interface.Curses.Terminfoispragma Preelaborate (Terminal_Interface.Curses.Terminfo); @@ -73,8 +73,8 @@ functionGet_Number (Name : String) return Integer; -- AKA: tigetnum() - typeputctypeisaccessfunction (c : Interfaces.C.int) - returnInterfaces.C.int; + typeputctypeisaccessfunction (c : Interfaces.C.int) + returnInterfaces.C.int; pragma Convention (C, putctype); -- | diff --git a/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm index 8c91d1a2..104b9496 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,18 +40,18 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.12 @ --- @Date: 2006/06/25 14:24:40 @ +-- @Revision: 1.13 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------packagebodyTerminal_Interface.Curses.Text_IO.AuxisprocedurePut_Buf - (Win : inWindow; - Buf : in String; - Width : inField; - Signal : in Boolean := True; - Ljust : in Boolean := False) + (Win : Window; + Buf : String; + Width : Field; + Signal : Boolean := True; + Ljust : Boolean := False) isL : Field; Len : Field; diff --git a/doc/html/ada/terminal_interface-curses-text_io-aux__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-aux__ads.htm index 7cbe639a..6a8ff2c7 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-aux__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-aux__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.13 @ --- @Date: 2006/06/25 14:24:40 @ +-- @Revision: 1.14 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------privatepackageTerminal_Interface.Curses.Text_IO.Auxis @@ -51,11 +51,11 @@ -- and enumeration types.--procedurePut_Buf - (Win : inWindow; -- The output window - Buf : in String; -- The buffer containing the text - Width : inField; -- The width of the output field - Signal : in Boolean := True; -- If true, we raise Layout_Error - Ljust : in Boolean := False); -- The Buf is left justified + (Win : Window; -- The output window + Buf : String; -- The buffer containing the text + Width : Field; -- The width of the output field + Signal : Boolean := True; -- If true, we raise Layout_Error + Ljust : Boolean := False); -- The Buf is left justifiedendTerminal_Interface.Curses.Text_IO.Aux; diff --git a/doc/html/ada/terminal_interface-curses-text_io-complex_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-complex_io__adb.htm index c22d3da5..8f94a957 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-complex_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-complex_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------withTerminal_Interface.Curses.Text_IO.Float_IO; @@ -51,11 +51,11 @@ Terminal_Interface.Curses.Text_IO.Float_IO (Complex_Types.Real'Base); procedurePut - (Win : inWindow; - Item : in Complex; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) + (Win : Window; + Item : Complex; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isbeginPut (Win, '('); @@ -66,10 +66,10 @@ endPut; procedurePut - (Item : in Complex; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) + (Item : Complex; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isbeginPut (Get_Window, Item, Fore, Aft, Exp); diff --git a/doc/html/ada/terminal_interface-curses-text_io-complex_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-complex_io__ads.htm index 460f5d0b..ce215b59 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-complex_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-complex_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Numerics.Generic_Complex_Types; @@ -57,17 +57,17 @@ Default_Exp : Field := 3; procedurePut - (Win : inWindow; - Item : in Complex; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Win : Window; + Item : Complex; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); procedurePut - (Item : in Complex; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Item : Complex; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io-decimal_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-decimal_io__adb.htm index 82cda534..0e021444 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-decimal_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-decimal_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -52,11 +52,11 @@ package DIO isnew Ada.Text_IO.Decimal_IO (Num); procedurePut - (Win : inWindow; - Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) + (Win : Window; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isBuf : String (1 .. Field'Last); Len : Field := Fore + 1 + Aft; @@ -69,10 +69,10 @@ endPut; procedurePut - (Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) is + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isbeginPut (Get_Window, Item, Fore, Aft, Exp); endPut; diff --git a/doc/html/ada/terminal_interface-curses-text_io-decimal_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-decimal_io__ads.htm index e4c1c206..b19c151d 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-decimal_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-decimal_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------generic @@ -53,17 +53,17 @@ Default_Exp : Field := 0; procedurePut - (Win : inWindow; - Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Win : Window; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); procedurePut - (Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__adb.htm index ba7bd1e3..070e480a 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -53,10 +53,10 @@ package EIO isnew Ada.Text_IO.Enumeration_IO (Enum); procedurePut - (Win : inWindow; - Item : inEnum; - Width : inField := Default_Width; - Set : inType_Set := Default_Setting) + (Win : Window; + Item : Enum; + Width : Field := Default_Width; + Set : Type_Set := Default_Setting) isBuf : String (1 .. Field'Last); Tset : Ada.Text_IO.Type_Set; @@ -74,9 +74,9 @@ endPut; procedurePut - (Item : inEnum; - Width : inField := Default_Width; - Set : inType_Set := Default_Setting) + (Item : Enum; + Width : Field := Default_Width; + Set : Type_Set := Default_Setting) isbeginPut (Get_Window, Item, Width, Set); diff --git a/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__ads.htm index 074547f1..b3d316ad 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-enumeration_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------generic @@ -52,15 +52,15 @@ Default_Setting : Type_Set := Mixed_Case; procedurePut - (Win : inWindow; - Item : inEnum; - Width : inField := Default_Width; - Set : inType_Set := Default_Setting); + (Win : Window; + Item : Enum; + Width : Field := Default_Width; + Set : Type_Set := Default_Setting); procedurePut - (Item : inEnum; - Width : inField := Default_Width; - Set : inType_Set := Default_Setting); + (Item : Enum; + Width : Field := Default_Width; + Set : Type_Set := Default_Setting); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io-fixed_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-fixed_io__adb.htm index 0b70b135..578da538 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-fixed_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-fixed_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -52,11 +52,11 @@ package FIXIO isnew Ada.Text_IO.Fixed_IO (Num); procedurePut - (Win : inWindow; - Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) + (Win : Window; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isBuf : String (1 .. Field'Last); Len : Field := Fore + 1 + Aft; @@ -69,10 +69,10 @@ endPut; procedurePut - (Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) is + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isbeginPut (Get_Window, Item, Fore, Aft, Exp); endPut; diff --git a/doc/html/ada/terminal_interface-curses-text_io-fixed_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-fixed_io__ads.htm index bd6c9466..315a0cba 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-fixed_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-fixed_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------generic @@ -53,17 +53,17 @@ Default_Exp : Field := 0; procedurePut - (Win : inWindow; - Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Win : Window; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); procedurePut - (Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io-float_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-float_io__adb.htm index 29bf3e88..db86cfcc 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-float_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-float_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -52,11 +52,11 @@ package FIO isnew Ada.Text_IO.Float_IO (Num); procedurePut - (Win : inWindow; - Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) + (Win : Window; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isBuf : String (1 .. Field'Last); Len : Field := Fore + 1 + Aft; @@ -69,10 +69,10 @@ endPut; procedurePut - (Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp) + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp) isbeginPut (Get_Window, Item, Fore, Aft, Exp); diff --git a/doc/html/ada/terminal_interface-curses-text_io-float_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-float_io__ads.htm index 0f8291a8..6b6e30a2 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-float_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-float_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------generic @@ -53,17 +53,17 @@ Default_Exp : Field := 3; procedurePut - (Win : inWindow; - Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Win : Window; + Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); procedurePut - (Item : inNum; - Fore : inField := Default_Fore; - Aft : inField := Default_Aft; - Exp : inField := Default_Exp); + (Item : Num; + Fore : Field := Default_Fore; + Aft : Field := Default_Aft; + Exp : Field := Default_Exp); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io-integer_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-integer_io__adb.htm index 7b35021b..17c2f494 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-integer_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-integer_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -52,10 +52,10 @@ package IIO isnew Ada.Text_IO.Integer_IO (Num); procedurePut - (Win : inWindow; - Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base) + (Win : Window; + Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base) isBuf : String (1 .. Field'Last); begin @@ -64,9 +64,9 @@ endPut; procedurePut - (Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base) + (Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base) isbeginPut (Get_Window, Item, Width, Base); diff --git a/doc/html/ada/terminal_interface-curses-text_io-integer_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-integer_io__ads.htm index 7e9ff1f0..930bff14 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-integer_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-integer_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------generic @@ -52,15 +52,15 @@ Default_Base : Number_Base := 10; procedurePut - (Win : inWindow; - Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base); + (Win : Window; + Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base); procedurePut - (Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base); + (Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io-modular_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io-modular_io__adb.htm index f0c1612f..1ef76a73 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-modular_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-modular_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.10 @ +-- @Revision: 1.11 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -52,10 +52,10 @@ package MIO isnew Ada.Text_IO.Modular_IO (Num); procedurePut - (Win : inWindow; - Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base) + (Win : Window; + Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base) isBuf : String (1 .. Field'Last); begin @@ -64,9 +64,9 @@ endPut; procedurePut - (Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base) + (Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base) isbeginPut (Get_Window, Item, Width, Base); diff --git a/doc/html/ada/terminal_interface-curses-text_io-modular_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io-modular_io__ads.htm index 83e7d611..227dd9bf 100644 --- a/doc/html/ada/terminal_interface-curses-text_io-modular_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io-modular_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.11 @ +-- @Revision: 1.12 @-- Binding Version 01.00------------------------------------------------------------------------------generic @@ -52,15 +52,15 @@ Default_Base : Number_Base := 10; procedurePut - (Win : inWindow; - Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base); + (Win : Window; + Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base); procedurePut - (Item : inNum; - Width : inField := Default_Width; - Base : inNumber_Base := Default_Base); + (Item : Num; + Width : Field := Default_Width; + Base : Number_Base := Default_Base); privatepragma Inline (Put); diff --git a/doc/html/ada/terminal_interface-curses-text_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io__adb.htm index a7ae771b..fdeafd3c 100644 --- a/doc/html/ada/terminal_interface-curses-text_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,15 +40,15 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.18 @ --- @Date: 2006/06/25 14:24:40 @ +-- @Revision: 1.19 @ +-- @Date: 2009/12/26 17:40:46 @-- Binding Version 01.00------------------------------------------------------------------------------packagebodyTerminal_Interface.Curses.Text_IOisDefault_Window : Window := Null_Window; - procedureSet_Window (Win : inWindow) + procedureSet_Window (Win : Window) isbeginDefault_Window := Win; @@ -65,7 +65,7 @@ endGet_Window; pragma Inline (Get_Window); - procedureFlush (Win : inWindow) + procedureFlush (Win : Window) isbeginRefresh (Win); @@ -86,7 +86,7 @@ -- A scroll-window is interpreted as an page with unbounded page length,-- i.e. it returns the conventional 0 as page length. - functionLine_Length (Win : inWindow) returnCount + functionLine_Length (Win : Window) returnCountisN_Lines : Line_Count; N_Cols : Column_Count; @@ -104,7 +104,7 @@ returnLine_Length (Get_Window); endLine_Length; - functionPage_Length (Win : inWindow) returnCount + functionPage_Length (Win : Window) returnCountisN_Lines : Line_Count; N_Cols : Column_Count; @@ -129,15 +129,15 @@ -------------------------------------- Column, Line, and Page Control -------------------------------------- - procedureNew_Line (Win : inWindow; Spacing : inPositive_Count := 1) + procedureNew_Line (Win : Window; Spacing : Positive_Count := 1) isP_Size : constantCount := Page_Length (Win); begin - ifnotSpacing'Valid then + ifnotSpacing'Valid thenraise Constraint_Error; endif; - forIin 1 .. Spacingloop + forIin 1 .. SpacingloopifP_Size > 0 andthenLine (Win) >= P_SizethenNew_Page (Win); else @@ -146,13 +146,13 @@ endloop; endNew_Line; - procedureNew_Line (Spacing : inPositive_Count := 1) + procedureNew_Line (Spacing : Positive_Count := 1) isbeginNew_Line (Get_Window, Spacing); endNew_Line; - procedureNew_Page (Win : inWindow) + procedureNew_Page (Win : Window) isbeginClear (Win); @@ -164,19 +164,19 @@ New_Page (Get_Window); endNew_Page; - procedureSet_Col (Win : inWindow; To : inPositive_Count) + procedureSet_Col (Win : Window; To : Positive_Count) isY : Line_Position; X1 : Column_Position; X2 : Column_Position; N : Natural; begin - ifnotTo'Valid then + ifnotTo'Valid thenraise Constraint_Error; endif; Get_Cursor_Position (Win, Y, X1); - N := Natural (To); N := N - 1; + N := Natural (To); N := N - 1; X2 := Column_Position (N); ifX1 > X2thenNew_Line (Win, 1); @@ -192,25 +192,25 @@ endif; endSet_Col; - procedureSet_Col (To : inPositive_Count) + procedureSet_Col (To : Positive_Count) isbeginSet_Col (Get_Window, To); endSet_Col; - procedureSet_Line (Win : inWindow; To : inPositive_Count) + procedureSet_Line (Win : Window; To : Positive_Count) isY1 : Line_Position; Y2 : Line_Position; X : Column_Position; N : Natural; begin - ifnotTo'Valid then + ifnotTo'Valid thenraise Constraint_Error; endif; Get_Cursor_Position (Win, Y1, X); - N := Natural (To); N := N - 1; + N := Natural (To); N := N - 1; Y2 := Line_Position (N); ifY2 < Y1thenNew_Page (Win); @@ -221,13 +221,13 @@ endif; endSet_Line; - procedureSet_Line (To : inPositive_Count) + procedureSet_Line (To : Positive_Count) isbeginSet_Line (Get_Window, To); endSet_Line; - functionCol (Win : inWindow) returnPositive_Count + functionCol (Win : Window) returnPositive_CountisY : Line_Position; X : Column_Position; @@ -247,7 +247,7 @@ returnCol (Get_Window); endCol; - functionLine (Win : inWindow) returnPositive_Count + functionLine (Win : Window) returnPositive_CountisY : Line_Position; X : Column_Position; @@ -271,7 +271,7 @@ -- Characters Output ------------------------- - procedurePut (Win : inWindow; Item : in Character) + procedurePut (Win : Window; Item : Character) isP_Size : constantCount := Page_Length (Win); Y : Line_Position; @@ -286,10 +286,10 @@ New_Page (Win); endif; endif; - Add (Win, Item); + Add (Win, Item); endPut; - procedurePut (Item : in Character) + procedurePut (Item : Character) isbeginPut (Get_Window, Item); @@ -299,7 +299,7 @@ -- Strings-Output ---------------------- - procedurePut (Win : inWindow; Item : in String) + procedurePut (Win : Window; Item : String) isP_Size : constantCount := Page_Length (Win); Y : Line_Position; @@ -310,22 +310,22 @@ ifP_Size > 0 thenGet_Cursor_Position (Win, Y, X); Get_Size (Win, L, C); - if (Y + 1) = Landthen (X + 1 + Item'Length) >= Cthen + if (Y + 1) = Landthen (X + 1 + Item'Length) >= CthenNew_Page (Win); endif; endif; - Add (Win, Item); + Add (Win, Item); endPut; - procedurePut (Item : in String) + procedurePut (Item : String) isbeginPut (Get_Window, Item); endPut; procedurePut_Line - (Win : inWindow; - Item : in String) + (Win : Window; + Item : String) isbeginPut (Win, Item); @@ -333,7 +333,7 @@ endPut_Line; procedurePut_Line - (Item : in String) + (Item : String) isbeginPut_Line (Get_Window, Item); diff --git a/doc/html/ada/terminal_interface-curses-text_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io__ads.htm index 50e9229e..3d1daf34 100644 --- a/doc/html/ada/terminal_interface-curses-text_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,7 +40,7 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.13 @ +-- @Revision: 1.14 @-- Binding Version 01.00------------------------------------------------------------------------------with Ada.Text_IO; @@ -61,13 +61,13 @@ -- type parameter. They will operate on a default window, which can-- be set by the user. It is initially equal to Standard_Window. - procedureSet_Window (Win : inWindow); + procedureSet_Window (Win : Window); -- Set Win as the default windowfunctionGet_WindowreturnWindow; -- Get the current default window - procedureFlush (Win : inWindow); + procedureFlush (Win : Window); procedureFlush; -------------------------------------------- @@ -79,53 +79,53 @@ -- A scroll-window is interpreted as an page with unbounded page length,-- i.e. it returns the conventional 0 as page length. - functionLine_Length (Win : inWindow) returnCount; + functionLine_Length (Win : Window) returnCount; functionLine_LengthreturnCount; - functionPage_Length (Win : inWindow) returnCount; + functionPage_Length (Win : Window) returnCount; functionPage_LengthreturnCount; -------------------------------------- Column, Line, and Page Control -------------------------------------- - procedureNew_Line (Win : inWindow; Spacing : inPositive_Count := 1); - procedureNew_Line (Spacing : inPositive_Count := 1); + procedureNew_Line (Win : Window; Spacing : Positive_Count := 1); + procedureNew_Line (Spacing : Positive_Count := 1); - procedureNew_Page (Win : inWindow); + procedureNew_Page (Win : Window); procedureNew_Page; - procedureSet_Col (Win : inWindow; To : inPositive_Count); - procedureSet_Col (To : inPositive_Count); + procedureSet_Col (Win : Window; To : Positive_Count); + procedureSet_Col (To : Positive_Count); - procedureSet_Line (Win : inWindow; To : inPositive_Count); - procedureSet_Line (To : inPositive_Count); + procedureSet_Line (Win : Window; To : Positive_Count); + procedureSet_Line (To : Positive_Count); - functionCol (Win : inWindow) returnPositive_Count; + functionCol (Win : Window) returnPositive_Count; functionColreturnPositive_Count; - functionLine (Win : inWindow) returnPositive_Count; + functionLine (Win : Window) returnPositive_Count; functionLinereturnPositive_Count; ------------------------- Characters-Output ------------------------- - procedurePut (Win : inWindow; Item : in Character); - procedurePut (Item : in Character); + procedurePut (Win : Window; Item : Character); + procedurePut (Item : Character); ---------------------- Strings-Output ---------------------- - procedurePut (Win : inWindow; Item : in String); - procedurePut (Item : in String); + procedurePut (Win : Window; Item : String); + procedurePut (Item : String); procedurePut_Line - (Win : inWindow; - Item : in String); + (Win : Window; + Item : String); procedurePut_Line - (Item : in String); + (Item : String); -- Exceptions diff --git a/doc/html/ada/terminal_interface-curses-trace__adb.htm b/doc/html/ada/terminal_interface-curses-trace__adb.htm index a209b3f3..6a500c1a 100644 --- a/doc/html/ada/terminal_interface-curses-trace__adb.htm +++ b/doc/html/ada/terminal_interface-curses-trace__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 2000,2004 Free Software Foundation, Inc. -- +-- Copyright (c) 2000-2004,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,22 +40,43 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.5 @ +-- @Revision: 1.6 @-- Binding Version 01.00------------------------------------------------------------------------------ +withInterfaces.C; useInterfaces.C; +withTerminal_Interface.Curses.Aux; useTerminal_Interface.Curses.Aux; +with Ada.Unchecked_Conversion; -packagebodyTerminal_Interface.Curses.Traceis +packagebodyTerminal_Interface.Curses.Traceis - procedureTrace_On (x : Trace_Attribute_Set) is - pragma Unreferenced (x); + typeC_TraceTypeisnewC_UInt; + + function TraceAda_To_TraceC isnew + Ada.Unchecked_Conversion (Source => Trace_Attribute_Set, + Target => C_TraceType); + + procedureTrace_On (x : Trace_Attribute_Set) is + proceduretraceC (y : C_TraceType); + pragma Import (C, traceC, "trace"); begin - null; + traceC (TraceAda_To_TraceC (x)); endTrace_On; - procedureTrace_Put (str : String) is - pragma Unreferenced (str); + -- 75. (12) A C function that takes a variable number of arguments can + -- correspond to several Ada subprograms, taking various specific + -- numbers and types of parameters. + + procedureTrace_Put (str : String) is + proceduretracef (format : char_array; s : char_array); + pragma Import (C, tracef, "_tracef"); + Txt : char_array (0 .. str'Length); + Length : size_t; + formatstr : constant String := "%s" & ASCII.NUL; + formattxt : char_array (0 .. formatstr'Length); begin - null; + To_C (formatstr, formattxt, Length); + To_C (str, Txt, Length); + tracef (formattxt, Txt); endTrace_Put; endTerminal_Interface.Curses.Trace; diff --git a/doc/html/ada/terminal_interface-curses-trace__ads.htm b/doc/html/ada/terminal_interface-curses-trace__ads.htm index 8ab28f04..ef569c27 100644 --- a/doc/html/ada/terminal_interface-curses-trace__ads.htm +++ b/doc/html/ada/terminal_interface-curses-trace__ads.htm @@ -44,7 +44,7 @@ -- Binding Version 01.00------------------------------------------------------------------------------ -packageTerminal_Interface.Curses.Traceis +packageTerminal_Interface.Curses.Traceispragma Preelaborate (Terminal_Interface.Curses.Trace); pragma Warnings (Off); @@ -104,11 +104,11 @@ -- |=====================================================================-- #1A NAME="AFU_1"#2| - procedureTrace_On (x : Trace_Attribute_Set); + procedureTrace_On (x : Trace_Attribute_Set); -- The debugging library has trace.-- #1A NAME="AFU_2"#2| - procedureTrace_Put (str : String); + procedureTrace_Put (str : String); -- AKA: _tracef()Current_Trace_Setting : Trace_Attribute_Set; diff --git a/doc/html/ada/terminal_interface-curses__adb.htm b/doc/html/ada/terminal_interface-curses__adb.htm index 1c013753..fe61959f 100644 --- a/doc/html/ada/terminal_interface-curses__adb.htm +++ b/doc/html/ada/terminal_interface-curses__adb.htm @@ -12,7 +12,7 @@ -- B O D Y ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,15 +40,15 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.5 @ --- @Date: 2008/07/26 18:46:32 @ +-- @Revision: 1.6 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00------------------------------------------------------------------------------with System; withTerminal_Interface.Curses.Aux; -withInterfaces.C; useInterfaces.C; -withInterfaces.C.Strings; useInterfaces.C.Strings; +withInterfaces.C; useInterfaces.C; +withInterfaces.C.Strings; useInterfaces.C.Strings; with Ada.Characters.Handling; use Ada.Characters.Handling; with Ada.Strings.Fixed; @@ -64,7 +64,7 @@ pragma Convention (C, chtype_array); ------------------------------------------------------------------------------ - functionKey_Name (Key : inReal_Key_Code) return String + functionKey_Name (Key : Real_Key_Code) return String isfunctionKeyname (K : C_Int) return chars_ptr; pragma Import (C, Keyname, "keyname"); @@ -92,7 +92,7 @@ endif; endKey_Name; - procedureKey_Name (Key : inReal_Key_Code; + procedureKey_Name (Key : Real_Key_Code; Name : out String) isbegin @@ -135,9 +135,9 @@ endif; endIs_End_Window; ------------------------------------------------------------------------------ - procedureMove_Cursor (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position) + procedureMove_Cursor (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position) isfunctionWmove (Win : Window; Line : C_Int; @@ -150,8 +150,8 @@ endif; endMove_Cursor; ------------------------------------------------------------------------------ - procedureAdd (Win : inWindow := Standard_Window; - Ch : inAttributed_Character) + procedureAdd (Win : Window := Standard_Window; + Ch : Attributed_Character) isfunctionWaddch (W : Window; Ch : C_Chtype) returnC_Int; @@ -162,8 +162,8 @@ endif; endAdd; - procedureAdd (Win : inWindow := Standard_Window; - Ch : in Character) + procedureAdd (Win : Window := Standard_Window; + Ch : Character) isbeginAdd (Win, @@ -173,10 +173,10 @@ endAdd; procedureAdd - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Ch : inAttributed_Character) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Attributed_Character) isfunctionmvwaddch (W : Window; Y : C_Int; @@ -192,10 +192,10 @@ endAdd; procedureAdd - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Ch : in Character) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Character) isbeginAdd (Win, @@ -207,8 +207,8 @@ endAdd; procedureAdd_With_Immediate_Echo - (Win : inWindow := Standard_Window; - Ch : inAttributed_Character) + (Win : Window := Standard_Window; + Ch : Attributed_Character) isfunctionWechochar (W : Window; Ch : C_Chtype) returnC_Int; @@ -220,8 +220,8 @@ endAdd_With_Immediate_Echo; procedureAdd_With_Immediate_Echo - (Win : inWindow := Standard_Window; - Ch : in Character) + (Win : Window := Standard_Window; + Ch : Character) isbeginAdd_With_Immediate_Echo @@ -334,9 +334,9 @@ returnW; endDuplicate; - procedureMove_Window (Win : inWindow; - Line : inLine_Position; - Column : inColumn_Position) + procedureMove_Window (Win : Window; + Line : Line_Position; + Column : Column_Position) isfunctionMvwin (Win : Window; Line : C_Int; @@ -348,9 +348,9 @@ endif; endMove_Window; - procedureMove_Derived_Window (Win : inWindow; - Line : inLine_Position; - Column : inColumn_Position) + procedureMove_Derived_Window (Win : Window; + Line : Line_Position; + Column : Column_Position) isfunctionMvderwin (Win : Window; Line : C_Int; @@ -362,8 +362,8 @@ endif; endMove_Derived_Window; - procedureSet_Synch_Mode (Win : inWindow := Standard_Window; - Mode : in Boolean := False) + procedureSet_Synch_Mode (Win : Window := Standard_Window; + Mode : Boolean := False) isfunctionSyncok (Win : Window; Mode : Curses_Bool) returnC_Int; @@ -374,9 +374,9 @@ endif; endSet_Synch_Mode; ------------------------------------------------------------------------------ - procedureAdd (Win : inWindow := Standard_Window; - Str : in String; - Len : in Integer := -1) + procedureAdd (Win : Window := Standard_Window; + Str : String; + Len : Integer := -1) isfunctionWaddnstr (Win : Window; Str : char_array; @@ -393,11 +393,11 @@ endAdd; procedureAdd - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Str : in String; - Len : in Integer := -1) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : String; + Len : Integer := -1) isbeginMove_Cursor (Win, Line, Column); @@ -405,9 +405,9 @@ endAdd; ------------------------------------------------------------------------------procedureAdd - (Win : inWindow := Standard_Window; - Str : inAttributed_String; - Len : in Integer := -1) + (Win : Window := Standard_Window; + Str : Attributed_String; + Len : Integer := -1) isfunctionWaddchnstr (Win : Window; Str : chtype_array; @@ -428,11 +428,11 @@ endAdd; procedureAdd - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Str : inAttributed_String; - Len : in Integer := -1) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : Attributed_String; + Len : Integer := -1) isbeginMove_Cursor (Win, Line, Column); @@ -440,15 +440,15 @@ endAdd; ------------------------------------------------------------------------------procedureBorder - (Win : inWindow := Standard_Window; - Left_Side_Symbol : inAttributed_Character := Default_Character; - Right_Side_Symbol : inAttributed_Character := Default_Character; - Top_Side_Symbol : inAttributed_Character := Default_Character; - Bottom_Side_Symbol : inAttributed_Character := Default_Character; - Upper_Left_Corner_Symbol : inAttributed_Character := Default_Character; - Upper_Right_Corner_Symbol : inAttributed_Character := Default_Character; - Lower_Left_Corner_Symbol : inAttributed_Character := Default_Character; - Lower_Right_Corner_Symbol : inAttributed_Character := Default_Character) + (Win : Window := Standard_Window; + Left_Side_Symbol : Attributed_Character := Default_Character; + Right_Side_Symbol : Attributed_Character := Default_Character; + Top_Side_Symbol : Attributed_Character := Default_Character; + Bottom_Side_Symbol : Attributed_Character := Default_Character; + Upper_Left_Corner_Symbol : Attributed_Character := Default_Character; + Upper_Right_Corner_Symbol : Attributed_Character := Default_Character; + Lower_Left_Corner_Symbol : Attributed_Character := Default_Character; + Lower_Right_Corner_Symbol : Attributed_Character := Default_Character) isfunctionWborder (W : Window; LS : C_Chtype; @@ -477,9 +477,9 @@ endBorder; procedureBox - (Win : inWindow := Standard_Window; - Vertical_Symbol : inAttributed_Character := Default_Character; - Horizontal_Symbol : inAttributed_Character := Default_Character) + (Win : Window := Standard_Window; + Vertical_Symbol : Attributed_Character := Default_Character; + Horizontal_Symbol : Attributed_Character := Default_Character) isbeginBorder (Win, @@ -488,9 +488,9 @@ endBox; procedureHorizontal_Line - (Win : inWindow := Standard_Window; - Line_Size : in Natural; - Line_Symbol : inAttributed_Character := Default_Character) + (Win : Window := Standard_Window; + Line_Size : Natural; + Line_Symbol : Attributed_Character := Default_Character) isfunctionWhline (W : Window; Ch : C_Chtype; @@ -505,9 +505,9 @@ endHorizontal_Line; procedureVertical_Line - (Win : inWindow := Standard_Window; - Line_Size : in Natural; - Line_Symbol : inAttributed_Character := Default_Character) + (Win : Window := Standard_Window; + Line_Size : Natural; + Line_Symbol : Attributed_Character := Default_Character) isfunctionWvline (W : Window; Ch : C_Chtype; @@ -537,7 +537,7 @@ endif; endGet_Keystroke; - procedureUndo_Keystroke (Key : inReal_Key_Code) + procedureUndo_Keystroke (Key : Real_Key_Code) isfunctionUngetch (Ch : C_Int) returnC_Int; pragma Import (C, Ungetch, "ungetch"); @@ -609,9 +609,9 @@ endStandout; procedureSwitch_Character_Attribute - (Win : inWindow := Standard_Window; - Attr : inCharacter_Attribute_Set := Normal_Video; - On : in Boolean := True) + (Win : Window := Standard_Window; + Attr : Character_Attribute_Set := Normal_Video; + On : Boolean := True) isfunctionWattron (Win : Window; C_Attr : C_AttrType) returnC_Int; @@ -637,9 +637,9 @@ endSwitch_Character_Attribute; procedureSet_Character_Attributes - (Win : inWindow := Standard_Window; - Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Win : Window := Standard_Window; + Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionWattrset (Win : Window; C_Attr : C_AttrType) returnC_Int; @@ -700,8 +700,8 @@ endif; endGet_Character_Attribute; - procedureSet_Color (Win : inWindow := Standard_Window; - Pair : inColor_Pair) + procedureSet_Color (Win : Window := Standard_Window; + Pair : Color_Pair) isfunctionWset_Color (Win : Window; Color : C_Short; @@ -716,10 +716,10 @@ endSet_Color; procedureChange_Attributes - (Win : inWindow := Standard_Window; - Count : in Integer := -1; - Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Win : Window := Standard_Window; + Count : Integer := -1; + Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionWchgat (Win : Window; Cnt : C_Int; @@ -739,12 +739,12 @@ endChange_Attributes; procedureChange_Attributes - (Win : inWindow := Standard_Window; - Line : inLine_Position := Line_Position'First; - Column : inColumn_Position := Column_Position'First; - Count : in Integer := -1; - Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Win : Window := Standard_Window; + Line : Line_Position := Line_Position'First; + Column : Column_Position := Column_Position'First; + Count : Integer := -1; + Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isbeginMove_Cursor (Win, Line, Column); @@ -771,7 +771,7 @@ endif; endFlash_Screen; ------------------------------------------------------------------------------ - procedureSet_Cbreak_Mode (SwitchOn : in Boolean := True) + procedureSet_Cbreak_Mode (SwitchOn : Boolean := True) isfunctionCbreakreturnC_Int; pragma Import (C, Cbreak, "cbreak"); @@ -790,7 +790,7 @@ endif; endSet_Cbreak_Mode; - procedureSet_Raw_Mode (SwitchOn : in Boolean := True) + procedureSet_Raw_Mode (SwitchOn : Boolean := True) isfunctionRawreturnC_Int; pragma Import (C, Raw, "raw"); @@ -809,7 +809,7 @@ endif; endSet_Raw_Mode; - procedureSet_Echo_Mode (SwitchOn : in Boolean := True) + procedureSet_Echo_Mode (SwitchOn : Boolean := True) isfunctionEchoreturnC_Int; pragma Import (C, Echo, "echo"); @@ -828,8 +828,8 @@ endif; endSet_Echo_Mode; - procedureSet_Meta_Mode (Win : inWindow := Standard_Window; - SwitchOn : in Boolean := True) + procedureSet_Meta_Mode (Win : Window := Standard_Window; + SwitchOn : Boolean := True) isfunctionMeta (W : Window; Mode : Curses_Bool) returnC_Int; pragma Import (C, Meta, "meta"); @@ -839,8 +839,8 @@ endif; endSet_Meta_Mode; - procedureSet_KeyPad_Mode (Win : inWindow := Standard_Window; - SwitchOn : in Boolean := True) + procedureSet_KeyPad_Mode (Win : Window := Standard_Window; + SwitchOn : Boolean := True) isfunctionKeypad (W : Window; Mode : Curses_Bool) returnC_Int; pragma Import (C, Keypad, "keypad"); @@ -850,7 +850,7 @@ endif; endSet_KeyPad_Mode; - functionGet_KeyPad_Mode (Win : inWindow := Standard_Window) + functionGet_KeyPad_Mode (Win : Window := Standard_Window) return Boolean isfunctionIs_Keypad (W : Window) returnCurses_Bool; @@ -859,7 +859,7 @@ return (Is_Keypad (Win) /= Curses_Bool_False); endGet_KeyPad_Mode; - procedureHalf_Delay (Amount : inHalf_Delay_Amount) + procedureHalf_Delay (Amount : Half_Delay_Amount) isfunctionHalfdelay (Amount : C_Int) returnC_Int; pragma Import (C, Halfdelay, "halfdelay"); @@ -870,8 +870,8 @@ endHalf_Delay; procedureSet_Flush_On_Interrupt_Mode - (Win : inWindow := Standard_Window; - Mode : in Boolean := True) + (Win : Window := Standard_Window; + Mode : Boolean := True) isfunctionIntrflush (Win : Window; Mode : Curses_Bool) returnC_Int; pragma Import (C, Intrflush, "intrflush"); @@ -882,8 +882,8 @@ endSet_Flush_On_Interrupt_Mode; procedureSet_Queue_Interrupt_Mode - (Win : inWindow := Standard_Window; - Flush : in Boolean := True) + (Win : Window := Standard_Window; + Flush : Boolean := True) isprocedureQiflush; pragma Import (C, Qiflush, "qiflush"); @@ -901,8 +901,8 @@ endSet_Queue_Interrupt_Mode; procedureSet_NoDelay_Mode - (Win : inWindow := Standard_Window; - Mode : in Boolean := False) + (Win : Window := Standard_Window; + Mode : Boolean := False) isfunctionNodelay (Win : Window; Mode : Curses_Bool) returnC_Int; pragma Import (C, Nodelay, "nodelay"); @@ -912,9 +912,9 @@ endif; endSet_NoDelay_Mode; - procedureSet_Timeout_Mode (Win : inWindow := Standard_Window; - Mode : inTimeout_Mode; - Amount : in Natural) + procedureSet_Timeout_Mode (Win : Window := Standard_Window; + Mode : Timeout_Mode; + Amount : Natural) isprocedureWtimeout (Win : Window; Amount : C_Int); pragma Import (C, Wtimeout, "wtimeout"); @@ -934,8 +934,8 @@ endSet_Timeout_Mode; procedureSet_Escape_Timer_Mode - (Win : inWindow := Standard_Window; - Timer_Off : in Boolean := False) + (Win : Window := Standard_Window; + Timer_Off : Boolean := False) isfunctionNotimeout (Win : Window; Mode : Curses_Bool) returnC_Int; pragma Import (C, Notimeout, "notimeout"); @@ -947,7 +947,7 @@ endSet_Escape_Timer_Mode; ------------------------------------------------------------------------------ - procedureSet_NL_Mode (SwitchOn : in Boolean := True) + procedureSet_NL_Mode (SwitchOn : Boolean := True) isfunctionNLreturnC_Int; pragma Import (C, NL, "nl"); @@ -967,8 +967,8 @@ endSet_NL_Mode; procedureClear_On_Next_Update - (Win : inWindow := Standard_Window; - Do_Clear : in Boolean := True) + (Win : Window := Standard_Window; + Do_Clear : Boolean := True) isfunctionClear_Ok (W : Window; Flag : Curses_Bool) returnC_Int; pragma Import (C, Clear_Ok, "clearok"); @@ -979,8 +979,8 @@ endClear_On_Next_Update; procedureUse_Insert_Delete_Line - (Win : inWindow := Standard_Window; - Do_Idl : in Boolean := True) + (Win : Window := Standard_Window; + Do_Idl : Boolean := True) isfunctionIDL_Ok (W : Window; Flag : Curses_Bool) returnC_Int; pragma Import (C, IDL_Ok, "idlok"); @@ -991,8 +991,8 @@ endUse_Insert_Delete_Line; procedureUse_Insert_Delete_Character - (Win : inWindow := Standard_Window; - Do_Idc : in Boolean := True) + (Win : Window := Standard_Window; + Do_Idc : Boolean := True) isprocedureIDC_Ok (W : Window; Flag : Curses_Bool); pragma Import (C, IDC_Ok, "idcok"); @@ -1001,8 +1001,8 @@ endUse_Insert_Delete_Character; procedureLeave_Cursor_After_Update - (Win : inWindow := Standard_Window; - Do_Leave : in Boolean := True) + (Win : Window := Standard_Window; + Do_Leave : Boolean := True) isfunctionLeave_Ok (W : Window; Flag : Curses_Bool) returnC_Int; pragma Import (C, Leave_Ok, "leaveok"); @@ -1013,8 +1013,8 @@ endLeave_Cursor_After_Update; procedureImmediate_Update_Mode - (Win : inWindow := Standard_Window; - Mode : in Boolean := False) + (Win : Window := Standard_Window; + Mode : Boolean := False) isprocedureImmedok (Win : Window; Mode : Curses_Bool); pragma Import (C, Immedok, "immedok"); @@ -1023,8 +1023,8 @@ endImmediate_Update_Mode; procedureAllow_Scrolling - (Win : inWindow := Standard_Window; - Mode : in Boolean := False) + (Win : Window := Standard_Window; + Mode : Boolean := False) isfunctionScrollok (Win : Window; Mode : Curses_Bool) returnC_Int; pragma Import (C, Scrollok, "scrollok"); @@ -1044,9 +1044,9 @@ endScrolling_Allowed; procedureSet_Scroll_Region - (Win : inWindow := Standard_Window; - Top_Line : inLine_Position; - Bottom_Line : inLine_Position) + (Win : Window := Standard_Window; + Top_Line : Line_Position; + Bottom_Line : Line_Position) isfunctionWsetscrreg (Win : Window; Lin : C_Int; @@ -1069,7 +1069,7 @@ endif; endUpdate_Screen; - procedureRefresh (Win : inWindow := Standard_Window) + procedureRefresh (Win : Window := Standard_Window) isfunctionWrefresh (W : Window) returnC_Int; pragma Import (C, Wrefresh, "wrefresh"); @@ -1080,7 +1080,7 @@ endRefresh; procedureRefresh_Without_Update - (Win : inWindow := Standard_Window) + (Win : Window := Standard_Window) isfunctionWnoutrefresh (W : Window) returnC_Int; pragma Import (C, Wnoutrefresh, "wnoutrefresh"); @@ -1090,7 +1090,7 @@ endif; endRefresh_Without_Update; - procedureRedraw (Win : inWindow := Standard_Window) + procedureRedraw (Win : Window := Standard_Window) isfunctionRedrawwin (Win : Window) returnC_Int; pragma Import (C, Redrawwin, "redrawwin"); @@ -1101,9 +1101,9 @@ endRedraw; procedureRedraw - (Win : inWindow := Standard_Window; - Begin_Line : inLine_Position; - Line_Count : in Positive) + (Win : Window := Standard_Window; + Begin_Line : Line_Position; + Line_Count : Positive) isfunctionWredrawln (Win : Window; First : C_Int; Cnt : C_Int) returnC_Int; @@ -1117,7 +1117,7 @@ endRedraw; ------------------------------------------------------------------------------ - procedureErase (Win : inWindow := Standard_Window) + procedureErase (Win : Window := Standard_Window) isfunctionWerase (W : Window) returnC_Int; pragma Import (C, Werase, "werase"); @@ -1127,7 +1127,7 @@ endif; endErase; - procedureClear (Win : inWindow := Standard_Window) + procedureClear (Win : Window := Standard_Window) isfunctionWclear (W : Window) returnC_Int; pragma Import (C, Wclear, "wclear"); @@ -1137,7 +1137,7 @@ endif; endClear; - procedureClear_To_End_Of_Screen (Win : inWindow := Standard_Window) + procedureClear_To_End_Of_Screen (Win : Window := Standard_Window) isfunctionWclearbot (W : Window) returnC_Int; pragma Import (C, Wclearbot, "wclrtobot"); @@ -1147,7 +1147,7 @@ endif; endClear_To_End_Of_Screen; - procedureClear_To_End_Of_Line (Win : inWindow := Standard_Window) + procedureClear_To_End_Of_Line (Win : Window := Standard_Window) isfunctionWcleareol (W : Window) returnC_Int; pragma Import (C, Wcleareol, "wclrtoeol"); @@ -1158,18 +1158,18 @@ endClear_To_End_Of_Line; ------------------------------------------------------------------------------procedureSet_Background - (Win : inWindow := Standard_Window; - Ch : inAttributed_Character) + (Win : Window := Standard_Window; + Ch : Attributed_Character) is - procedureWBackground (W : inWindow; Ch : inC_Chtype); + procedureWBackground (W : Window; Ch : C_Chtype); pragma Import (C, WBackground, "wbkgdset"); beginWBackground (Win, AttrChar_To_Chtype (Ch)); endSet_Background; procedureChange_Background - (Win : inWindow := Standard_Window; - Ch : inAttributed_Character) + (Win : Window := Standard_Window; + Ch : Attributed_Character) isfunctionWChangeBkgd (W : Window; Ch : C_Chtype) returnC_Int; pragma Import (C, WChangeBkgd, "wbkgd"); @@ -1188,10 +1188,10 @@ return Chtype_To_AttrChar (Wgetbkgd (Win)); endGet_Background; ------------------------------------------------------------------------------ - procedureChange_Lines_Status (Win : inWindow := Standard_Window; - Start : inLine_Position; - Count : in Positive; - State : in Boolean) + procedureChange_Lines_Status (Win : Window := Standard_Window; + Start : Line_Position; + Count : Positive; + State : Boolean) isfunctionWtouchln (Win : Window; Sta : C_Int; @@ -1205,7 +1205,7 @@ endif; endChange_Lines_Status; - procedureTouch (Win : inWindow := Standard_Window) + procedureTouch (Win : Window := Standard_Window) isY : Line_Position; X : Column_Position; @@ -1214,7 +1214,7 @@ Change_Lines_Status (Win, 0, Positive (Y), True); endTouch; - procedureUntouch (Win : inWindow := Standard_Window) + procedureUntouch (Win : Window := Standard_Window) isY : Line_Position; X : Column_Position; @@ -1223,9 +1223,9 @@ Change_Lines_Status (Win, 0, Positive (Y), False); endUntouch; - procedureTouch (Win : inWindow := Standard_Window; - Start : inLine_Position; - Count : in Positive) + procedureTouch (Win : Window := Standard_Window; + Start : Line_Position; + Count : Positive) isbeginChange_Lines_Status (Win, Start, Count, True); @@ -1259,15 +1259,15 @@ endIs_Touched; ------------------------------------------------------------------------------procedureCopy - (Source_Window : inWindow; - Destination_Window : inWindow; - Source_Top_Row : inLine_Position; - Source_Left_Column : inColumn_Position; - Destination_Top_Row : inLine_Position; - Destination_Left_Column : inColumn_Position; - Destination_Bottom_Row : inLine_Position; - Destination_Right_Column : inColumn_Position; - Non_Destructive_Mode : in Boolean := True) + (Source_Window : Window; + Destination_Window : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position; + Non_Destructive_Mode : Boolean := True) isfunctionCopywin (Src : Window; Dst : Window; @@ -1295,8 +1295,8 @@ endCopy; procedureOverwrite - (Source_Window : inWindow; - Destination_Window : inWindow) + (Source_Window : Window; + Destination_Window : Window) isfunctionOverwrite (Src : Window; Dst : Window) returnC_Int; pragma Import (C, Overwrite, "overwrite"); @@ -1307,8 +1307,8 @@ endOverwrite; procedureOverlay - (Source_Window : inWindow; - Destination_Window : inWindow) + (Source_Window : Window; + Destination_Window : Window) isfunctionOverlay (Src : Window; Dst : Window) returnC_Int; pragma Import (C, Overlay, "overlay"); @@ -1320,8 +1320,8 @@ ------------------------------------------------------------------------------procedureInsert_Delete_Lines - (Win : inWindow := Standard_Window; - Lines : in Integer := 1) -- default is to insert one line above + (Win : Window := Standard_Window; + Lines : Integer := 1) -- default is to insert one line aboveisfunctionWinsdelln (W : Window; N : C_Int) returnC_Int; pragma Import (C, Winsdelln, "winsdelln"); @@ -1331,13 +1331,13 @@ endif; endInsert_Delete_Lines; - procedureDelete_Line (Win : inWindow := Standard_Window) + procedureDelete_Line (Win : Window := Standard_Window) isbeginInsert_Delete_Lines (Win, -1); endDelete_Line; - procedureInsert_Line (Win : inWindow := Standard_Window) + procedureInsert_Line (Win : Window := Standard_Window) isbeginInsert_Delete_Lines (Win, 1); @@ -1345,7 +1345,7 @@ ------------------------------------------------------------------------------procedureGet_Size - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Number_Of_Lines : outLine_Count; Number_Of_Columns : outColumn_Count) is @@ -1365,7 +1365,7 @@ endGet_Size; procedureGet_Window_Position - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Top_Left_Line : outLine_Position; Top_Left_Column : outColumn_Position) is @@ -1383,7 +1383,7 @@ endGet_Window_Position; procedureGet_Cursor_Position - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Line : outLine_Position; Column : outColumn_Position) is @@ -1401,7 +1401,7 @@ endGet_Cursor_Position; procedureGet_Origin_Relative_To_Parent - (Win : inWindow; + (Win : Window; Top_Left_Line : outLine_Position; Top_Left_Column : outColumn_Position; Is_Not_A_Subwindow : out Boolean) @@ -1470,13 +1470,13 @@ endSub_Pad; procedureRefresh - (Pad : inWindow; - Source_Top_Row : inLine_Position; - Source_Left_Column : inColumn_Position; - Destination_Top_Row : inLine_Position; - Destination_Left_Column : inColumn_Position; - Destination_Bottom_Row : inLine_Position; - Destination_Right_Column : inColumn_Position) + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position) isfunctionPrefresh (Pad : Window; @@ -1500,13 +1500,13 @@ endRefresh; procedureRefresh_Without_Update - (Pad : inWindow; - Source_Top_Row : inLine_Position; - Source_Left_Column : inColumn_Position; - Destination_Top_Row : inLine_Position; - Destination_Left_Column : inColumn_Position; - Destination_Bottom_Row : inLine_Position; - Destination_Right_Column : inColumn_Position) + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position) isfunctionPnoutrefresh (Pad : Window; @@ -1530,8 +1530,8 @@ endRefresh_Without_Update; procedureAdd_Character_To_Pad_And_Echo_It - (Pad : inWindow; - Ch : inAttributed_Character) + (Pad : Window; + Ch : Attributed_Character) isfunctionPechochar (Pad : Window; Ch : C_Chtype) returnC_Int; @@ -1543,8 +1543,8 @@ endAdd_Character_To_Pad_And_Echo_It; procedureAdd_Character_To_Pad_And_Echo_It - (Pad : inWindow; - Ch : in Character) + (Pad : Window; + Ch : Character) isbeginAdd_Character_To_Pad_And_Echo_It @@ -1554,8 +1554,8 @@ Attr => Normal_Video)); endAdd_Character_To_Pad_And_Echo_It; ------------------------------------------------------------------------------ - procedureScroll (Win : inWindow := Standard_Window; - Amount : in Integer := 1) + procedureScroll (Win : Window := Standard_Window; + Amount : Integer := 1) isfunctionWscrl (Win : Window; N : C_Int) returnC_Int; pragma Import (C, Wscrl, "wscrl"); @@ -1567,7 +1567,7 @@ endScroll; ------------------------------------------------------------------------------ - procedureDelete_Character (Win : inWindow := Standard_Window) + procedureDelete_Character (Win : Window := Standard_Window) isfunctionWdelch (Win : Window) returnC_Int; pragma Import (C, Wdelch, "wdelch"); @@ -1578,9 +1578,9 @@ endDelete_Character; procedureDelete_Character - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position) isfunctionMvwdelch (Win : Window; Lin : C_Int; @@ -1614,8 +1614,8 @@ return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column))); endPeek; ------------------------------------------------------------------------------ - procedureInsert (Win : inWindow := Standard_Window; - Ch : inAttributed_Character) + procedureInsert (Win : Window := Standard_Window; + Ch : Attributed_Character) isfunctionWinsch (Win : Window; Ch : C_Chtype) returnC_Int; pragma Import (C, Winsch, "winsch"); @@ -1626,10 +1626,10 @@ endInsert; procedureInsert - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Ch : inAttributed_Character) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Attributed_Character) isfunctionMvwinsch (Win : Window; Lin : C_Int; @@ -1645,9 +1645,9 @@ endif; endInsert; ------------------------------------------------------------------------------ - procedureInsert (Win : inWindow := Standard_Window; - Str : in String; - Len : in Integer := -1) + procedureInsert (Win : Window := Standard_Window; + Str : String; + Len : Integer := -1) isfunctionWinsnstr (Win : Window; Str : char_array; @@ -1664,11 +1664,11 @@ endInsert; procedureInsert - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Str : in String; - Len : in Integer := -1) + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : String; + Len : Integer := -1) isfunctionMvwinsnstr (Win : Window; Line : C_Int; @@ -1687,9 +1687,9 @@ endif; endInsert; ------------------------------------------------------------------------------ - procedurePeek (Win : inWindow := Standard_Window; + procedurePeek (Win : Window := Standard_Window; Str : out String; - Len : in Integer := -1) + Len : Integer := -1) isfunctionWinnstr (Win : Window; Str : char_array; @@ -1706,7 +1706,7 @@ ifN > Str'Length thenraise Constraint_Error; endif; - Txt (0) := Interfaces.C.char'First; + Txt (0) := Interfaces.C.char'First; ifWinnstr (Win, Txt, C_Int (N)) = Curses_ErrthenraiseCurses_Exception; endif; @@ -1717,11 +1717,11 @@ endPeek; procedurePeek - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; Str : out String; - Len : in Integer := -1) + Len : Integer := -1) isbeginMove_Cursor (Win, Line, Column); @@ -1729,9 +1729,9 @@ endPeek; ------------------------------------------------------------------------------procedurePeek - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Str : outAttributed_String; - Len : in Integer := -1) + Len : Integer := -1) isfunctionWinchnstr (Win : Window; Str : chtype_array; -- out @@ -1766,20 +1766,20 @@ endPeek; procedurePeek - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; Str : outAttributed_String; - Len : in Integer := -1) + Len : Integer := -1) isbeginMove_Cursor (Win, Line, Column); Peek (Win, Str, Len); endPeek; ------------------------------------------------------------------------------ - procedureGet (Win : inWindow := Standard_Window; + procedureGet (Win : Window := Standard_Window; Str : out String; - Len : in Integer := -1) + Len : Integer := -1) isfunctionWgetnstr (Win : Window; Str : char_array; @@ -1796,7 +1796,7 @@ ifN > Str'Length thenraise Constraint_Error; endif; - Txt (0) := Interfaces.C.char'First; + Txt (0) := Interfaces.C.char'First; ifWgetnstr (Win, Txt, C_Int (N)) = Curses_ErrthenraiseCurses_Exception; endif; @@ -1807,11 +1807,11 @@ endGet; procedureGet - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; Str : out String; - Len : in Integer := -1) + Len : Integer := -1) isbeginMove_Cursor (Win, Line, Column); @@ -1819,7 +1819,7 @@ endGet; ------------------------------------------------------------------------------procedureInit_Soft_Label_Keys - (Format : inSoft_Label_Key_Format := Three_Two_Three) + (Format : Soft_Label_Key_Format := Three_Two_Three) isfunctionSlk_Init (Fmt : C_Int) returnC_Int; pragma Import (C, Slk_Init, "slk_init"); @@ -1829,9 +1829,9 @@ endif; endInit_Soft_Label_Keys; - procedureSet_Soft_Label_Key (Label : inLabel_Number; - Text : in String; - Fmt : inLabel_Justification := Left) + procedureSet_Soft_Label_Key (Label : Label_Number; + Text : String; + Fmt : Label_Justification := Left) isfunctionSlk_Set (Label : C_Int; Txt : char_array; @@ -1868,7 +1868,7 @@ endif; endRefresh_Soft_Label_Keys_Without_Update; - procedureGet_Soft_Label_Key (Label : inLabel_Number; + procedureGet_Soft_Label_Key (Label : Label_Number; Text : out String) isfunctionSlk_Label (Label : C_Int) return chars_ptr; @@ -1877,7 +1877,7 @@ Fill_String (Slk_Label (C_Int (Label)), Text); endGet_Soft_Label_Key; - functionGet_Soft_Label_Key (Label : inLabel_Number) return String + functionGet_Soft_Label_Key (Label : Label_Number) return String isfunctionSlk_Label (Label : C_Int) return chars_ptr; pragma Import (C, Slk_Label, "slk_label"); @@ -1916,8 +1916,8 @@ endTouch_Soft_Label_Keys; procedureSwitch_Soft_Label_Key_Attributes - (Attr : inCharacter_Attribute_Set; - On : in Boolean := True) + (Attr : Character_Attribute_Set; + On : Boolean := True) isfunctionSlk_Attron (Ch : C_Chtype) returnC_Int; pragma Import (C, Slk_Attron, "slk_attron"); @@ -1940,8 +1940,8 @@ endSwitch_Soft_Label_Key_Attributes; procedureSet_Soft_Label_Key_Attributes - (Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First) + (Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) isfunctionSlk_Attrset (Ch : C_Chtype) returnC_Int; pragma Import (C, Slk_Attrset, "slk_attrset"); @@ -1975,9 +1975,9 @@ returnChtype_To_AttrChar (Attr).Color; endGet_Soft_Label_Key_Attributes; - procedureSet_Soft_Label_Key_Color (Pair : inColor_Pair) + procedureSet_Soft_Label_Key_Color (Pair : Color_Pair) is - functionSlk_Color (Color : inC_Short) returnC_Int; + functionSlk_Color (Color : C_Short) returnC_Int; pragma Import (C, Slk_Color, "slk_color"); beginifSlk_Color (C_Short (Pair)) = Curses_Errthen @@ -1986,8 +1986,8 @@ endSet_Soft_Label_Key_Color; ------------------------------------------------------------------------------ - procedureEnable_Key (Key : inSpecial_Key_Code; - Enable : in Boolean := True) + procedureEnable_Key (Key : Special_Key_Code; + Enable : Boolean := True) isfunctionKeyok (Keycode : C_Int; On_Off : Curses_Bool) returnC_Int; @@ -1999,8 +1999,8 @@ endif; endEnable_Key; ------------------------------------------------------------------------------ - procedureDefine_Key (Definition : in String; - Key : inSpecial_Key_Code) + procedureDefine_Key (Definition : String; + Key : Special_Key_Code) isfunctionDefkey (Def : char_array; Key : C_Int) returnC_Int; @@ -2015,7 +2015,7 @@ endif; endDefine_Key; ------------------------------------------------------------------------------ - procedureUn_Control (Ch : inAttributed_Character; + procedureUn_Control (Ch : Attributed_Character; Str : out String) isfunctionUnctrl (Ch : C_Chtype) return chars_ptr; @@ -2024,7 +2024,7 @@ Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str); endUn_Control; - functionUn_Control (Ch : inAttributed_Character) return String + functionUn_Control (Ch : Attributed_Character) return String isfunctionUnctrl (Ch : C_Chtype) return chars_ptr; pragma Import (C, Unctrl, "unctrl"); @@ -2032,7 +2032,7 @@ returnFill_String (Unctrl (AttrChar_To_Chtype (Ch))); endUn_Control; - procedureDelay_Output (Msecs : in Natural) + procedureDelay_Output (Msecs : Natural) isfunctionDelayoutput (Msecs : C_Int) returnC_Int; pragma Import (C, Delayoutput, "delay_output"); @@ -2142,9 +2142,9 @@ returnFill_String (Termname); endTerminal_Name; ------------------------------------------------------------------------------ - procedureInit_Pair (Pair : inRedefinable_Color_Pair; - Fore : inColor_Number; - Back : inColor_Number) + procedureInit_Pair (Pair : Redefinable_Color_Pair; + Fore : Color_Number; + Back : Color_Number) isfunctionInitpair (Pair : C_Short; Fore : C_Short; @@ -2164,7 +2164,7 @@ endif; endInit_Pair; - procedurePair_Content (Pair : inColor_Pair; + procedurePair_Content (Pair : Color_Pair; Fore : outColor_Number; Back : outColor_Number) is @@ -2196,10 +2196,10 @@ endif; endHas_Colors; - procedureInit_Color (Color : inColor_Number; - Red : inRGB_Value; - Green : inRGB_Value; - Blue : inRGB_Value) + procedureInit_Color (Color : Color_Number; + Red : RGB_Value; + Green : RGB_Value; + Blue : RGB_Value) isfunctionInitcolor (Col : C_Short; Red : C_Short; @@ -2225,7 +2225,7 @@ endif; endCan_Change_Color; - procedureColor_Content (Color : inColor_Number; + procedureColor_Content (Color : Color_Number; Red : outRGB_Value; Green : outRGB_Value; Blue : outRGB_Value) @@ -2249,7 +2249,7 @@ endColor_Content; ------------------------------------------------------------------------------ - procedureSave_Curses_Mode (Mode : inCurses_Mode) + procedureSave_Curses_Mode (Mode : Curses_Mode) isfunctionDef_Prog_ModereturnC_Int; pragma Import (C, Def_Prog_Mode, "def_prog_mode"); @@ -2267,7 +2267,7 @@ endif; endSave_Curses_Mode; - procedureReset_Curses_Mode (Mode : inCurses_Mode) + procedureReset_Curses_Mode (Mode : Curses_Mode) isfunctionReset_Prog_ModereturnC_Int; pragma Import (C, Reset_Prog_Mode, "reset_prog_mode"); @@ -2305,8 +2305,8 @@ endif; endReset_Terminal_State; - procedureRip_Off_Lines (Lines : in Integer; - Proc : inStdscr_Init_Proc) + procedureRip_Off_Lines (Lines : Integer; + Proc : Stdscr_Init_Proc) isfunctionRipoffline (Lines : C_Int; Proc : Stdscr_Init_Proc) returnC_Int; @@ -2330,7 +2330,7 @@ endif; endSet_Cursor_Visibility; - procedureNap_Milli_Seconds (Ms : in Natural) + procedureNap_Milli_Seconds (Ms : Natural) isfunctionNapms (Ms : C_Int) returnC_Int; pragma Import (C, Napms, "napms"); @@ -2399,10 +2399,10 @@ ------------------------------------------------------------------------------procedureTransform_Coordinates - (W : inWindow := Standard_Window; + (W : Window := Standard_Window; Line : inoutLine_Position; Column : inoutColumn_Position; - Dir : inTransform_Direction := From_Screen) + Dir : Transform_Direction := From_Screen) istypeInt_AccessisaccessallC_Int; functionTransform (W : Window; @@ -2490,7 +2490,7 @@ endif; endUse_Extended_Names; ------------------------------------------------------------------------------ - procedureScreen_Dump_To_File (Filename : in String) + procedureScreen_Dump_To_File (Filename : String) isfunctionscr_dump (f : char_array) returnC_Int; pragma Import (C, scr_dump, "scr_dump"); @@ -2503,7 +2503,7 @@ endif; endScreen_Dump_To_File; - procedureScreen_Restore_From_File (Filename : in String) + procedureScreen_Restore_From_File (Filename : String) isfunctionscr_restore (f : char_array) returnC_Int; pragma Import (C, scr_restore, "scr_restore"); @@ -2516,7 +2516,7 @@ endif; endScreen_Restore_From_File; - procedureScreen_Init_From_File (Filename : in String) + procedureScreen_Init_From_File (Filename : String) isfunctionscr_init (f : char_array) returnC_Int; pragma Import (C, scr_init, "scr_init"); @@ -2529,7 +2529,7 @@ endif; endScreen_Init_From_File; - procedureScreen_Set_File (Filename : in String) + procedureScreen_Set_File (Filename : String) isfunctionscr_set (f : char_array) returnC_Int; pragma Import (C, scr_set, "scr_set"); diff --git a/doc/html/ada/terminal_interface-curses__ads.htm b/doc/html/ada/terminal_interface-curses__ads.htm index 4cc11941..608ff251 100644 --- a/doc/html/ada/terminal_interface-curses__ads.htm +++ b/doc/html/ada/terminal_interface-curses__ads.htm @@ -12,7 +12,7 @@ -- S P E C ---- -------------------------------------------------------------------------------- --- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. ---- ---- Permission is hereby granted, free of charge, to any person obtaining a ---- copy of this software and associated documentation files (the -- @@ -40,8 +40,8 @@ -------------------------------------------------------------------------------- Author: Juergen Pfeifer, 1996-- Version Control: --- @Revision: 1.41 @ --- @Date: 2007/05/05 20:33:52 @ +-- @Revision: 1.42 @ +-- @Date: 2009/12/26 17:38:58 @-- Binding Version 01.00-------------------------------------------------------------------------------- curses binding. @@ -49,15 +49,15 @@ -- Run the generator instead.-- |with System.Storage_Elements; -withInterfaces.C; -- We need this for some assertions. +withInterfaces.C; -- We need this for some assertions.packageTerminal_Interface.Cursesispragma Preelaborate (Terminal_Interface.Curses); pragma Linker_Options ("-lncursesw"); NC_Major_Version : constant := 5; -- Major version of the library - NC_Minor_Version : constant := 6; -- Minor version of the library - NC_Version : constant String := "5.6"; -- Version of library + NC_Minor_Version : constant := 7; -- Minor version of the library + NC_Version : constant String := "5.7"; -- Version of librarytypeWindowisprivate; Null_Window : constantWindow; @@ -280,8 +280,8 @@ ------------------------------------------------------------------------------ - typeColor_Numberisrange -1 .. Integer (Interfaces.C.short'Last); - forColor_Number'Size useInterfaces.C.short'Size; + typeColor_Numberisrange -1 .. Integer (Interfaces.C.short'Last); + forColor_Number'Size useInterfaces.C.short'Size; -- (n)curses uses a short for the color index-- The model is, that a Color_Number is an index into an array of-- (potentially) definable colors. Some of those indices are @@ -297,8 +297,8 @@ Cyan : constantColor_Number := 6; White : constantColor_Number := 7; - typeRGB_Valueisrange 0 .. Integer (Interfaces.C.short'Last); - forRGB_Value'Size useInterfaces.C.short'Size; + typeRGB_Valueisrange 0 .. Integer (Interfaces.C.short'Last); + forRGB_Value'Size useInterfaces.C.short'Size; -- Some system may allow to redefine a color by setting RGB values.typeColor_Pairisrange 0 .. 255; @@ -513,9 +513,9 @@ -- |=====================================================================-- #1A NAME="AFU_7"#2| - procedureMove_Cursor (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position); + procedureMove_Cursor (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position); -- AKA: wmove()-- AKA: move()pragma Inline (Move_Cursor); @@ -525,43 +525,43 @@ -- |=====================================================================-- #1A NAME="AFU_8"#2| - procedureAdd (Win : inWindow := Standard_Window; - Ch : inAttributed_Character); + procedureAdd (Win : Window := Standard_Window; + Ch : Attributed_Character); -- AKA: waddch()-- AKA: addch() - procedureAdd (Win : inWindow := Standard_Window; - Ch : in Character); + procedureAdd (Win : Window := Standard_Window; + Ch : Character); -- Add a single character at the current logical cursor position to-- the window. Use the current windows attributes.-- #1A NAME="AFU_9"#2|procedureAdd - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Ch : inAttributed_Character); + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Attributed_Character); -- AKA: mvwaddch()-- AKA: mvaddch()procedureAdd - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Ch : in Character); + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Character); -- Move to the position and add a single character into the window-- There are more Add routines, so the Inline pragma follows later-- #1A NAME="AFU_10"#2|procedureAdd_With_Immediate_Echo - (Win : inWindow := Standard_Window; - Ch : inAttributed_Character); + (Win : Window := Standard_Window; + Ch : Attributed_Character); -- AKA: wechochar()-- AKA: echochar()procedureAdd_With_Immediate_Echo - (Win : inWindow := Standard_Window; - Ch : in Character); + (Win : Window := Standard_Window; + Ch : Character); -- Add a character and do an immediate refresh of the screen.pragma Inline (Add_With_Immediate_Echo); @@ -621,32 +621,32 @@ pragma Inline (Duplicate); -- #1A NAME="AFU_16"#2| - procedureMove_Window (Win : inWindow; - Line : inLine_Position; - Column : inColumn_Position); + procedureMove_Window (Win : Window; + Line : Line_Position; + Column : Column_Position); -- AKA: mvwin()pragma Inline (Move_Window); -- #1A NAME="AFU_17"#2| - procedureMove_Derived_Window (Win : inWindow; - Line : inLine_Position; - Column : inColumn_Position); + procedureMove_Derived_Window (Win : Window; + Line : Line_Position; + Column : Column_Position); -- AKA: mvderwin()pragma Inline (Move_Derived_Window); -- #1A NAME="AFU_18"#2| - procedureSynchronize_Upwards (Win : inWindow); + procedureSynchronize_Upwards (Win : Window); -- AKA: wsyncup()pragma Import (C, Synchronize_Upwards, "wsyncup"); -- #1A NAME="AFU_19"#2| - procedureSynchronize_Downwards (Win : inWindow); + procedureSynchronize_Downwards (Win : Window); -- AKA: wsyncdown()pragma Import (C, Synchronize_Downwards, "wsyncdown"); -- #1A NAME="AFU_20"#2| - procedureSet_Synch_Mode (Win : inWindow := Standard_Window; - Mode : in Boolean := False); + procedureSet_Synch_Mode (Win : Window := Standard_Window; + Mode : Boolean := False); -- AKA: syncok()pragma Inline (Set_Synch_Mode); @@ -655,20 +655,20 @@ -- |=====================================================================-- #1A NAME="AFU_21"#2| - procedureAdd (Win : inWindow := Standard_Window; - Str : in String; - Len : in Integer := -1); + procedureAdd (Win : Window := Standard_Window; + Str : String; + Len : Integer := -1); -- AKA: waddnstr()-- AKA: waddstr()-- AKA: addnstr()-- AKA: addstr()-- #1A NAME="AFU_22"#2| - procedureAdd (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Str : in String; - Len : in Integer := -1); + procedureAdd (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : String; + Len : Integer := -1); -- AKA: mvwaddnstr()-- AKA: mvwaddstr()-- AKA: mvaddnstr() @@ -679,20 +679,20 @@ -- |=====================================================================-- #1A NAME="AFU_23"#2| - procedureAdd (Win : inWindow := Standard_Window; - Str : in Attributed_String; - Len : in Integer := -1); + procedureAdd (Win : Window := Standard_Window; + Str : Attributed_String; + Len : Integer := -1); -- AKA: waddchnstr()-- AKA: waddchstr()-- AKA: addchnstr()-- AKA: addchstr()-- #1A NAME="AFU_24"#2| - procedureAdd (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Str : in Attributed_String; - Len : in Integer := -1); + procedureAdd (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : Attributed_String; + Len : Integer := -1); -- AKA: mvwaddchnstr()-- AKA: mvwaddchstr()-- AKA: mvaddchnstr() @@ -707,15 +707,15 @@ -- #1A NAME="AFU_25"#2|procedureBorder - (Win : inWindow := Standard_Window; - Left_Side_Symbol : inAttributed_Character := Default_Character; - Right_Side_Symbol : inAttributed_Character := Default_Character; - Top_Side_Symbol : inAttributed_Character := Default_Character; - Bottom_Side_Symbol : inAttributed_Character := Default_Character; - Upper_Left_Corner_Symbol : inAttributed_Character := Default_Character; - Upper_Right_Corner_Symbol : inAttributed_Character := Default_Character; - Lower_Left_Corner_Symbol : inAttributed_Character := Default_Character; - Lower_Right_Corner_Symbol : inAttributed_Character := Default_Character + (Win : Window := Standard_Window; + Left_Side_Symbol : Attributed_Character := Default_Character; + Right_Side_Symbol : Attributed_Character := Default_Character; + Top_Side_Symbol : Attributed_Character := Default_Character; + Bottom_Side_Symbol : Attributed_Character := Default_Character; + Upper_Left_Corner_Symbol : Attributed_Character := Default_Character; + Upper_Right_Corner_Symbol : Attributed_Character := Default_Character; + Lower_Left_Corner_Symbol : Attributed_Character := Default_Character; + Lower_Right_Corner_Symbol : Attributed_Character := Default_Character ); -- AKA: wborder()-- AKA: border() @@ -723,26 +723,26 @@ -- #1A NAME="AFU_26"#2|procedureBox - (Win : inWindow := Standard_Window; - Vertical_Symbol : inAttributed_Character := Default_Character; - Horizontal_Symbol : inAttributed_Character := Default_Character); + (Win : Window := Standard_Window; + Vertical_Symbol : Attributed_Character := Default_Character; + Horizontal_Symbol : Attributed_Character := Default_Character); -- AKA: box()pragma Inline (Box); -- #1A NAME="AFU_27"#2|procedureHorizontal_Line - (Win : inWindow := Standard_Window; - Line_Size : in Natural; - Line_Symbol : inAttributed_Character := Default_Character); + (Win : Window := Standard_Window; + Line_Size : Natural; + Line_Symbol : Attributed_Character := Default_Character); -- AKA: whline()-- AKA: hline()pragma Inline (Horizontal_Line); -- #1A NAME="AFU_28"#2|procedureVertical_Line - (Win : inWindow := Standard_Window; - Line_Size : in Natural; - Line_Symbol : inAttributed_Character := Default_Character); + (Win : Window := Standard_Window; + Line_Size : Natural; + Line_Symbol : Attributed_Character := Default_Character); -- AKA: wvline()-- AKA: vline()pragma Inline (Vertical_Line); @@ -764,7 +764,7 @@ pragma Inline (Get_Keystroke); -- #1A NAME="AFU_30"#2| - procedureUndo_Keystroke (Key : inReal_Key_Code); + procedureUndo_Keystroke (Key : Real_Key_Code); -- AKA: ungetch()pragma Inline (Undo_Keystroke); @@ -809,9 +809,9 @@ -- #1A NAME="AFU_33"#2|procedureSwitch_Character_Attribute - (Win : inWindow := Standard_Window; - Attr : inCharacter_Attribute_Set := Normal_Video; - On : in Boolean := True); -- if False we switch Off. + (Win : Window := Standard_Window; + Attr : Character_Attribute_Set := Normal_Video; + On : Boolean := True); -- if False we switch Off.-- Switches those Attributes set to true in the list.-- AKA: wattron()-- AKA: wattroff() @@ -820,49 +820,49 @@ -- #1A NAME="AFU_34"#2|procedureSet_Character_Attributes - (Win : inWindow := Standard_Window; - Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Win : Window := Standard_Window; + Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: wattrset()-- AKA: attrset()pragma Inline (Set_Character_Attributes); -- #1A NAME="AFU_35"#2|functionGet_Character_Attribute - (Win : inWindow := Standard_Window) returnCharacter_Attribute_Set; + (Win : Window := Standard_Window) returnCharacter_Attribute_Set; -- AKA: wattr_get()-- AKA: attr_get()-- #1A NAME="AFU_36"#2|functionGet_Character_Attribute - (Win : inWindow := Standard_Window) returnColor_Pair; + (Win : Window := Standard_Window) returnColor_Pair; -- AKA: wattr_get()pragma Inline (Get_Character_Attribute); -- #1A NAME="AFU_37"#2| - procedureSet_Color (Win : inWindow := Standard_Window; - Pair : inColor_Pair); + procedureSet_Color (Win : Window := Standard_Window; + Pair : Color_Pair); -- AKA: wcolor_set()-- AKA: color_set()pragma Inline (Set_Color); -- #1A NAME="AFU_38"#2|procedureChange_Attributes - (Win : inWindow := Standard_Window; - Count : in Integer := -1; - Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Win : Window := Standard_Window; + Count : Integer := -1; + Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: wchgat()-- AKA: chgat()-- #1A NAME="AFU_39"#2|procedureChange_Attributes - (Win : inWindow := Standard_Window; - Line : inLine_Position := Line_Position'First; - Column : inColumn_Position := Column_Position'First; - Count : in Integer := -1; - Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Win : Window := Standard_Window; + Line : Line_Position := Line_Position'First; + Column : Column_Position := Column_Position'First; + Count : Integer := -1; + Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: mvwchgat()-- AKA: mvchgat()pragma Inline (Change_Attributes); @@ -888,36 +888,36 @@ -- | Not implemented : typeahead---- #1A NAME="AFU_42"#2| - procedureSet_Cbreak_Mode (SwitchOn : in Boolean := True); + procedureSet_Cbreak_Mode (SwitchOn : Boolean := True); -- AKA: cbreak()-- AKA: nocbreak()pragma Inline (Set_Cbreak_Mode); -- #1A NAME="AFU_43"#2| - procedureSet_Raw_Mode (SwitchOn : in Boolean := True); + procedureSet_Raw_Mode (SwitchOn : Boolean := True); -- AKA: raw()-- AKA: noraw()pragma Inline (Set_Raw_Mode); -- #1A NAME="AFU_44"#2| - procedureSet_Echo_Mode (SwitchOn : in Boolean := True); + procedureSet_Echo_Mode (SwitchOn : Boolean := True); -- AKA: echo()-- AKA: noecho()pragma Inline (Set_Echo_Mode); -- #1A NAME="AFU_45"#2| - procedureSet_Meta_Mode (Win : inWindow := Standard_Window; - SwitchOn : in Boolean := True); + procedureSet_Meta_Mode (Win : Window := Standard_Window; + SwitchOn : Boolean := True); -- AKA: meta()pragma Inline (Set_Meta_Mode); -- #1A NAME="AFU_46"#2| - procedureSet_KeyPad_Mode (Win : inWindow := Standard_Window; - SwitchOn : in Boolean := True); + procedureSet_KeyPad_Mode (Win : Window := Standard_Window; + SwitchOn : Boolean := True); -- AKA: keypad()pragma Inline (Set_KeyPad_Mode); - functionGet_KeyPad_Mode (Win : inWindow := Standard_Window) + functionGet_KeyPad_Mode (Win : Window := Standard_Window) return Boolean; -- This has no pendant in C. There you've to look into the WINDOWS-- structure to get the value. Bad practice, not repeated in Ada. @@ -925,38 +925,38 @@ typeHalf_Delay_Amountisrange 1 .. 255; -- #1A NAME="AFU_47"#2| - procedureHalf_Delay (Amount : inHalf_Delay_Amount); + procedureHalf_Delay (Amount : Half_Delay_Amount); -- AKA: halfdelay()pragma Inline (Half_Delay); -- #1A NAME="AFU_48"#2|procedureSet_Flush_On_Interrupt_Mode - (Win : inWindow := Standard_Window; - Mode : in Boolean := True); + (Win : Window := Standard_Window; + Mode : Boolean := True); -- AKA: intrflush()pragma Inline (Set_Flush_On_Interrupt_Mode); -- #1A NAME="AFU_49"#2|procedureSet_Queue_Interrupt_Mode - (Win : inWindow := Standard_Window; - Flush : in Boolean := True); + (Win : Window := Standard_Window; + Flush : Boolean := True); -- AKA: qiflush()-- AKA: noqiflush()pragma Inline (Set_Queue_Interrupt_Mode); -- #1A NAME="AFU_50"#2|procedureSet_NoDelay_Mode - (Win : inWindow := Standard_Window; - Mode : in Boolean := False); + (Win : Window := Standard_Window; + Mode : Boolean := False); -- AKA: nodelay()pragma Inline (Set_NoDelay_Mode); typeTimeout_Modeis (Blocking, Non_Blocking, Delayed); -- #1A NAME="AFU_51"#2| - procedureSet_Timeout_Mode (Win : inWindow := Standard_Window; - Mode : inTimeout_Mode; - Amount : in Natural); -- in Milliseconds + procedureSet_Timeout_Mode (Win : Window := Standard_Window; + Mode : Timeout_Mode; + Amount : Natural); -- in Milliseconds-- AKA: wtimeout()-- AKA: timeout()-- Instead of overloading the semantic of the sign of amount, we @@ -967,8 +967,8 @@ -- #1A NAME="AFU_52"#2|procedureSet_Escape_Timer_Mode - (Win : inWindow := Standard_Window; - Timer_Off : in Boolean := False); + (Win : Window := Standard_Window; + Timer_Off : Boolean := False); -- AKA: notimeout()pragma Inline (Set_Escape_Timer_Mode); @@ -977,50 +977,50 @@ -- |=====================================================================-- #1A NAME="AFU_53"#2| - procedureSet_NL_Mode (SwitchOn : in Boolean := True); + procedureSet_NL_Mode (SwitchOn : Boolean := True); -- AKA: nl()-- AKA: nonl()pragma Inline (Set_NL_Mode); -- #1A NAME="AFU_54"#2|procedureClear_On_Next_Update - (Win : inWindow := Standard_Window; - Do_Clear : in Boolean := True); + (Win : Window := Standard_Window; + Do_Clear : Boolean := True); -- AKA: clearok()pragma Inline (Clear_On_Next_Update); -- #1A NAME="AFU_55"#2|procedureUse_Insert_Delete_Line - (Win : inWindow := Standard_Window; - Do_Idl : in Boolean := True); + (Win : Window := Standard_Window; + Do_Idl : Boolean := True); -- AKA: idlok()pragma Inline (Use_Insert_Delete_Line); -- #1A NAME="AFU_56"#2|procedureUse_Insert_Delete_Character - (Win : inWindow := Standard_Window; - Do_Idc : in Boolean := True); + (Win : Window := Standard_Window; + Do_Idc : Boolean := True); -- AKA: idcok()pragma Inline (Use_Insert_Delete_Character); -- #1A NAME="AFU_57"#2|procedureLeave_Cursor_After_Update - (Win : inWindow := Standard_Window; - Do_Leave : in Boolean := True); + (Win : Window := Standard_Window; + Do_Leave : Boolean := True); -- AKA: leaveok()pragma Inline (Leave_Cursor_After_Update); -- #1A NAME="AFU_58"#2|procedureImmediate_Update_Mode - (Win : inWindow := Standard_Window; - Mode : in Boolean := False); + (Win : Window := Standard_Window; + Mode : Boolean := False); -- AKA: immedok()pragma Inline (Immediate_Update_Mode); -- #1A NAME="AFU_59"#2|procedureAllow_Scrolling - (Win : inWindow := Standard_Window; - Mode : in Boolean := False); + (Win : Window := Standard_Window; + Mode : Boolean := False); -- AKA: scrollok()pragma Inline (Allow_Scrolling); @@ -1030,9 +1030,9 @@ -- #1A NAME="AFU_60"#2|procedureSet_Scroll_Region - (Win : inWindow := Standard_Window; - Top_Line : inLine_Position; - Bottom_Line : inLine_Position); + (Win : Window := Standard_Window; + Top_Line : Line_Position; + Bottom_Line : Line_Position); -- AKA: wsetscrreg()-- AKA: setscrreg()pragma Inline (Set_Scroll_Region); @@ -1047,7 +1047,7 @@ pragma Inline (Update_Screen); -- #1A NAME="AFU_62"#2| - procedureRefresh (Win : inWindow := Standard_Window); + procedureRefresh (Win : Window := Standard_Window); -- AKA: wrefresh()-- There is an overloaded Refresh for Pads.-- The Inline pragma appears there @@ -1055,19 +1055,19 @@ -- #1A NAME="AFU_63"#2|procedureRefresh_Without_Update - (Win : inWindow := Standard_Window); + (Win : Window := Standard_Window); -- AKA: wnoutrefresh()-- There is an overloaded Refresh_Without_Update for Pads.-- The Inline pragma appears there-- #1A NAME="AFU_64"#2| - procedureRedraw (Win : inWindow := Standard_Window); + procedureRedraw (Win : Window := Standard_Window); -- AKA: redrawwin()-- #1A NAME="AFU_65"#2| - procedureRedraw (Win : inWindow := Standard_Window; - Begin_Line : inLine_Position; - Line_Count : in Positive); + procedureRedraw (Win : Window := Standard_Window; + Begin_Line : Line_Position; + Line_Count : Positive); -- AKA: wredrawln()pragma Inline (Redraw); @@ -1076,28 +1076,28 @@ -- |=====================================================================-- #1A NAME="AFU_66"#2| - procedureErase (Win : inWindow := Standard_Window); + procedureErase (Win : Window := Standard_Window); -- AKA: werase()-- AKA: erase()pragma Inline (Erase); -- #1A NAME="AFU_67"#2|procedureClear - (Win : inWindow := Standard_Window); + (Win : Window := Standard_Window); -- AKA: wclear()-- AKA: clear()pragma Inline (Clear); -- #1A NAME="AFU_68"#2|procedureClear_To_End_Of_Screen - (Win : inWindow := Standard_Window); + (Win : Window := Standard_Window); -- AKA: wclrtobot()-- AKA: clrtobot()pragma Inline (Clear_To_End_Of_Screen); -- #1A NAME="AFU_69"#2|procedureClear_To_End_Of_Line - (Win : inWindow := Standard_Window); + (Win : Window := Standard_Window); -- AKA: wclrtoeol()-- AKA: clrtoeol()pragma Inline (Clear_To_End_Of_Line); @@ -1111,16 +1111,16 @@ -- because in C it is common to see bkgdset(A_BOLD) or-- bkgdset(COLOR_PAIR(n))procedureSet_Background - (Win : inWindow := Standard_Window; - Ch : inAttributed_Character); + (Win : Window := Standard_Window; + Ch : Attributed_Character); -- AKA: wbkgdset()-- AKA: bkgdset()pragma Inline (Set_Background); -- #1A NAME="AFU_71"#2|procedureChange_Background - (Win : inWindow := Standard_Window; - Ch : inAttributed_Character); + (Win : Window := Standard_Window; + Ch : Attributed_Character); -- AKA: wbkgd()-- AKA: bkgd()pragma Inline (Change_Background); @@ -1138,26 +1138,26 @@ -- |=====================================================================-- #1A NAME="AFU_73"#2| - procedureUntouch (Win : inWindow := Standard_Window); + procedureUntouch (Win : Window := Standard_Window); -- AKA: untouchwin()pragma Inline (Untouch); -- #1A NAME="AFU_74"#2| - procedureTouch (Win : inWindow := Standard_Window); + procedureTouch (Win : Window := Standard_Window); -- AKA: touchwin()-- #1A NAME="AFU_75"#2| - procedureTouch (Win : inWindow := Standard_Window; - Start : inLine_Position; - Count : in Positive); + procedureTouch (Win : Window := Standard_Window; + Start : Line_Position; + Count : Positive); -- AKA: touchline()pragma Inline (Touch); -- #1A NAME="AFU_76"#2| - procedureChange_Lines_Status (Win : inWindow := Standard_Window; - Start : inLine_Position; - Count : in Positive; - State : in Boolean); + procedureChange_Lines_Status (Win : Window := Standard_Window; + Start : Line_Position; + Count : Positive; + State : Boolean); -- AKA: wtouchln()pragma Inline (Change_Lines_Status); @@ -1177,27 +1177,27 @@ -- #1A NAME="AFU_79"#2|procedureCopy - (Source_Window : inWindow; - Destination_Window : inWindow; - Source_Top_Row : inLine_Position; - Source_Left_Column : inColumn_Position; - Destination_Top_Row : inLine_Position; - Destination_Left_Column : inColumn_Position; - Destination_Bottom_Row : inLine_Position; - Destination_Right_Column : inColumn_Position; - Non_Destructive_Mode : in Boolean := True); + (Source_Window : Window; + Destination_Window : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position; + Non_Destructive_Mode : Boolean := True); -- AKA: copywin()pragma Inline (Copy); -- #1A NAME="AFU_80"#2| - procedureOverwrite (Source_Window : inWindow; - Destination_Window : inWindow); + procedureOverwrite (Source_Window : Window; + Destination_Window : Window); -- AKA: overwrite()pragma Inline (Overwrite); -- #1A NAME="AFU_81"#2| - procedureOverlay (Source_Window : inWindow; - Destination_Window : inWindow); + procedureOverlay (Source_Window : Window; + Destination_Window : Window); -- AKA: overlay()pragma Inline (Overlay); @@ -1207,20 +1207,20 @@ -- #1A NAME="AFU_82"#2|procedureInsert_Delete_Lines - (Win : inWindow := Standard_Window; - Lines : in Integer := 1); -- default is to insert one line above + (Win : Window := Standard_Window; + Lines : Integer := 1); -- default is to insert one line above-- AKA: winsdelln()-- AKA: insdelln()pragma Inline (Insert_Delete_Lines); -- #1A NAME="AFU_83"#2| - procedureDelete_Line (Win : inWindow := Standard_Window); + procedureDelete_Line (Win : Window := Standard_Window); -- AKA: wdeleteln()-- AKA: deleteln()pragma Inline (Delete_Line); -- #1A NAME="AFU_84"#2| - procedureInsert_Line (Win : inWindow := Standard_Window); + procedureInsert_Line (Win : Window := Standard_Window); -- AKA: winsertln()-- AKA: insertln()pragma Inline (Insert_Line); @@ -1231,7 +1231,7 @@ -- #1A NAME="AFU_85"#2|procedureGet_Size - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Number_Of_Lines : outLine_Count; Number_Of_Columns : outColumn_Count); -- AKA: getmaxyx() @@ -1239,7 +1239,7 @@ -- #1A NAME="AFU_86"#2|procedureGet_Window_Position - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Top_Left_Line : outLine_Position; Top_Left_Column : outColumn_Position); -- AKA: getbegyx() @@ -1247,7 +1247,7 @@ -- #1A NAME="AFU_87"#2|procedureGet_Cursor_Position - (Win : inWindow := Standard_Window; + (Win : Window := Standard_Window; Line : outLine_Position; Column : outColumn_Position); -- AKA: getyx() @@ -1255,7 +1255,7 @@ -- #1A NAME="AFU_88"#2|procedureGet_Origin_Relative_To_Parent - (Win : inWindow; + (Win : Window; Top_Left_Line : outLine_Position; Top_Left_Column : outColumn_Position; Is_Not_A_Subwindow : out Boolean); @@ -1286,37 +1286,37 @@ -- #1A NAME="AFU_91"#2|procedureRefresh - (Pad : inWindow; - Source_Top_Row : inLine_Position; - Source_Left_Column : inColumn_Position; - Destination_Top_Row : inLine_Position; - Destination_Left_Column : inColumn_Position; - Destination_Bottom_Row : inLine_Position; - Destination_Right_Column : inColumn_Position); + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position); -- AKA: prefresh()pragma Inline (Refresh); -- #1A NAME="AFU_92"#2|procedureRefresh_Without_Update - (Pad : inWindow; - Source_Top_Row : inLine_Position; - Source_Left_Column : inColumn_Position; - Destination_Top_Row : inLine_Position; - Destination_Left_Column : inColumn_Position; - Destination_Bottom_Row : inLine_Position; - Destination_Right_Column : inColumn_Position); + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position); -- AKA: pnoutrefresh()pragma Inline (Refresh_Without_Update); -- #1A NAME="AFU_93"#2|procedureAdd_Character_To_Pad_And_Echo_It - (Pad : inWindow; - Ch : inAttributed_Character); + (Pad : Window; + Ch : Attributed_Character); -- AKA: pechochar()procedureAdd_Character_To_Pad_And_Echo_It - (Pad : inWindow; - Ch : in Character); + (Pad : Window; + Ch : Character); pragma Inline (Add_Character_To_Pad_And_Echo_It); -- |===================================================================== @@ -1324,8 +1324,8 @@ -- |=====================================================================-- #1A NAME="AFU_94"#2| - procedureScroll (Win : inWindow := Standard_Window; - Amount : in Integer := 1); + procedureScroll (Win : Window := Standard_Window; + Amount : Integer := 1); -- AKA: wscrl()-- AKA: scroll()-- AKA: scrl() @@ -1336,15 +1336,15 @@ -- |=====================================================================-- #1A NAME="AFU_95"#2| - procedureDelete_Character (Win : inWindow := Standard_Window); + procedureDelete_Character (Win : Window := Standard_Window); -- AKA: wdelch()-- AKA: delch()-- #1A NAME="AFU_96"#2|procedureDelete_Character - (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position); + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position); -- AKA: mvwdelch()-- AKA: mvdelch()pragma Inline (Delete_Character); @@ -1373,16 +1373,16 @@ -- |=====================================================================-- #1A NAME="AFU_99"#2| - procedureInsert (Win : inWindow := Standard_Window; - Ch : inAttributed_Character); + procedureInsert (Win : Window := Standard_Window; + Ch : Attributed_Character); -- AKA: winsch()-- AKA: insch()-- #1A NAME="AFU_100"#2| - procedureInsert (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Ch : inAttributed_Character); + procedureInsert (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Attributed_Character); -- AKA: mvwinsch()-- AKA: mvinsch() @@ -1391,20 +1391,20 @@ -- |=====================================================================-- #1A NAME="AFU_101"#2| - procedureInsert (Win : inWindow := Standard_Window; - Str : in String; - Len : in Integer := -1); + procedureInsert (Win : Window := Standard_Window; + Str : String; + Len : Integer := -1); -- AKA: winsnstr()-- AKA: winsstr()-- AKA: insnstr()-- AKA: insstr()-- #1A NAME="AFU_102"#2| - procedureInsert (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; - Str : in String; - Len : in Integer := -1); + procedureInsert (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : String; + Len : Integer := -1); -- AKA: mvwinsnstr()-- AKA: mvwinsstr()-- AKA: mvinsnstr() @@ -1416,20 +1416,20 @@ -- |=====================================================================-- #1A NAME="AFU_103"#2| - procedurePeek (Win : inWindow := Standard_Window; + procedurePeek (Win : Window := Standard_Window; Str : out String; - Len : in Integer := -1); + Len : Integer := -1); -- AKA: winnstr()-- AKA: winstr()-- AKA: innstr()-- AKA: instr()-- #1A NAME="AFU_104"#2| - procedurePeek (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; + procedurePeek (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; Str : out String; - Len : in Integer := -1); + Len : Integer := -1); -- AKA: mvwinnstr()-- AKA: mvwinstr()-- AKA: mvinnstr() @@ -1440,20 +1440,20 @@ -- |=====================================================================-- #1A NAME="AFU_105"#2| - procedurePeek (Win : inWindow := Standard_Window; + procedurePeek (Win : Window := Standard_Window; Str : out Attributed_String; - Len : in Integer := -1); + Len : Integer := -1); -- AKA: winchnstr()-- AKA: winchstr()-- AKA: inchnstr()-- AKA: inchstr()-- #1A NAME="AFU_106"#2| - procedurePeek (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; + procedurePeek (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; Str : out Attributed_String; - Len : in Integer := -1); + Len : Integer := -1); -- AKA: mvwinchnstr()-- AKA: mvwinchstr()-- AKA: mvinchnstr() @@ -1465,9 +1465,9 @@ -- |=====================================================================-- #1A NAME="AFU_107"#2| - procedureGet (Win : inWindow := Standard_Window; + procedureGet (Win : Window := Standard_Window; Str : out String; - Len : in Integer := -1); + Len : Integer := -1); -- AKA: wgetnstr()-- AKA: wgetstr()-- AKA: getnstr() @@ -1476,11 +1476,11 @@ -- overflows.-- #1A NAME="AFU_108"#2| - procedureGet (Win : inWindow := Standard_Window; - Line : inLine_Position; - Column : inColumn_Position; + procedureGet (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; Str : out String; - Len : in Integer := -1); + Len : Integer := -1); -- AKA: mvwgetnstr()-- AKA: mvwgetstr()-- AKA: mvgetnstr() @@ -1502,14 +1502,14 @@ -- #1A NAME="AFU_109"#2|procedureInit_Soft_Label_Keys - (Format : inSoft_Label_Key_Format := Three_Two_Three); + (Format : Soft_Label_Key_Format := Three_Two_Three); -- AKA: slk_init()pragma Inline (Init_Soft_Label_Keys); -- #1A NAME="AFU_110"#2| - procedureSet_Soft_Label_Key (Label : inLabel_Number; - Text : in String; - Fmt : inLabel_Justification := Left); + procedureSet_Soft_Label_Key (Label : Label_Number; + Text : String; + Fmt : Label_Justification := Left); -- AKA: slk_set()-- We don't inline this procedure @@ -1524,12 +1524,12 @@ pragma Inline (Refresh_Soft_Label_Keys_Without_Update); -- #1A NAME="AFU_113"#2| - procedureGet_Soft_Label_Key (Label : inLabel_Number; + procedureGet_Soft_Label_Key (Label : Label_Number; Text : out String); -- AKA: slk_label()-- #1A NAME="AFU_114"#2| - functionGet_Soft_Label_Key (Label : inLabel_Number) return String; + functionGet_Soft_Label_Key (Label : Label_Number) return String; -- AKA: slk_label()-- Same as functionpragma Inline (Get_Soft_Label_Key); @@ -1551,16 +1551,16 @@ -- #1A NAME="AFU_118"#2|procedureSwitch_Soft_Label_Key_Attributes - (Attr : inCharacter_Attribute_Set; - On : in Boolean := True); + (Attr : Character_Attribute_Set; + On : Boolean := True); -- AKA: slk_attron()-- AKA: slk_attroff()pragma Inline (Switch_Soft_Label_Key_Attributes); -- #1A NAME="AFU_119"#2|procedureSet_Soft_Label_Key_Attributes - (Attr : inCharacter_Attribute_Set := Normal_Video; - Color : inColor_Pair := Color_Pair'First); + (Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: slk_attrset()pragma Inline (Set_Soft_Label_Key_Attributes); @@ -1574,7 +1574,7 @@ pragma Inline (Get_Soft_Label_Key_Attributes); -- #1A NAME="AFU_122"#2| - procedureSet_Soft_Label_Key_Color (Pair : inColor_Pair); + procedureSet_Soft_Label_Key_Color (Pair : Color_Pair); -- AKA: slk_color()pragma Inline (Set_Soft_Label_Key_Color); @@ -1588,8 +1588,8 @@ -- |=====================================================================-- #1A NAME="AFU_123"#2| - procedureEnable_Key (Key : inSpecial_Key_Code; - Enable : in Boolean := True); + procedureEnable_Key (Key : Special_Key_Code; + Enable : Boolean := True); -- AKA: keyok()pragma Inline (Enable_Key); @@ -1598,8 +1598,8 @@ -- |=====================================================================-- #1A NAME="AFU_124"#2| - procedureDefine_Key (Definition : in String; - Key : inSpecial_Key_Code); + procedureDefine_Key (Definition : String; + Key : Special_Key_Code); -- AKA: define_key()pragma Inline (Define_Key); @@ -1612,30 +1612,30 @@ ---- #1A NAME="AFU_125"#2| - procedureKey_Name (Key : inReal_Key_Code; + procedureKey_Name (Key : Real_Key_Code; Name : out String); -- AKA: keyname()-- The external name for a real keystroke.-- #1A NAME="AFU_126"#2| - functionKey_Name (Key : inReal_Key_Code) return String; + functionKey_Name (Key : Real_Key_Code) return String; -- AKA: keyname()-- Same as function-- We don't inline this routine-- #1A NAME="AFU_127"#2| - procedureUn_Control (Ch : inAttributed_Character; + procedureUn_Control (Ch : Attributed_Character; Str : out String); -- AKA: unctrl()-- #1A NAME="AFU_128"#2| - functionUn_Control (Ch : inAttributed_Character) return String; + functionUn_Control (Ch : Attributed_Character) return String; -- AKA: unctrl()-- Same as functionpragma Inline (Un_Control); -- #1A NAME="AFU_129"#2| - procedureDelay_Output (Msecs : in Natural); + procedureDelay_Output (Msecs : Natural); -- AKA: delay_output()pragma Inline (Delay_Output); @@ -1714,14 +1714,14 @@ pragma Import (C, Start_Color, "start_color"); -- #1A NAME="AFU_142"#2| - procedureInit_Pair (Pair : inRedefinable_Color_Pair; - Fore : inColor_Number; - Back : inColor_Number); + procedureInit_Pair (Pair : Redefinable_Color_Pair; + Fore : Color_Number; + Back : Color_Number); -- AKA: init_pair()pragma Inline (Init_Pair); -- #1A NAME="AFU_143"#2| - procedurePair_Content (Pair : inColor_Pair; + procedurePair_Content (Pair : Color_Pair; Fore : outColor_Number; Back : outColor_Number); -- AKA: pair_content() @@ -1733,10 +1733,10 @@ pragma Inline (Has_Colors); -- #1A NAME="AFU_145"#2| - procedureInit_Color (Color : inColor_Number; - Red : inRGB_Value; - Green : inRGB_Value; - Blue : inRGB_Value); + procedureInit_Color (Color : Color_Number; + Red : RGB_Value; + Green : RGB_Value; + Blue : RGB_Value); -- AKA: init_color()pragma Inline (Init_Color); @@ -1746,7 +1746,7 @@ pragma Inline (Can_Change_Color); -- #1A NAME="AFU_147"#2| - procedureColor_Content (Color : inColor_Number; + procedureColor_Content (Color : Color_Number; Red : outRGB_Value; Green : outRGB_Value; Blue : outRGB_Value); @@ -1761,13 +1761,13 @@ typeCurses_Modeis (Curses, Shell); -- #1A NAME="AFU_148"#2| - procedureSave_Curses_Mode (Mode : inCurses_Mode); + procedureSave_Curses_Mode (Mode : Curses_Mode); -- AKA: def_prog_mode()-- AKA: def_shell_mode()pragma Inline (Save_Curses_Mode); -- #1A NAME="AFU_149"#2| - procedureReset_Curses_Mode (Mode : inCurses_Mode); + procedureReset_Curses_Mode (Mode : Curses_Mode); -- AKA: reset_prog_mode()-- AKA: reset_shell_mode()pragma Inline (Reset_Curses_Mode); @@ -1791,8 +1791,8 @@ -- and -1 otherwise.-- #1A NAME="AFU_152"#2| - procedureRip_Off_Lines (Lines : in Integer; - Proc : inStdscr_Init_Proc); + procedureRip_Off_Lines (Lines : Integer; + Proc : Stdscr_Init_Proc); -- AKA: ripoffline()-- N.B.: to be more precise, this uses a ncurses specific enhancement of-- ripoffline(), in which the Lines argument absolute value is the @@ -1808,7 +1808,7 @@ pragma Inline (Set_Cursor_Visibility); -- #1A NAME="AFU_154"#2| - procedureNap_Milli_Seconds (Ms : in Natural); + procedureNap_Milli_Seconds (Ms : Natural); -- AKA: napms()pragma Inline (Nap_Milli_Seconds); @@ -1817,10 +1817,10 @@ -- |=====================================================================typeTransform_Directionis (From_Screen, To_Screen); procedureTransform_Coordinates - (W : inWindow := Standard_Window; + (W : Window := Standard_Window; Line : inoutLine_Position; Column : inoutColumn_Position; - Dir : inTransform_Direction := From_Screen); + Dir : Transform_Direction := From_Screen); -- This procedure transforms screen coordinates into coordinates relative-- to the window and vice versa, depending on the Dir parameter.-- Screen coordinates are the position informations on the physical device. @@ -1869,25 +1869,25 @@ -- |=====================================================================-- #1A NAME="AFU_160"#2| - procedureScreen_Dump_To_File (Filename : in String); + procedureScreen_Dump_To_File (Filename : String); -- AKA: scr_dump()-- #1A NAME="AFU_161"#2| - procedureScreen_Restore_From_File (Filename : in String); + procedureScreen_Restore_From_File (Filename : String); -- AKA: scr_restore()-- #1A NAME="AFU_162"#2| - procedureScreen_Init_From_File (Filename : in String); + procedureScreen_Init_From_File (Filename : String); -- AKA: scr_init()-- #1A NAME="AFU_163"#2| - procedureScreen_Set_File (Filename : in String); + procedureScreen_Set_File (Filename : String); -- AKA: scr_set()-- |=====================================================================-- | Man page curs_print.3x-- |===================================================================== - -- Not implemented: mcprint + -- Not implemented: mcprint-- |=====================================================================-- | Man page curs_printw.3x @@ -1928,7 +1928,7 @@ Sizeof_bool : constant Natural := 1; -- boolOffset_XY : constant Natural := 1; -- int - typeCurses_Boolismod 2 ** Interfaces.C.char'Size; + typeCurses_Boolismod 2 ** Interfaces.C.char'Size; Curses_Bool_False : constantCurses_Bool := 0; endTerminal_Interface.Curses; diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index 91b3150d..4cbbfe83 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -86,8 +86,8 @@

    FILES

    -       /usr/share/terminfo Compiled     terminal      description
-                           database.
+       /usr/share/terminfo Compiled  terminal  description  data-
+                           base.
    @@ -100,7 +100,6 @@ has not mistakenly translated a completely unknown and random capability and/or syntax error. - Nonstd Std From Terminfo name name capability ----------------------------------------------- @@ -116,8 +115,8 @@ GE ae XENIX exit_alt_charset_mode GS as XENIX enter_alt_charset_mode HM kh XENIX key_home - LD kL XENIX key_dl + PD kN XENIX key_npage PN po XENIX prtr_off PS pf XENIX prtr_on @@ -138,7 +137,6 @@ bilities for forms drawing, designed to take advantage of the IBM PC high-half graphics. They were as follows: - Cap Graphic ----------------------------- G2 upper left @@ -206,7 +204,7 @@

    SEE ALSO

            infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
    diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html index 22661b57..c88203b6 100644 --- a/doc/html/man/clear.1.html +++ b/doc/html/man/clear.1.html @@ -69,7 +69,7 @@

    SEE ALSO

            tput(1), terminfo(5)
 
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index 162532ce..f02375d0 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -112,9 +112,8 @@
        characters to the screen with routines of the  addch  fam-
        ily.   The  default  character listed below is used if the
        acsc  capability  does  not  define  a   terminal-specific
-       replacement  for  it.   The  names  are  taken  from VT100
-       nomenclature.
-
+       replacement for it.  The names are taken from VT100 nomen-
+       clature.
 
        Name           Default   Description
        --------------------------------------------------
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 9a7b2a46..1692a9f0 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -148,7 +148,6 @@
        be passed to the routines attron, attroff, and attrset, or
        OR'd with the characters passed to addch.
 
-
         A_NORMAL        Normal display (no highlight)
         A_STANDOUT      Best highlighting mode of the terminal.
         A_UNDERLINE     Underlining
@@ -211,7 +210,6 @@
        the  screen when changing the attributes.  Use touchwin to
        force the screen to match the updated attributes.
 
-
         WA_NORMAL       Normal display (no highlight)
         WA_STANDOUT     Best highlighting mode of the terminal.
         WA_UNDERLINE    Underlining
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 684605fe..974a68f2 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -109,43 +109,46 @@
        background color number.  For portable applications:
 
        -    The value of the first argument must be between 1 and
-            COLOR_PAIRS-1.
+            COLOR_PAIRS-1, except that if default colors are used
+            (see  use_default_colors) the upper limit is adjusted
+            to allow for extra pairs which use a default color in
+            foreground and/or background.
 
-       -    The value of the second and third arguments  must  be
-            between  0 and COLORS.  Color pair 0 is assumed to be
+       -    The  value  of the second and third arguments must be
+            between 0 and COLORS.  Color pair 0 is assumed to  be
             white on black, but is actually whatever the terminal
             implements before color is initialized.  It cannot be
             modified by the application.
 
-       If the color-pair was previously initialized,  the  screen
-       is  refreshed  and  all occurrences of that color-pair are
+       If  the  color-pair was previously initialized, the screen
+       is refreshed and all occurrences of  that  color-pair  are
        changed to the new definition.
 
-       As an extension, ncurses allows you to set  color  pair  0
-       via  the  assume_default_colors routine, or to specify the
-       use of default colors (color number -1) if you  first  in-
+       As  an  extension,  ncurses allows you to set color pair 0
+       via the assume_default_colors routine, or to  specify  the
+       use  of  default colors (color number -1) if you first in-
        voke the use_default_colors routine.
 
-       The  init_color routine changes the definition of a color.
-       It takes four arguments: the number of  the  color  to  be
-       changed  followed  by three RGB values (for the amounts of
-       red, green, and blue components).  The value of the  first
-       argument  must  be between 0 and COLORS.  (See the section
-       Colors for the default color index.)   Each  of  the  last
-       three  arguments must be a value between 0 and 1000.  When
-       init_color is used, all occurrences of that color  on  the
+       The init_color routine changes the definition of a  color.
+       It  takes  four  arguments:  the number of the color to be
+       changed followed by three RGB values (for the  amounts  of
+       red,  green, and blue components).  The value of the first
+       argument must be between 0 and COLORS.  (See  the  section
+       Colors  for  the  default  color index.)  Each of the last
+       three arguments must be a value between 0 and 1000.   When
+       init_color  is  used, all occurrences of that color on the
        screen immediately change to the new definition.
 
-       The  has_colors routine requires no arguments.  It returns
-       TRUE if the terminal can manipulate colors; otherwise,  it
+       The has_colors routine requires no arguments.  It  returns
+       TRUE  if the terminal can manipulate colors; otherwise, it
        returns FALSE.  This routine facilitates writing terminal-
-       independent programs.  For example, a programmer  can  use
-       it  to decide whether to use color or some other video at-
+       independent  programs.   For example, a programmer can use
+       it to decide whether to use color or some other video  at-
        tribute.
 
-       The can_change_color routine requires  no  arguments.   It
-       returns  TRUE  if  the  terminal  supports  colors and can
-       change their definitions; other, it returns  FALSE.   This
+       The  can_change_color  routine  requires no arguments.  It
+       returns TRUE if  the  terminal  supports  colors  and  can
+       change  their  definitions; other, it returns FALSE.  This
        routine facilitates writing terminal-independent programs.
 
        The color_content routine gives programmers a way to  find
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index b55ce1d7..1358430c 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -130,18 +130,19 @@

    RETURN VALUES

            When wch is a null pointer, getcchar returns the number of
-       wide characters referenced by wcval.
+       wide characters referenced by wcval, including one  for  a
+       trailing null.
 
-       When wch is not a null pointer, getcchar returns  OK  upon
+       When  wch  is not a null pointer, getcchar returns OK upon
        successful completion, and ERR otherwise.
 
-       Upon  successful  completion, setcchar returns OK.  Other-
+       Upon successful completion, setcchar returns  OK.   Other-
        wise, it returns ERR.

    SEE ALSO

    -       Functions:  curs_attr(3x),   curs_color(3x),   curses(3x),
+       Functions:   curs_attr(3x),   curs_color(3x),  curses(3x),
        wcwidth(3).
 
 
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index e7df6632..70a62b59 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -110,7 +110,6 @@
        be returned by the next call to wgetch.  There is just one
        input queue for all windows.
 
-
    Function Keys
        The following function keys, defined in <curses.h>,  might
        be  returned  by  getch  if keypad has been enabled.  Note
@@ -179,8 +178,8 @@
             KEY_REPLACE     Replace key
             KEY_RESIZE      Screen resized
             KEY_RESTART     Restart key
-            KEY_RESUME      Resume key
 
+            KEY_RESUME      Resume key
             KEY_SAVE        Save key
             KEY_SBEG        Shifted beginning key
             KEY_SCANCEL     Shifted cancel key
@@ -233,7 +232,6 @@
        sion of KEY_MOUSE.
 
 
-

    RETURN VALUE

            All routines return the integer ERR upon  failure  and  an
diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html
new file mode 100644
index 00000000..d6325d0c
--- /dev/null
+++ b/doc/html/man/curs_memleaks.3x.html
@@ -0,0 +1,111 @@
+
+
+
+
+curs_memleaks 3x
+
+
+
+
+
    curs_memleaks 3x
    
+
    
+
    +
+curs_memleaks(3x)                                     curs_memleaks(3x)
+
+
+
+
+
    
+
    NAME
    +       _nc_freeall _nc_free_and_exit - curses memory-leak
+       checking
+
+
+
    
+
    SYNOPSIS
    +       #include <curses.h>
+
+       void _nc_freeall(void);
+       void _nc_free_and_exit(int);
+
+
+
    
+
    DESCRIPTION
    +       These functions are used to simplify  analysis  of  memory
+       leaks  in  the  ncurses  library.   They  are normally not
+       available; they must be configured  into  the  library  at
+       build  time  using  the --disable-leaks option.  That com-
+       piles-in code that frees memory that normally would not be
+       freed.
+
+       Any  implementation of curses must not free the memory as-
+       sociated with a screen, since (even after calling endwin),
+       it  must be available for use in the next call to refresh.
+       There are also chunks of memory held for performance  rea-
+       sons.   That  makes it hard to analyze curses applications
+       for memory leaks.  To work around this, one  can  build  a
+       debugging version of the ncurses library which frees those
+       chunks which it can, and provides these functions to  free
+       all of the memory allocated by the ncurses library.
+
+       The  _nc_free_and_exit function is the preferred one since
+       some of the memory which is freed may be required for  the
+       application  to  continue  running.   Its parameter is the
+       code to pass to the exit routine.
+
+
+
    
+
    RETURN VALUE
    +       These functions do not return a value.
+
+
+
    
+
    PORTABILITY
    +       These functions are not part of the XSI interface.
+
+
+
    
+
    SEE ALSO
    +       curses(3x).
+
+
+
+                                                      curs_memleaks(3x)
+
    
+
    
+
    
+Man(1) output converted with
+man2html
+
    
+
+
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index 23094826..d1bfe98c 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -48,9 +48,9 @@

    NAME

    -       getmouse, ungetmouse, mousemask, wenclose, mouse_trafo,
-       wmouse_trafo, mouseinterval - mouse interface through
-       curses
+       has_mouse, getmouse, ungetmouse, mousemask, wenclose,
+       mouse_trafo, wmouse_trafo, mouseinterval - mouse interface
+       through curses
    @@ -66,6 +66,7 @@ mmask_tbstate;/*buttonstatebits*/}MEVENT; + boolhas_mouse(void);intgetmouse(MEVENT*event);intungetmouse(MEVENT*event);mmask_tmousemask(mmask_tnewmask,mmask_t*oldmask); @@ -97,7 +98,6 @@ Here are the mouse event type masks which may be defined: - NameDescription --------------------------------------------------------------------- BUTTON1_PRESSED mouse button 1 down @@ -148,7 +148,9 @@ as y and x in the event structure coordinates will be screen-relative character-cell coordinates. The returned state mask will have exactly one bit set to indicate the - event type. + event type. The corresponding data in the queue is marked + invalid. A subsequent call to getmouse will retrieve the + next older item from the queue. The ungetmouse function behaves analogously to ungetch. It pushes a KEY_MOUSE event onto the input queue, and as- @@ -195,98 +197,103 @@ val(-1) to obtain the interval without altering it. The default is one sixth of a second. - Note that mouse events will be ignored when input is in + The has_mouse function returns TRUE if the mouse driver + has been successfully initialized. + + Note that mouse events will be ignored when input is in cooked mode, and will cause an error beep when cooked mode - is being simulated in a window by a function such as get- + is being simulated in a window by a function such as get-str that expects a linefeed for input-loop termination.

    RETURN VALUE

    -       getmouse and ungetmouse return the integer ERR upon  fail-
+       getmouse  and ungetmouse return the integer ERR upon fail-
        ure or OK upon successful completion.
 
               getmouse
                    returns an error.  If no mouse driver was ini-
-                   tialized, or if the mask parameter is zero,
+                   tialized, or if the mask parameter is zero, It
+                   also returns an error if no more events remain
+                   in the queue.
 
               ungetmouse
                    returns an error if the FIFO is full.
 
        mousemask returns the mask of reportable events.
 
-       mouseinterval returns the previous interval value,  unless
-       the  terminal  was  not initialized.  In that case, it re-
+       mouseinterval  returns the previous interval value, unless
+       the terminal was not initialized.  In that  case,  it  re-
        turns the maximum interval value (166).
 
-       wenclose and wmouse_trafo are boolean functions  returning
+       wenclose  and wmouse_trafo are boolean functions returning
        TRUE or FALSE depending on their test result.

    PORTABILITY

    -       These  calls  were  designed  for ncurses(3x), and are not
+       These calls were designed for  ncurses(3x),  and  are  not
        found in SVr4 curses, 4.4BSD curses, or any other previous
        version of curses.
 
        The feature macro NCURSES_MOUSE_VERSION is provided so the
-       preprocessor can be used to test  whether  these  features
-       are  present.   If  the interface is changed, the value of
-       NCURSES_MOUSE_VERSION will be incremented.   These  values
-       for  NCURSES_MOUSE_VERSION may be specified when configur-
+       preprocessor  can  be  used to test whether these features
+       are present.  If the interface is changed,  the  value  of
+       NCURSES_MOUSE_VERSION  will  be incremented.  These values
+       for NCURSES_MOUSE_VERSION may be specified when  configur-
        ing ncurses:
 
-              1  has definitions for reserved events.   The  mask
+              1  has  definitions  for reserved events.  The mask
                  uses 28 bits.
 
               2  adds definitions for button 5, removes the defi-
-                 nitions for reserved events.  The mask  uses  29
+                 nitions  for  reserved events.  The mask uses 29
                  bits.
 
-       The  order  of the MEVENT structure members is not guaran-
-       teed.  Additional fields may be added to the structure  in
+       The order of the MEVENT structure members is  not  guaran-
+       teed.   Additional fields may be added to the structure in
        the future.
 
-       Under  ncurses(3x),  these calls are implemented using ei-
-       ther xterm's built-in mouse-tracking API or  platform-spe-
+       Under ncurses(3x), these calls are implemented  using  ei-
+       ther  xterm's built-in mouse-tracking API or platform-spe-
        cific drivers including
-              Alessandro Rubini's gpm server.
+              Alessandro Rubini's gpm server
               FreeBSD sysmouse
               OS/2 EMX
-       If  you  are  using  an  unsupported  configuration, mouse
-       events will not be visible to ncurses(3x) (and the  mouse-
+       If you  are  using  an  unsupported  configuration,  mouse
+       events  will not be visible to ncurses(3x) (and the mouse-
        mask function will always return 0).
 
-       If  the  terminfo entry contains a XM string, this is used
-       in the xterm mouse driver to control the way the  terminal
+       If the terminfo entry contains a XM string, this  is  used
+       in  the xterm mouse driver to control the way the terminal
        is initialized for mouse operation.  The default, if XM is
        not found, corresponds to private mode 1000 of xterm:
               \E[?1000%?%p1%{1}%=%th%el%;
        The z member in the event structure is not presently used.
-       It  is  intended  for use with touch screens (which may be
+       It is intended for use with touch screens  (which  may  be
        pressure-sensitive)   or   with   3D-mice/trackballs/power
        gloves.

    BUGS

    -       Mouse  events under xterm will not in fact be ignored dur-
-       ing cooked mode, if they have been enabled  by  mousemask.
-       Instead,  the  xterm  mouse report sequence will appear in
+       Mouse events under xterm will not in fact be ignored  dur-
+       ing  cooked  mode, if they have been enabled by mousemask.
+       Instead, the xterm mouse report sequence  will  appear  in
        the string read.
 
        Mouse events under xterm will not be detected correctly in
-       a  window  with  its keypad bit off, since they are inter-
-       preted as a variety of function key.   Your  terminfo  de-
-       scription  should  have kmous set to "\E[M" (the beginning
-       of the response from xterm for mouse clicks).  Other  val-
-       ues  for  kmous  are permitted, but under the same assump-
+       a window with its keypad bit off, since  they  are  inter-
+       preted  as  a  variety of function key.  Your terminfo de-
+       scription should have kmous set to "\E[M"  (the  beginning
+       of  the response from xterm for mouse clicks).  Other val-
+       ues for kmous are permitted, but under  the  same  assump-
        tion, i.e., it is the beginning of the response.
 
-       Because there are  no  standard  terminal  responses  that
-       would  serve to identify terminals which support the xterm
-       mouse protocol, ncurses assumes that if your  $TERM  envi-
-       ronment  variable contains "xterm", or kmous is defined in
+       Because  there  are  no  standard  terminal responses that
+       would serve to identify terminals which support the  xterm
+       mouse  protocol,  ncurses assumes that if your $TERM envi-
+       ronment variable contains "xterm", or kmous is defined  in
        the terminal description, then the terminal may send mouse
        events.
 
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 3e0f1ae0..0572985a 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -48,8 +48,8 @@

    NAME

            is_cleared, is_idlok, is_idcok, is_immedok, is_keypad,
-       is_leaveok, is_nodelay, is_timeout, is_scrollok, is_syncok
-       - curses window properties
+       is_leaveok, is_nodelay, is_notimeout, is_pad, is_scrollok,
+       is_subwin, is_syncok - curses window properties
    @@ -64,7 +64,9 @@ boolis_leaveok(constWINDOW*win);boolis_nodelay(constWINDOW*win);boolis_notimeout(constWINDOW*win); + boolis_pad(constWINDOW*win);boolis_scrollok(constWINDOW*win); + boolis_subwin(constWINDOW*win);boolis_syncok(constWINDOW*win);WINDOW*wgetparent(constWINDOW*win);intwgetscrreg(constWINDOW*win,int*top,int*bottom); @@ -100,9 +102,17 @@ is_notimeout returns the value set in notimeout + is_pad + returns TRUE if the window is a pad i.e., created by + newpad + is_scrollok returns the value set in scrollok + is_subwin + returns TRUE if the window is a subwindow, i.e., cre- + ated by subwin or derwin + is_syncok returns the value set in syncok @@ -127,15 +137,15 @@

    PORTABILITY

    -       These routines are specific to  ncurses.   They  were  not
-       supported  on  Version 7, BSD or System V implementations.
-       It is recommended that any code depending on  ncurses  ex-
+       These  routines  are  specific  to ncurses.  They were not
+       supported on Version 7, BSD or System  V  implementations.
+       It  is  recommended that any code depending on ncurses ex-
        tensions be conditioned using NCURSES_VERSION.

    SEE ALSO

    -       curses(3x),  curs_inopts(3x),  curs_outopts(3x), curs_win-
+       curses(3x), curs_inopts(3x),  curs_outopts(3x),  curs_win-
        dow(3x)
 
 
diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html
index daf3a766..0e9580ce 100644
--- a/doc/html/man/curs_termattrs.3x.html
+++ b/doc/html/man/curs_termattrs.3x.html
@@ -111,11 +111,11 @@
 
        If  a  given  terminal  does not support a video attribute
        that an application program is trying to use,  curses  may
-       substitute  a  different  video  attribute  for  it.   The
-       termattrs and term_attrs functions return a logical OR  of
-       all  video  attributes  supported by the terminal using A_
-       and WA_ constants respectively.  This information is  use-
-       ful  when a curses program needs complete control over the
+       substitute  a  different video attribute for it.  The ter-
+       mattrs and term_attrs functions return a logical OR of all
+       video  attributes  supported  by the terminal using A_ and
+       WA_ constants respectively.  This  information  is  useful
+       when  a  curses  program  needs  complete control over the
        appearance of the screen.
 
        The termname routine returns the  terminal  name  used  by
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index a2457784..89879230 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -111,8 +111,8 @@
        backspace_if_not_bs,  respectively.   UP  is  not  used by
        ncurses.  PC is used in the tdelay_output function.  BC is
        used  in  the tgoto emulation.  The variable ospeed is set
-       by ncurses in a  system-specific  coding  to  reflect  the
-       terminal speed.
+       by ncurses in a system-specific coding to reflect the ter-
+       minal speed.
    diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html index 68774963..bf439e4c 100644 --- a/doc/html/man/curs_terminfo.3x.html +++ b/doc/html/man/curs_terminfo.3x.html @@ -1,7 +1,7 @@ @@ -48,9 +48,9 @@

    NAME

            del_curterm, mvcur, putp, restartterm, set_curterm,
-       setterm, setupterm, tigetflag, tigetnum, tigetstr, tparm,
-       tputs, vid_attr, vid_puts, vidattr, vidputs - curses
-       interfaces to terminfo database
+       setterm, setupterm, tigetflag, tigetnum, tigetstr, tiparm,
+       tparm, tputs, vid_attr, vid_puts, vidattr, vidputs -
+       curses interfaces to terminfo database
    @@ -74,6 +74,7 @@ inttigetflag(char*capname);inttigetnum(char*capname);char*tigetstr(char*capname); + char*tiparm(constchar*str,...); @@ -180,6 +181,10 @@ ters pi. A pointer is returned to the result of str with the parameters applied. + tiparm is a newer form of tparm which uses <stdarg.h> + rather than a fixed-parameter list. Its numeric parame- + ters are integers (int) rather than longs. + The tputs routine applies padding information to the string str and outputs it. The str must be a terminfo string variable or the return value from tparm, tgetstr, @@ -253,11 +258,11 @@ Routines that return pointers always return NULL on error. - X/Open defines no error conditions. In this implementa- + X/Open defines no error conditions. In this implementa- tion del_curterm - returns an error if its terminal parameter is + returns an error if its terminal parameter is null. putp calls tputs, returning the same error-codes. @@ -267,23 +272,23 @@ tupterm returns an error. setupterm - returns an error if it cannot allocate enough + returns an error if it cannot allocate enough memory, or create the initial windows (stdscr, - curscr, newscr). Other error conditions are + curscr, newscr). Other error conditions are documented above. tputs - returns an error if the string parameter is - null. It does not detect I/O errors: X/Open - states that tputs ignores the return value of + returns an error if the string parameter is + null. It does not detect I/O errors: X/Open + states that tputs ignores the return value of the output function putc.

    NOTES

    -       The setupterm routine should be used in place of  setterm.
-       It  may be useful when you want to test for terminal capa-
-       bilities without committing to the allocation  of  storage
+       The  setupterm routine should be used in place of setterm.
+       It may be useful when you want to test for terminal  capa-
+       bilities  without  committing to the allocation of storage
        involved in initscr.
 
        Note that vidattr and vidputs may be macros.
@@ -291,53 +296,57 @@

    PORTABILITY

    -       The  function  setterm is not described by X/Open and must
-       be considered non-portable.  All other  functions  are  as
+       The function setterm is not described by X/Open  and  must
+       be  considered  non-portable.   All other functions are as
        described by X/Open.
 
-       setupterm  copies  the terminal name to the array ttytype.
-       This is not part of X/Open Curses, but is assumed by  some
+       setupterm copies the terminal name to the  array  ttytype.
+       This  is not part of X/Open Curses, but is assumed by some
        applications.
 
-       In  System V Release 4, set_curterm has an int return type
-       and returns OK or ERR.  We have chosen  to  implement  the
+       In System V Release 4, set_curterm has an int return  type
+       and  returns  OK  or ERR.  We have chosen to implement the
        X/Open Curses semantics.
 
        In System V Release 4, the third argument of tputs has the
        type int (*putc)(char).
 
        At least one implementation of X/Open Curses (Solaris) re-
-       turns  a value other than OK/ERR from tputs.  That returns
+       turns a value other than OK/ERR from tputs.  That  returns
        the length of the string, and does no error-checking.
 
-       X/Open Curses prototypes tparm with a fixed number of  pa-
-       rameters,  rather than a variable argument list.  This im-
-       plementation uses a variable argument list.  Portable  ap-
+       X/Open  Curses prototypes tparm with a fixed number of pa-
+       rameters, rather than a variable argument list.  This  im-
+       plementation  uses  a  variable  argument list, but can be
+       configured to use the fixed-parameter list.  Portable  ap-
        plications  should  provide 9 parameters after the format;
        zeroes are fine for this purpose.
 
-       X/Open notes that after calling mvcur,  the  curses  state
-       may  not  match the actual terminal state, and that an ap-
-       plication should touch and refresh the window  before  re-
+       In response to comments by Thomas E. Dickey, X/Open Curses
+       Issue 7 proposed the tiparam function in mid-2009.
+
+       X/Open  notes  that  after calling mvcur, the curses state
+       may not match the actual terminal state, and that  an  ap-
+       plication  should  touch and refresh the window before re-
        suming normal curses calls.  Both ncurses and System V Re-
        lease 4 curses implement mvcur using the SCREEN data allo-
        cated in either initscr or newterm.  So though it is docu-
-       mented as a terminfo function, mvcur is  really  a  curses
+       mented  as  a  terminfo function, mvcur is really a curses
        function which is not well specified.
 
-       X/Open  states  that  the  old  location must be given for
-       mvcur.  This implementation allows the caller to use  -1's
-       for  the old ordinates.  In that case, the old location is
+       X/Open states that the old  location  must  be  given  for
+       mvcur.   This implementation allows the caller to use -1's
+       for the old ordinates.  In that case, the old location  is
        unknown.
 
-       Extended terminal capability names, e.g.,  as  defined  by
-       tic -x,  are  not  stored  in the arrays described in this
+       Extended  terminal  capability  names, e.g., as defined by
+       tic -x, are not stored in the  arrays  described  in  this
        section.

    SEE ALSO

    -       curses(3x), curs_initscr(3x), curs_kernel(3x),  curs_term-
+       curses(3x),  curs_initscr(3x), curs_kernel(3x), curs_term-
        cap(3x), putc(3), terminfo(5)
 
 
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index f24a8c81..1880c8e9 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -48,8 +48,9 @@

    NAME

            _tracef, _tracedump, _traceattr, _traceattr2,
-       _nc_tracebits, _tracechar, _tracechtype, _tracechtype2,
-       _tracemouse, trace - curses debugging routines
+       _nc_tracebits, _tracecchar_t, _tracecchar_t2, _tracechar,
+       _tracechtype, _tracechtype2, _tracemouse, trace - curses
+       debugging routines
    @@ -61,7 +62,9 @@ char*_traceattr(attr_tattr);char*_traceattr2(intbuffer,chtypech);char*_nc_tracebits(void); - char*_tracechar(int); + char*_tracecchar_t(constcchar_t*string); + char*_tracecchar_t2(intbuffer,constcchar_t*string); + char*_tracechar(intch);char*_tracechtype(chtypech);char*_tracechtype2(intbuffer,chtypech);char*_tracemouse(constMEVENT*event); @@ -70,20 +73,22 @@

    DESCRIPTION

    -       The  trace routines are used for debugging the ncurses li-
+       The trace routines are used for debugging the ncurses  li-
        braries, as well as applications which use the ncurses li-
        braries.  These functions are normally available only with
-       the debugging library libncurses_g.a, but may be  compiled
-       into  any  model (shared, static, profile) by defining the
-       symbol TRACE.
+       the  debugging library libncurses_g.a, but may be compiled
+       into any model (shared, static, profile) by  defining  the
+       symbol  TRACE.   Additionally,  some  functions  are  only
+       available with the wide-character configuration of the li-
+       braries.
 
-       The principal parts of this interface are the  trace  rou-
+       The  principal  parts of this interface are the trace rou-
        tine which selectively enables different tracing features,
        and the _tracef routine which writes formatted data to the
        trace file.
 
-       Calling  trace  with  a  nonzero  parameter opens the file
-       trace in the current directory for output.  The  parameter
+       Calling trace with a  nonzero  parameter  opens  the  file
+       trace  in the current directory for output.  The parameter
        is formed by OR'ing values from the list of TRACE_xxx def-
        initions in <curses.h>.  These include:
 
@@ -106,8 +111,8 @@
             trace all character outputs.
 
        TRACE_ORDINARY
-            trace all update actions.  The  old  and  new  screen
-            contents  are  written to the trace file for each re-
+            trace  all  update  actions.   The old and new screen
+            contents are written to the trace file for  each  re-
             fresh.
 
        TRACE_CALLS
@@ -143,6 +148,12 @@
        rameter is nonzero.  Some features overlap.  The  specific
        names are used as a guideline.
 
+       These  functions check the NCURSES_TRACE environment vari-
+       able, to set the tracing feature as if trace was called:
+              filter,  initscr,  new_prescr,  newterm,  nofilter,
+              ripoffline, setupterm, slk_init, tgetent
+
+

    RETURN VALUE

    diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 981a3725..15b6621b 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.26 2008/10/11 20:32:56 tom Exp @
+  * @Id: curs_util.3x,v 1.27 2008/10/25 23:45:41 tom Exp @
 -->
 
 
@@ -88,88 +88,91 @@
 
           -  DEL (character 127) is displayed as ^?.
 
-          -  Values  above 128 are either meta characters (if the
+          -  Values above 128 are either meta characters (if  the
              screen has not been initialized, or if meta has been
-             called  with a TRUE parameter), shown in the M-X no-
+             called with a TRUE parameter), shown in the M-X  no-
              tation, or are displayed as themselves.  In the lat-
              ter case, the values may not be printable; this fol-
              lows the X/Open specification.
 
-          -  Values above 256 may be the names of  the  names  of
+          -  Values  above  256  may be the names of the names of
              function keys.
 
-          -  Otherwise  (if  there  is no corresponding name) the
-             function returns null, to denote an  error.   X/Open
+          -  Otherwise (if there is no  corresponding  name)  the
+             function  returns  null, to denote an error.  X/Open
              also lists an "UNKNOWN KEY" return value, which some
              implementations return rather than null.
 
        The corresponding key_name returns a character string cor-
-       responding  to  the wide-character value w.  The two func-
-       tions do not return the same set of  strings;  the  latter
+       responding to the wide-character value w.  The  two  func-
+       tions  do  not  return the same set of strings; the latter
        returns null where the former would display a meta charac-
        ter.
 
        The filter routine, if used, must be called before initscr
-       or  newterm  are called.  The effect is that, during those
-       calls, LINES is set to 1;  the  capabilities  clear,  cup,
-       cud,  cud1,  cuu1,  cuu,  vpa  are  disabled; and the home
+       or newterm are called.  The effect is that,  during  those
+       calls,  LINES  is  set  to 1; the capabilities clear, cup,
+       cud, cud1, cuu1, cuu,  vpa  are  disabled;  and  the  home
        string is set to the value of cr.
 
-       The nofilter routine cancels the  effect  of  a  preceding
-       filter  call.   That  allows  the  caller  to initialize a
-       screen on a different device, using a different  value  of
-       $TERM.   The  limitation arises because the filter routine
+       The  nofilter  routine  cancels  the effect of a preceding
+       filter call.  That  allows  the  caller  to  initialize  a
+       screen  on  a different device, using a different value of
+       $TERM.  The limitation arises because the  filter  routine
        modifies the in-memory copy of the terminal information.
 
-       The use_env routine, if used, is called before initscr  or
-       newterm  are  called.   When called with FALSE as an argu-
-       ment, the values of lines and  columns  specified  in  the
-       terminfo  database will be used, even if environment vari-
-       ables LINES and COLUMNS (used by default) are set,  or  if
-       curses  is  running in a window (in which case default be-
-       havior would be to  use  the  window  size  if  LINES  and
-       COLUMNS  are not set).  Note that setting LINES or COLUMNS
-       overrides the corresponding size  which  may  be  obtained
+       The  use_env routine, if used, is called before initscr or
+       newterm are called.  When called with FALSE  as  an  argu-
+       ment,  the  values  of  lines and columns specified in the
+       terminfo database will be used, even if environment  vari-
+       ables  LINES  and COLUMNS (used by default) are set, or if
+       curses is running in a window (in which case  default  be-
+       havior  would  be to use the window size if LINES and COL-
+       UMNS are not set).  Note that  setting  LINES  or  COLUMNS
+       overrides  the  corresponding  size  which may be obtained
        from the operating system.
 
-       The  putwin routine writes all data associated with window
+       The putwin routine writes all data associated with  window
        win into the file to which filep points.  This information
        can be later retrieved using the getwin function.
 
        The getwin routine reads window related data stored in the
-       file by putwin.  The routine then creates and  initializes
+       file  by putwin.  The routine then creates and initializes
        a new window using that data.  It returns a pointer to the
        new window.
 
-       The delay_output routine inserts an ms  millisecond  pause
-       in  output.   This  routine should not be used extensively
-       because padding characters are  used  rather  than  a  CPU
-       pause.   If  no  padding character is specified, this uses
+       The  delay_output  routine inserts an ms millisecond pause
+       in output.  This routine should not  be  used  extensively
+       because  padding  characters  are  used  rather than a CPU
+       pause.  If no padding character is  specified,  this  uses
        napms to perform the delay.
 
-       The flushinp routine throws away any  typeahead  that  has
-       been  typed  by  the user and has not yet been read by the
+       The  flushinp  routine  throws away any typeahead that has
+       been typed by the user and has not yet been  read  by  the
        program.

    RETURN VALUE

    -       Except for flushinp, routines that return an  integer  re-
-       turn  ERR upon failure and OK (SVr4 specifies only "an in-
+       Except  for  flushinp, routines that return an integer re-
+       turn ERR upon failure and OK (SVr4 specifies only "an  in-
        teger value other than ERR") upon successful completion.
 
        Routines that return pointers return NULL on error.
 
-       X/Open does not define any error conditions.  In this  im-
+       X/Open  does not define any error conditions.  In this im-
        plementation
 
-              flushinp
-                   returns  an error if the terminal was not ini-
-                   tialized.
+          flushinp
+               returns an error if the terminal was not  initial-
+               ized.
 
-              putwin
-                   returns an  error  if  the  associated  fwrite
-                   calls return an error.
+          meta returns  an error if the terminal was not initial-
+               ized.
+
+          putwin
+               returns an error if the  associated  fwrite  calls
+               return an error.
    diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html index 0a6b54b8..55149a80 100644 --- a/doc/html/man/define_key.3x.html +++ b/doc/html/man/define_key.3x.html @@ -1,7 +1,7 @@ @@ -74,15 +74,18 @@

    RETURN VALUE

    -       The keycode  must  be  greater  than  zero,  else  ERR  is
+       The keycode must be greater than zero, and the string non-
+       null, otherwise ERR is returned.  ERR may also be returned
+       if there is insufficient memory to allocate  the  data  to
+       store  the  definition.   If  no  error is detected, OK is
        returned.

    PORTABILITY

    -       These  routines  are  specific  to ncurses.  They were not
-       supported on Version 7, BSD or System  V  implementations.
-       It  is recommended that any code depending on them be con-
+       These routines are specific to  ncurses.   They  were  not
+       supported  on  Version 7, BSD or System V implementations.
+       It is recommended that any code depending on them be  con-
        ditioned using NCURSES_VERSION.
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index a2135f39..63775f86 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -243,7 +243,7 @@

    SEE ALSO

    -       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 8e99806d..4e0bba11 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -65,21 +65,41 @@

    DESCRIPTION

            The function set_field_buffer sets the numbered buffer  of
-       the  given  field  to contain a given string.  Buffer 0 is
-       the displayed value of the field; other  numbered  buffers
-       may be allocated by applications through the nbuf argument
-       of (see form_field_new(3x)) but are not manipulated by the
-       forms  library.   The  function  field_buffer  returns the
-       address of the buffer.  Please note that this  buffer  has
-       always  the  length  of the buffer, that means that it may
-       typically contain trailing spaces. If you entered  leading
-       spaces  the  buffer may also contain them. If you want the
-       raw data, you must write your own routine that copies  the
-       value out of the buffer and removes the leading and trail-
-       ing spaces. Please note also, that  subsequent  operations
-       on  the  form  will  probably  change  the  content of the
-       buffer. So do not use it for  long  term  storage  of  the
-       entered form data.
+       the given field to contain a given string:
+
+          -  Buffer 0 is the displayed value of the field.
+
+          -  Other  numbered buffers may be allocated by applica-
+             tions   through   the   nbuf   argument   of    (see
+             form_field_new(3x))  but  are not manipulated by the
+             forms library.
+
+       The function field_buffer returns a pointer  to  the  con-
+       tents of the given numbered buffer:
+
+          -  The buffer contents always have the same length, and
+             are padded with trailing spaces as needed to  ensure
+             this length is the same.
+
+          -  The  buffer may contain leading spaces, depending on
+             how it was set.
+
+          -  The buffer contents are set  with  set_field_buffer,
+             or as a side effect of any editing operations on the
+             corresponding field.
+
+          -  Editing operations are based  on  the  window  which
+             displays  the field, rather than a string.  The win-
+             dow  contains  only  printable  characters,  and  is
+             filled  with  blanks.  If you want the raw data, you
+             must write your own routine that  copies  the  value
+             out of the buffer and removes the leading and trail-
+             ing spaces.
+
+          -  Because editing operations change the content of the
+             buffer  to  correspond to the window, you should not
+             rely on using buffers for long-term storage of  form
+             data.
 
        The  function  set_field_status sets the associated status
        flag of field; field_status gets the current  value.   The
@@ -130,8 +150,8 @@
        When  configured for wide-characters, field_buffer returns
        a pointer to temporary storage (allocated and freed by the
        library).   The  application  should not attempt to modify
-       the  data.   It  will  be  freed  on  the  next  call   to
-       field_buffer to return the same buffer.  <curses.h>.
+       the data.  It will be freed on the next call to field_buf-
+       fer to return the same buffer.  <curses.h>.
    diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html index 93280311..2e591072 100644 --- a/doc/html/man/form_field_validation.3x.html +++ b/doc/html/man/form_field_validation.3x.html @@ -27,7 +27,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: form_field_validation.3x,v 1.16 2006/12/24 16:08:08 tom Exp @ + * @Id: form_field_validation.3x,v 1.17 2008/12/14 19:22:16 juergen Exp @ --> @@ -88,70 +88,69 @@ partial match must be a unique one (if this flag is off, a prefix matches the first of any set of more than one list elements with that prefix). Please - notice that the string list is not copied, only a - reference to it is stored in the field. So you should - avoid using a list that lives in automatic variables - on the stack. + notice that the string list is copied. So you may use + a list that lives in automatic variables on the + stack. TYPE_INTEGER - Integer data, parsable to an integer by atoi(3). - Requires a third int argument controlling the preci- - sion, a fourth long argument constraining minimum - value, and a fifth long constraining maximum value. - If the maximum value is less than or equal to the + Integer data, parsable to an integer by atoi(3). + Requires a third int argument controlling the preci- + sion, a fourth long argument constraining minimum + value, and a fifth long constraining maximum value. + If the maximum value is less than or equal to the minimum value, the range is simply ignored. On return the field buffer is formatted according to the printf - format specification ".*ld", where the '*' is - replaced by the precision argument. For details of + format specification ".*ld", where the '*' is + replaced by the precision argument. For details of the precision handling see printf's man-page. TYPE_NUMERIC - Numeric data (may have a decimal-point part). - Requires a third int argument controlling the preci- - sion, a fourth double argument constraining minimum + Numeric data (may have a decimal-point part). + Requires a third int argument controlling the preci- + sion, a fourth double argument constraining minimum value, and a fifth double constraining maximum value. - If your system supports locales, the decimal point - character to be used must be the one specified by - your locale. If the maximum value is less than or - equal to the minimum value, the range is simply - ignored. On return the field buffer is formatted - according to the printf format specification ".*f", - where the '*' is replaced by the precision argument. - For details of the precision handling see printf's + If your system supports locales, the decimal point + character to be used must be the one specified by + your locale. If the maximum value is less than or + equal to the minimum value, the range is simply + ignored. On return the field buffer is formatted + according to the printf format specification ".*f", + where the '*' is replaced by the precision argument. + For details of the precision handling see printf's man-page. TYPE_REGEXP - Regular expression data. Requires a regular expres- - sion (char*) third argument; the data is valid if - the regular expression matches it. Regular expres- - sions are in the format of regcomp and regexec. - Please notice that the regular expression must match - the whole field. If you have for example an eight + Regular expression data. Requires a regular expres- + sion (char*) third argument; the data is valid if + the regular expression matches it. Regular expres- + sions are in the format of regcomp and regexec. + Please notice that the regular expression must match + the whole field. If you have for example an eight character wide field, a regular expression "^[0-9]*$" - always means that you have to fill all eight posi- + always means that you have to fill all eight posi- tions with digits. If you want to allow fewer digits, - you may use for example "^[0-9]* *$" which is good - for trailing spaces (up to an empty field), or "^ - *[0-9]* *$" which is good for leading and trailing + you may use for example "^[0-9]* *$" which is good + for trailing spaces (up to an empty field), or "^ + *[0-9]* *$" which is good for leading and trailing spaces around the digits. TYPE_IPV4 An Internet Protocol Version 4 address. This requires - no additional argument. It is checked whether or not - the buffer has the form a.b.c.d, where a,b,c and d + no additional argument. It is checked whether or not + the buffer has the form a.b.c.d, where a,b,c and d are numbers between 0 and 255. Trailing blanks in the - buffer are ignored. The address itself is not vali- + buffer are ignored. The address itself is not vali- dated. Please note that this is an ncurses extension. - This field type may not be available in other curses + This field type may not be available in other curses implementations. - It is possible to set up new programmer-defined field + It is possible to set up new programmer-defined field types. See the form_fieldtype(3x) manual page.

    RETURN VALUE

    -       The functions field_type  and  field_arg  return  NULL  on
+       The  functions  field_type  and  field_arg  return NULL on
        error. The function set_field_type returns one of the fol-
        lowing:
 
@@ -174,13 +173,13 @@

    PORTABILITY

    -       These  routines  emulate the System V forms library.  They
+       These routines emulate the System V forms  library.   They
        were not supported on Version 7 or BSD versions.

    AUTHORS

    -       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html
index 80dab419..4cb40eeb 100644
--- a/doc/html/man/form_fieldtype.3x.html
+++ b/doc/html/man/form_fieldtype.3x.html
@@ -112,8 +112,8 @@
        REQ_PREV_CHOICE assume that the possible values of a field
        form an ordered set, and provide the forms user with a way
        to  move  through the set.  The set_fieldtype_choice func-
-       tion allows forms  programmers  to  define  successor  and
-       predecessor functions for the field type.  These functions
+       tion allows forms programmers to define successor and pre-
+       decessor  functions  for  the field type.  These functions
        take the field pointer and an argument-block structure  as
        arguments.
 
diff --git a/doc/html/man/index.html b/doc/html/man/index.html
index 5db3a6df..64a832f2 100644
--- a/doc/html/man/index.html
+++ b/doc/html/man/index.html
@@ -1,8 +1,8 @@
 
 
 
 
-NCURSES - Manual Pages
+NCURSES – Manual Pages
 
 
 
@@ -39,27 +39,28 @@
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 9e635572..98354c28 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -72,35 +72,35 @@
    Default Options
        If  no options are specified and zero or one termnames are
        specified, the -I option will be assumed.   If  more  than
-       one  termname is specified, the -d option will be assumed.
+       one termname is specified, the -d option will be assumed.
 
    Comparison Options [-d] [-c] [-n]
-       infocmp compares the terminfo  description  of  the  first
-       terminal  termname  with each of the descriptions given by
-       the entries for the  other  terminal's  termnames.   If  a
-       capability  is  defined for only one of the terminals, the
-       value returned will depend on the type of the  capability:
-       F  for  boolean  variables,  -1 for integer variables, and
+       infocmp  compares  the  terminfo  description of the first
+       terminal termname with each of the descriptions  given  by
+       the  entries  for  the  other  terminal's termnames.  If a
+       capability is defined for only one of the  terminals,  the
+       value  returned will depend on the type of the capability:
+       F for boolean variables, -1  for  integer  variables,  and
        NULL for string variables.
 
-       The -d option produces a list of each capability  that  is
-       different  between  two entries.  This option is useful to
-       show the difference between two entries, created  by  dif-
+       The  -d  option produces a list of each capability that is
+       different between two entries.  This option is  useful  to
+       show  the  difference between two entries, created by dif-
        ferent people, for the same or similar terminals.
 
-       The  -c  option produces a list of each capability that is
+       The -c option produces a list of each capability  that  is
        common between two entries.  Capabilities that are not set
-       are  ignored.  This option can be used as a quick check to
+       are ignored.  This option can be used as a quick check  to
        see if the -u option is worth using.
 
-       The -n option produces a list of each capability  that  is
+       The  -n  option produces a list of each capability that is
        in neither entry.  If no termnames are given, the environ-
        ment variable TERM will be used for both of the termnames.
-       This  can  be used as a quick check to see if anything was
+       This can be used as a quick check to see if  anything  was
        left out of a description.
 
    Source Listing Options [-I] [-L] [-C] [-r]
-       The -I, -L, and -C options will produce a  source  listing
+       The  -I,  -L, and -C options will produce a source listing
        for each terminal named.
 
       -I   use the terminfo names
@@ -108,40 +108,40 @@
       -C   use the termcap names
       -r   when using -C, put out all capabilities in termcap form
 
-       If  no  termnames are given, the environment variable TERM
+       If no termnames are given, the environment  variable  TERM
        will be used for the terminal name.
 
-       The source produced by the -C option may be used  directly
-       as  a termcap entry, but not all parameterized strings can
+       The  source produced by the -C option may be used directly
+       as a termcap entry, but not all parameterized strings  can
        be changed to the termcap format.  infocmp will attempt to
-       convert  most  of  the parameterized information, and any-
-       thing not converted will be plainly marked in  the  output
+       convert most of the parameterized  information,  and  any-
+       thing  not  converted will be plainly marked in the output
        and commented out.  These should be edited by hand.
 
-       All  padding  information  for  strings  will be collected
-       together and placed at the beginning of the  string  where
-       termcap  expects  it.  Mandatory padding (padding informa-
+       All padding information  for  strings  will  be  collected
+       together  and  placed at the beginning of the string where
+       termcap expects it.  Mandatory padding  (padding  informa-
        tion with a trailing '/') will become optional.
 
        All termcap variables no longer supported by terminfo, but
        which are derivable from other terminfo variables, will be
        output.  Not all terminfo capabilities will be translated;
-       only  those variables which were part of termcap will nor-
-       mally be output.  Specifying the -r option will  take  off
-       this  restriction,  allowing all capabilities to be output
+       only those variables which were part of termcap will  nor-
+       mally  be  output.  Specifying the -r option will take off
+       this restriction, allowing all capabilities to  be  output
        in termcap form.
 
        Note that because padding is collected to the beginning of
-       the  capability,  not all capabilities are output.  Manda-
-       tory padding is not supported.   Because  termcap  strings
-       are  not as flexible, it is not always possible to convert
-       a terminfo string capability into  an  equivalent  termcap
-       format.   A subsequent conversion of the termcap file back
-       into terminfo format will not  necessarily  reproduce  the
+       the capability, not all capabilities are  output.   Manda-
+       tory  padding  is  not supported.  Because termcap strings
+       are not as flexible, it is not always possible to  convert
+       a  terminfo  string  capability into an equivalent termcap
+       format.  A subsequent conversion of the termcap file  back
+       into  terminfo  format  will not necessarily reproduce the
        original terminfo source.
 
-       Some  common  terminfo  parameter sequences, their termcap
-       equivalents, and some terminal types which  commonly  have
+       Some common terminfo parameter  sequences,  their  termcap
+       equivalents,  and  some terminal types which commonly have
        such sequences, are:
 
      terminfo                    termcap   Representative Terminals
@@ -154,130 +154,130 @@
      %p2 is printed before %p1   %r        hp
 
    Use= Option [-u]
-       The  -u  option  produces a terminfo source description of
-       the first terminal termname which is relative to  the  sum
-       of  the  descriptions  given  by the entries for the other
-       terminals termnames.  It does this by analyzing  the  dif-
-       ferences   between   the  first  termname  and  the  other
+       The -u option produces a terminfo  source  description  of
+       the  first  terminal termname which is relative to the sum
+       of the descriptions given by the  entries  for  the  other
+       terminals  termnames.   It does this by analyzing the dif-
+       ferences  between  the  first  termname  and   the   other
        termnames and producing a description with use= fields for
-       the  other  terminals.   In this manner, it is possible to
-       retrofit  generic  terminfo  entries  into  a   terminal's
+       the other terminals.  In this manner, it  is  possible  to
+       retrofit   generic  terminfo  entries  into  a  terminal's
        description.  Or, if two similar terminals exist, but were
-       coded at different times or by different  people  so  that
+       coded  at  different  times or by different people so that
        each description is a full description, using infocmp will
        show what can be done to change one description to be rel-
        ative to the other.
 
        A capability will get printed with an at-sign (@) if it no
-       longer exists in the first termname, but one of the  other
-       termname  entries contains a value for it.  A capability's
-       value gets printed if the value in the first  termname  is
-       not  found in any of the other termname entries, or if the
+       longer  exists in the first termname, but one of the other
+       termname entries contains a value for it.  A  capability's
+       value  gets  printed if the value in the first termname is
+       not found in any of the other termname entries, or if  the
        first of the other termname entries that has this capabil-
-       ity  gives  a different value for the capability than that
+       ity gives a different value for the capability  than  that
        in the first termname.
 
-       The order of the other termname  entries  is  significant.
-       Since  the terminfo compiler tic does a left-to-right scan
+       The  order  of  the other termname entries is significant.
+       Since the terminfo compiler tic does a left-to-right  scan
        of the capabilities, specifying two use= entries that con-
        tain differing entries for the same capabilities will pro-
-       duce different results depending on  the  order  that  the
-       entries  are  given in.  infocmp will flag any such incon-
-       sistencies between the other termname entries as they  are
+       duce  different  results  depending  on the order that the
+       entries are given in.  infocmp will flag any  such  incon-
+       sistencies  between the other termname entries as they are
        found.
 
-       Alternatively,  specifying a capability after a use= entry
+       Alternatively, specifying a capability after a use=  entry
        that contains that capability will cause the second speci-
-       fication  to  be  ignored.   Using  infocmp  to recreate a
+       fication to be  ignored.   Using  infocmp  to  recreate  a
        description can be a useful check to make sure that every-
-       thing  was  specified  correctly  in  the  original source
+       thing was  specified  correctly  in  the  original  source
        description.
 
-       Another error  that  does  not  cause  incorrect  compiled
-       files,  but will slow down the compilation time, is speci-
-       fying extra use= fields  that  are  superfluous.   infocmp
-       will  flag  any  other  termname use= fields that were not
+       Another  error  that  does  not  cause  incorrect compiled
+       files, but will slow down the compilation time, is  speci-
+       fying  extra  use=  fields  that are superfluous.  infocmp
+       will flag any other termname use=  fields  that  were  not
        needed.
 
    Changing Databases [-A directory] [-B directory]
-       The location of the compiled terminfo  database  is  taken
-       from  the environment variable TERMINFO .  If the variable
+       The  location  of  the compiled terminfo database is taken
+       from the environment variable TERMINFO .  If the  variable
        is not defined, or the terminal is not found in that loca-
-       tion,  the  system  terminfo  database, in /usr/share/ter-
+       tion, the system  terminfo  database,  in  /usr/share/ter-
        minfo, will be used.  The options -A and -B may be used to
-       override  this  location.  The -A option will set TERMINFO
+       override this location.  The -A option will  set  TERMINFO
        for the first termname and the -B option will set TERMINFO
-       for  the  other  termnames.   With this, it is possible to
-       compare descriptions for a terminal  with  the  same  name
-       located  in  two  different databases.  This is useful for
-       comparing descriptions for the same  terminal  created  by
+       for the other termnames.  With this,  it  is  possible  to
+       compare  descriptions  for  a  terminal with the same name
+       located in two different databases.  This  is  useful  for
+       comparing  descriptions  for  the same terminal created by
        different people.
 
    Other Options
-       -1   causes  the  fields  to be printed out one to a line.
-            Otherwise, the fields will be printed  several  to  a
+       -1   causes the fields to be printed out one  to  a  line.
+            Otherwise,  the  fields  will be printed several to a
             line to a maximum width of 60 characters.
 
-       -a   tells  infocmp  to  retain commented-out capabilities
-            rather than discarding them.  Capabilities  are  com-
+       -a   tells infocmp to  retain  commented-out  capabilities
+            rather  than  discarding them.  Capabilities are com-
             mented by prefixing them with a period.
 
        -E   Dump  the  capabilities  of  the  given  terminal  as
-            tables, needed in the C initializer  for  a  TERMTYPE
-            structure  (the  terminal capability structure in the
-            <term.h>).  This option is useful for preparing  ver-
-            sions  of  the  curses  library hardwired for a given
-            terminal type.  The tables are all  declared  static,
-            and  are  named according to the type and the name of
+            tables,  needed  in  the C initializer for a TERMTYPE
+            structure (the terminal capability structure  in  the
+            <term.h>).   This option is useful for preparing ver-
+            sions of the curses library  hardwired  for  a  given
+            terminal  type.   The tables are all declared static,
+            and are named according to the type and the  name  of
             the corresponding terminal entry.
 
-            Before ncurses 5.0, the split between the -e  and  -E
-            options  was  not  needed;  but  support for extended
+            Before  ncurses  5.0, the split between the -e and -E
+            options was not  needed;  but  support  for  extended
             names required making the arrays of terminal capabil-
             ities separate from the TERMTYPE structure.
 
-       -e   Dump  the  capabilities  of the given terminal as a C
-            initializer for a TERMTYPE  structure  (the  terminal
-            capability  structure  in the <term.h>).  This option
+       -e   Dump the capabilities of the given terminal  as  a  C
+            initializer  for  a  TERMTYPE structure (the terminal
+            capability structure in the <term.h>).   This  option
             is  useful  for  preparing  versions  of  the  curses
             library hardwired for a given terminal type.
 
-       -F   compare  terminfo  files.  This assumes that two fol-
-            lowing  arguments  are  filenames.   The  files   are
-            searched  for  pairwise matches between entries, with
+       -F   compare terminfo files.  This assumes that  two  fol-
+            lowing   arguments  are  filenames.   The  files  are
+            searched for pairwise matches between  entries,  with
             two entries considered to match if any of their names
-            do.   The  report  printed  to  standard output lists
-            entries with  no  matches  in  the  other  file,  and
-            entries  with  more than one match.  For entries with
-            exactly one match it includes  a  difference  report.
-            Normally,  to  reduce  the  volume of the report, use
-            references are not resolved before looking  for  dif-
+            do.  The report  printed  to  standard  output  lists
+            entries  with  no  matches  in  the  other  file, and
+            entries with more than one match.  For  entries  with
+            exactly  one  match  it includes a difference report.
+            Normally, to reduce the volume  of  the  report,  use
+            references  are  not resolved before looking for dif-
             ferences, but resolution can be forced by also speci-
             fying -r.
 
-       -f   Display  complex  terminfo  strings   which   contain
+       -f   Display   complex   terminfo  strings  which  contain
             if/then/else/endif expressions indented for readabil-
             ity.
 
        -G   Display constant literals in decimal form rather than
             their character equivalents.
 
-       -g   Display  constant  character  literals in quoted form
+       -g   Display constant character literals  in  quoted  form
             rather than their decimal equivalents.
 
        -i   Analyze the initialization (is1, is2, is3), and reset
-            (rs1,  rs2,  rs3),  strings  in  the entry.  For each
-            string, the code tries to analyze it into actions  in
+            (rs1, rs2, rs3), strings  in  the  entry.   For  each
+            string,  the code tries to analyze it into actions in
             terms of the other capabilities in the entry, certain
-            X3.64/ISO 6429/ECMA-48 capabilities, and certain  DEC
-            VT-series  private  modes (the set of recognized spe-
-            cial sequences has  been  selected  for  completeness
-            over  the  existing  terminfo database).  Each report
-            line consists of the capability name, followed  by  a
+            X3.64/ISO  6429/ECMA-48 capabilities, and certain DEC
+            VT-series private modes (the set of  recognized  spe-
+            cial  sequences  has  been  selected for completeness
+            over the existing terminfo  database).   Each  report
+            line  consists  of the capability name, followed by a
             colon and space, followed by a printable expansion of
-            the capability string with sections  matching  recog-
-            nized  actions  translated into {}-bracketed descrip-
-            tions.  Here  is  a  list  of  the  DEC/ANSI  special
+            the  capability  string with sections matching recog-
+            nized actions translated into  {}-bracketed  descrip-
+            tions.   Here  is  a  list  of  the  DEC/ANSI special
             sequences recognized: i.
 
                   Action        Meaning
@@ -317,10 +317,10 @@
                   DEC[+-]AWM    wraparound mode
                   DEC[+-]ARM    auto-repeat mode
 
-            It  also  recognizes  a  SGR  action corresponding to
-            ANSI/ISO 6429/ECMA Set Graphics Rendition,  with  the
-            values  NORMAL,  BOLD, UNDERLINE, BLINK, and REVERSE.
-            All but NORMAL may be prefixed with `+' (turn on)  or
+            It also recognizes  a  SGR  action  corresponding  to
+            ANSI/ISO  6429/ECMA  Set Graphics Rendition, with the
+            values NORMAL, BOLD, UNDERLINE, BLINK,  and  REVERSE.
+            All  but NORMAL may be prefixed with `+' (turn on) or
             `-' (turn off).
 
        An SGR0 designates an empty highlight sequence (equivalent
@@ -398,8 +398,8 @@

    FILES

    -       /usr/share/terminfo Compiled      terminal     description
-                           database.
+       /usr/share/terminfo Compiled  terminal  description  data-
+                           base.
    @@ -423,7 +423,7 @@ captoinfo(1m), infotocap(1m), tic(1m), toe(1m), curses(3x), terminfo(5). - This describes ncurses version 5.6 (patch 20081011). + This describes ncurses version 5.7 (patch 20100109). diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html index 15359d80..7e1e7d65 100644 --- a/doc/html/man/infotocap.1m.html +++ b/doc/html/man/infotocap.1m.html @@ -79,8 +79,8 @@

    FILES

    -       /usr/share/terminfo Compiled      terminal     description
-                           database.
+       /usr/share/terminfo Compiled  terminal  description  data-
+                           base.
    @@ -93,7 +93,7 @@

    SEE ALSO

            curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html
index c62d9da8..2059370a 100644
--- a/doc/html/man/keybound.3x.html
+++ b/doc/html/man/keybound.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
-keyok 3x
+keybound 3x
 
 
 
 
-
    keyok 3x
    
+
    keybound 3x
    
 
    
 
     
-keyok(3x)                                                     keyok(3x)
+keybound(3x)                                               keybound(3x)
 
 
 
@@ -94,7 +94,7 @@
 
 
 
-                                                              keyok(3x)
+                                                           keybound(3x)
 
    
 
    
 
    
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 4ab9195f..f03775b2 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -226,7 +226,7 @@

    SEE ALSO

    -       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index c5926994..05c605c8 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -119,8 +119,8 @@
             Clear the menu pattern buffer.
 
        REQ_BACK_PATTERN
-            Delete   the  previous  character  from  the  pattern
-            buffer.
+            Delete  the  previous character from the pattern buf-
+            fer.
 
        REQ_NEXT_MATCH
             Move to the next item matching the pattern match.
@@ -128,20 +128,20 @@
        REQ_PREV_MATCH
             Move to the previous item matching the pattern match.
 
-       If  the second argument is a printable character, the code
-       appends it to the pattern buffer and attempts to  move  to
-       the  next  item  matching the new pattern.  If there is no
+       If the second argument is a printable character, the  code
+       appends  it  to the pattern buffer and attempts to move to
+       the next item matching the new pattern.  If  there  is  no
        such match, menu_driver returns E_NO_MATCH and deletes the
        appended character from the buffer.
 
-       If  the  second  argument  is one of the above pre-defined
+       If the second argument is one  of  the  above  pre-defined
        requests, the corresponding action is performed.
 
    MOUSE HANDLING
-       If the second argument is the KEY_MOUSE special  key,  the
+       If  the  second argument is the KEY_MOUSE special key, the
        associated mouse event is translated into one of the above
-       pre-defined requests.  Currently only clicks in  the  user
-       window  (e.g.  inside the menu display area or the decora-
+       pre-defined  requests.   Currently only clicks in the user
+       window (e.g. inside the menu display area or  the  decora-
        tion window) are handled.
 
        If you click above the display region of the menu:
@@ -160,21 +160,21 @@
 
               a REQ_LAST_ITEM is generated for a triple-click.
 
-       If you click at an item inside the  display  area  of  the
+       If  you  click  at  an item inside the display area of the
        menu:
 
               -  the menu cursor is positioned to that item.
 
               -  If you double-click an item a REQ_TOGGLE_ITEM is
                  generated  and  E_UNKNOWN_COMMAND  is  returned.
-                 This  return value makes sense, because a double
+                 This return value makes sense, because a  double
                  click usually means that an item-specific action
-                 should  be  returned.  It is exactly the purpose
-                 of this return value to signal that an  applica-
+                 should be returned.  It is exactly  the  purpose
+                 of  this return value to signal that an applica-
                  tion specific command should be executed.
 
               -  If  a  translation  into  a  request  was  done,
-                 menu_driver returns the result of this  request.
+                 menu_driver returns the result of this request.
 
        If  you clicked outside the user window or the mouse event
        could  not  be  translated  into   a   menu   request   an
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 8b1dee84..0d17ec0f 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -63,7 +63,7 @@
        sonable   optimization.    This  implementation  is  ``new
        curses'' (ncurses) and is  the  approved  replacement  for
        4.4BSD  classic curses, which has been discontinued.  This
-       describes ncurses version 5.6 (patch 20081011).
+       describes ncurses version 5.7 (patch 20100109).
 
        The ncurses library emulates  the  curses(3x)  library  of
        System  V  Release  4  UNIX,  and XPG4 (X/Open Portability
@@ -150,48 +150,48 @@
        Among those, the most basic routines are move  and  addch.
        More  general versions of these routines are included with
        names beginning with w, allowing the  user  to  specify  a
-       window.   The routines not beginning with w affect stdscr.
+       window.  The routines not beginning with w affect stdscr.
 
-       After using routines to manipulate a  window,  refresh  is
-       called,  telling curses to make the user's CRT screen look
-       like stdscr.  The characters in a window are  actually  of
-       type  chtype, (character and attribute data) so that other
-       information about the character may also  be  stored  with
+       After  using  routines  to manipulate a window, refresh is
+       called, telling curses to make the user's CRT screen  look
+       like  stdscr.   The characters in a window are actually of
+       type chtype, (character and attribute data) so that  other
+       information  about  the  character may also be stored with
        each character.
 
-       Special  windows  called  pads  may  also  be manipulated.
+       Special windows  called  pads  may  also  be  manipulated.
        These are windows which are not constrained to the size of
-       the  screen and whose contents need not be completely dis-
+       the screen and whose contents need not be completely  dis-
        played.  See curs_pad(3x) for more information.
 
-       In addition to drawing characters  on  the  screen,  video
-       attributes  and colors may be supported, causing the char-
-       acters to show up in such modes as underlined, in  reverse
-       video,  or in color on terminals that support such display
+       In  addition  to  drawing  characters on the screen, video
+       attributes and colors may be supported, causing the  char-
+       acters  to show up in such modes as underlined, in reverse
+       video, or in color on terminals that support such  display
        enhancements.  Line drawing characters may be specified to
-       be  output.   On  input,  curses is also able to translate
-       arrow and function keys  that  transmit  escape  sequences
-       into  single  values.   The video attributes, line drawing
-       characters,  and  input  values  use  names,  defined   in
+       be output.  On input, curses is  also  able  to  translate
+       arrow  and  function  keys  that transmit escape sequences
+       into single values.  The video  attributes,  line  drawing
+       characters,   and  input  values  use  names,  defined  in
        <curses.h>, such as A_REVERSE, ACS_HLINE, and KEY_LEFT.
 
        If the environment variables LINES and COLUMNS are set, or
-       if the program is executing in a window environment,  line
-       and  column  information  in the environment will override
+       if  the program is executing in a window environment, line
+       and column information in the  environment  will  override
        information read by terminfo.  This would affect a program
-       running  in an AT&T 630 layer, for example, where the size
+       running in an AT&T 630 layer, for example, where the  size
        of a screen is changeable (see ENVIRONMENT).
 
-       If the environment variable TERMINFO is defined, any  pro-
-       gram  using  curses checks for a local terminal definition
-       before checking in the standard place.   For  example,  if
+       If  the environment variable TERMINFO is defined, any pro-
+       gram using curses checks for a local  terminal  definition
+       before  checking  in  the standard place.  For example, if
        TERM is set to att4424, then the compiled terminal defini-
        tion is found in
 
              /usr/share/terminfo/a/att4424.
 
        (The a is copied from the first letter of att4424 to avoid
-       creation  of  huge  directories.)  However, if TERMINFO is
+       creation of huge directories.)  However,  if  TERMINFO  is
        set to $HOME/myterms, curses first checks
 
              $HOME/myterms/a/att4424,
@@ -200,115 +200,115 @@
 
              /usr/share/terminfo/a/att4424.
 
-       This is useful for developing experimental definitions  or
+       This  is useful for developing experimental definitions or
        when write permission in /usr/share/terminfo is not avail-
        able.
 
-       The integer  variables  LINES  and  COLS  are  defined  in
-       <curses.h>  and will be filled in by initscr with the size
+       The  integer  variables  LINES  and  COLS  are  defined in
+       <curses.h> and will be filled in by initscr with the  size
        of the screen.  The constants TRUE and FALSE have the val-
        ues 1 and 0, respectively.
 
-       The  curses  routines  also  define  the WINDOW * variable
+       The curses routines also  define  the  WINDOW  *  variable
        curscr which is used for certain low-level operations like
-       clearing  and  redrawing a screen containing garbage.  The
+       clearing and redrawing a screen containing  garbage.   The
        curscr can be used in only a few routines.
 
    Routine and Argument Names
-       Many curses routines have two or more versions.  The  rou-
+       Many  curses routines have two or more versions.  The rou-
        tines prefixed with w require a window argument.  The rou-
        tines prefixed with p require a pad argument.  Those with-
        out a prefix generally use stdscr.
 
        The routines prefixed with mv require a y and x coordinate
-       to move to before performing the appropriate action.   The
-       mv  routines  imply  a call to move before the call to the
-       other routine.  The coordinate y always refers to the  row
-       (of  the  window), and x always refers to the column.  The
+       to  move to before performing the appropriate action.  The
+       mv routines imply a call to move before the  call  to  the
+       other  routine.  The coordinate y always refers to the row
+       (of the window), and x always refers to the  column.   The
        upper left-hand corner is always (0,0), not (1,1).
 
        The routines prefixed with mvw take both a window argument
-       and  x  and  y coordinates.  The window argument is always
+       and x and y coordinates.  The window  argument  is  always
        specified before the coordinates.
 
-       In each case, win is the window affected, and pad  is  the
+       In  each  case, win is the window affected, and pad is the
        pad affected; win and pad are always pointers to type WIN-
        DOW.
 
        Option setting routines require a Boolean flag bf with the
-       value  TRUE  or FALSE; bf is always of type bool.  Most of
-       the data types used in the library routines, such as  WIN-
-       DOW,  SCREEN,  bool, and chtype are defined in <curses.h>.
-       Types used for the terminfo routines such as TERMINAL  are
+       value TRUE or FALSE; bf is always of type bool.   Most  of
+       the  data types used in the library routines, such as WIN-
+       DOW, SCREEN, bool, and chtype are defined  in  <curses.h>.
+       Types  used for the terminfo routines such as TERMINAL are
        defined in <term.h>.
 
-       This  manual  page describes functions which may appear in
-       any configuration of the library.  There  are  two  common
+       This manual page describes functions which may  appear  in
+       any  configuration  of  the library.  There are two common
        configurations of the library:
 
               ncurses
                    the  "normal"  library,  which  handles  8-bit
                    characters.  The normal (8-bit) library stores
-                   characters  combined with attributes in chtype
+                   characters combined with attributes in  chtype
                    data.
 
-                   Attributes alone (no corresponding  character)
-                   may  be  stored  in  chtype  or the equivalent
-                   attr_t data.  In  either  case,  the  data  is
+                   Attributes  alone (no corresponding character)
+                   may be stored  in  chtype  or  the  equivalent
+                   attr_t  data.   In  either  case,  the data is
                    stored in something like an integer.
 
-                   Each  cell  (row  and  column)  in a WINDOW is
+                   Each cell (row and  column)  in  a  WINDOW  is
                    stored as a chtype.
 
               ncursesw
-                   the so-called "wide"  library,  which  handles
-                   multibyte   characters  (See  the  section  on
+                   the  so-called  "wide"  library, which handles
+                   multibyte  characters  (See  the  section   on
                    ALTERNATE CONFIGURATIONS).  The "wide" library
-                   includes  all  of  the calls from the "normal"
-                   library.  It adds about one third  more  calls
+                   includes all of the calls  from  the  "normal"
+                   library.   It  adds about one third more calls
                    using data types which store multibyte charac-
                    ters:
 
                    cchar_t
-                        corresponds to chtype.  However it  is  a
-                        structure,  because  more  data is stored
-                        than can fit into an integer.  The  char-
+                        corresponds  to  chtype.  However it is a
+                        structure, because more  data  is  stored
+                        than  can fit into an integer.  The char-
                         acters are large enough to require a full
-                        integer value - and  there  may  be  more
-                        than  one  character per cell.  The video
-                        attributes and color are stored in  sepa-
+                        integer  value  -  and  there may be more
+                        than one character per cell.   The  video
+                        attributes  and color are stored in sepa-
                         rate fields of the structure.
 
                         Each cell (row and column) in a WINDOW is
                         stored as a cchar_t.
 
                    wchar_t
-                        stores a "wide" character.  Like  chtype,
+                        stores  a "wide" character.  Like chtype,
                         this may be an integer.
 
                    wint_t
-                        stores  a wchar_t or WEOF - not the same,
+                        stores a wchar_t or WEOF - not the  same,
                         though both may have the same size.
 
                    The  "wide"  library  provides  new  functions
-                   which  are analogous to functions in the "nor-
-                   mal" library.  There is  a  naming  convention
-                   which  relates  many  of the normal/wide vari-
-                   ants: a "_w" is inserted into the  name.   For
+                   which are analogous to functions in the  "nor-
+                   mal"  library.   There  is a naming convention
+                   which relates many of  the  normal/wide  vari-
+                   ants:  a  "_w" is inserted into the name.  For
                    example, waddch becomes wadd_wch.
 
-
    Routine Name Index
        The following table lists each curses routine and the name
-       of the manual page on which  it  is  described.   Routines
-       flagged  with  `*'  are ncurses-specific, not described by
+       of  the  manual  page  on which it is described.  Routines
+       flagged with `*' are ncurses-specific,  not  described  by
        XPG4 or present in SVr4.
 
-
               curses Routine Name     Manual Page Name
               --------------------------------------------
               COLOR_PAIR              curs_color(3x)
               PAIR_NUMBER             curs_attr(3x)
+              _nc_free_and_exit       curs_memleaks(3x)*
+              _nc_freeall             curs_memleaks(3x)*
               _nc_tracebits           curs_trace(3x)*
 
               _traceattr              curs_trace(3x)*
@@ -750,14 +750,14 @@

    RETURN VALUE

    -       Routines that return an integer return  ERR  upon  failure
-       and  an  integer value other than ERR upon successful com-
-       pletion, unless otherwise noted in  the  routine  descrip-
+       Routines  that  return  an integer return ERR upon failure
+       and an integer value other than ERR upon  successful  com-
+       pletion,  unless  otherwise  noted in the routine descrip-
        tions.
 
-       All  macros  return  the  value  of  the w version, except
+       All macros return the  value  of  the  w  version,  except
        setscrreg, wsetscrreg, getyx, getbegyx, and getmaxyx.  The
-       return  values  of setscrreg, wsetscrreg, getyx, getbegyx,
+       return values of setscrreg, wsetscrreg,  getyx,  getbegyx,
        and getmaxyx are undefined (i.e., these should not be used
        as the right-hand side of assignment statements).
 
@@ -771,18 +771,23 @@
        important ones have been already discussed in detail.
 
        BAUDRATE
-            The  debugging library checks this environment symbol
+            The debugging library checks this environment  symbol
             when the application has redirected output to a file.
-            The  symbol's numeric value is used for the baudrate.
+            The symbol's numeric value is used for the  baudrate.
             If no value is found, ncurses uses 9600.  This allows
-            testers  to construct repeatable test-cases that take
+            testers to construct repeatable test-cases that  take
             into account costs that depend on baudrate.
 
        CC   When set, change occurrences of the command_character
-            (i.e.,  the  cmdch capability) of the loaded terminfo
-            entries to the value of this symbol.  Very  few  ter-
+            (i.e., the cmdch capability) of the  loaded  terminfo
+            entries  to  the value of this symbol.  Very few ter-
             minfo entries provide this feature.
 
+            Because this name is also used in  development  envi-
+            ronments  to represent the C compiler's name, ncurses
+            ignores it if it does not happen to be a single char-
+            acter.
+
        COLUMNS
             Specify  the  width  of  the  screen  in  characters.
             Applications running in a windowing environment  usu-
@@ -851,11 +856,11 @@
 
        LINES
             Like COLUMNS, specify the height  of  the  screen  in
-            characters.   See COLUMNS for a detailed description.
+            characters.  See COLUMNS for a detailed description.
 
        MOUSE_BUTTONS_123
             This applies only to the OS/2 EMX port.  It specifies
-            the  order  of  buttons on the mouse.  OS/2 numbers a
+            the order of buttons on the mouse.   OS/2  numbers  a
             3-button mouse inconsistently from other platforms:
 
             1 = left
@@ -863,136 +868,137 @@
             3 = middle.
 
             This symbol lets you customize the mouse.  The symbol
-            must  be three numeric digits 1-3 in any order, e.g.,
-            123 or 321.  If it is  not  specified,  ncurses  uses
+            must be three numeric digits 1-3 in any order,  e.g.,
+            123  or  321.   If  it is not specified, ncurses uses
             132.
 
        NCURSES_ASSUMED_COLORS
-            Override  the  compiled-in assumption that the termi-
-            nal's  default   colors   are   white-on-black   (see
-            default_colors(3x)).   You may set the foreground and
-            background color values with this  environment  vari-
-            able  by  proving  a 2-element list: foreground,back-
-            ground.  For example, to tell ncurses to  not  assume
-            anything  about  the colors, set this to "-1,-1".  To
-            make it green-on-black, set it to "2,0".   Any  posi-
+            Override the compiled-in assumption that  the  termi-
+            nal's   default   colors   are   white-on-black  (see
+            default_colors(3x)).  You may set the foreground  and
+            background  color  values with this environment vari-
+            able by proving a  2-element  list:  foreground,back-
+            ground.   For  example, to tell ncurses to not assume
+            anything about the colors, set this to  "-1,-1".   To
+            make  it  green-on-black, set it to "2,0".  Any posi-
             tive value from zero to the terminfo max_colors value
             is allowed.
 
        NCURSES_GPM_TERMS
-            This applies only to ncurses configured  to  use  the
+            This  applies  only  to ncurses configured to use the
             GPM interface.
 
             If present, the environment variable is a list of one
-            or more terminal names against which the  TERM  envi-
-            ronment  variable is matched.  Setting it to an empty
-            value disables the GPM interface; using the  built-in
+            or  more  terminal names against which the TERM envi-
+            ronment variable is matched.  Setting it to an  empty
+            value  disables the GPM interface; using the built-in
             support for xterm, etc.
 
-            If  the  environment variable is absent, ncurses will
+            If the environment variable is absent,  ncurses  will
             attempt to open GPM if TERM contains "linux".
 
        NCURSES_NO_HARD_TABS
-            Ncurses may use tabs as part of the  cursor  movement
-            optimization.   In  some  cases, your terminal driver
-            may not handle these properly.  Set this  environment
+            Ncurses  may  use tabs as part of the cursor movement
+            optimization.  In some cases,  your  terminal  driver
+            may  not handle these properly.  Set this environment
             variable to disable the feature.  You can also adjust
             your stty settings to avoid the problem.
 
        NCURSES_NO_MAGIC_COOKIES
             Some  terminals  use  a  magic-cookie  feature  which
-            requires  special  handling  to make highlighting and
-            other video attributes  display  properly.   You  can
-            suppress  the  highlighting entirely for these termi-
+            requires special handling to  make  highlighting  and
+            other  video  attributes  display  properly.  You can
+            suppress the highlighting entirely for  these  termi-
             nals by setting this environment variable.
 
        NCURSES_NO_PADDING
-            Most of the terminal  descriptions  in  the  terminfo
-            database  are  written for real "hardware" terminals.
-            Many people use terminal emulators  which  run  in  a
-            windowing    environment    and    use   curses-based
-            applications.  Terminal emulators can  duplicate  all
-            of  the important aspects of a hardware terminal, but
-            they do not have the  same  limitations.   The  chief
-            limitation of a hardware terminal from the standpoint
-            of your application is the  management  of  dataflow,
-            i.e.,  timing.   Unless a hardware terminal is inter-
-            faced into a terminal concentrator (which  does  flow
-            control),   it  (or  your  application)  must  manage
-            dataflow, preventing overruns.  The cheapest solution
-            (no  hardware cost) is for your program to do this by
-            pausing  after  operations  that  the  terminal  does
-            slowly, such as clearing the display.
-
-            As  a  result,  many terminal descriptions (including
-            the vt100) have delay times embedded.  You  may  wish
-            to  use  these  descriptions, but not want to pay the
+            Most  of  the  terminal  descriptions in the terminfo
+            database are written for real  "hardware"  terminals.
+            Many  people  use  terminal  emulators which run in a
+            windowing environment and use  curses-based  applica-
+            tions.   Terminal  emulators can duplicate all of the
+            important aspects of a hardware terminal, but they do
+            not  have the same limitations.  The chief limitation
+            of a hardware terminal from the  standpoint  of  your
+            application is the management of dataflow, i.e., tim-
+            ing.  Unless a hardware terminal is interfaced into a
+            terminal  concentrator  (which does flow control), it
+            (or your application) must manage dataflow,  prevent-
+            ing  overruns.   The  cheapest  solution (no hardware
+            cost) is for your program to do this by pausing after
+            operations  that  the  terminal  does slowly, such as
+            clearing the display.
+
+            As a result, many  terminal  descriptions  (including
+            the  vt100)  have delay times embedded.  You may wish
+            to use these descriptions, but not want  to  pay  the
             performance penalty.
 
-            Set the NCURSES_NO_PADDING symbol to disable all  but
-            mandatory  padding.   Mandatory  padding is used as a
+            Set  the NCURSES_NO_PADDING symbol to disable all but
+            mandatory padding.  Mandatory padding is  used  as  a
             part of special control sequences such as flash.
 
        NCURSES_NO_SETBUF
-            Normally ncurses enables buffered output during  ter-
-            minal  initialization.   This  is  done  (as  in SVr4
-            curses) for performance reasons.   For  testing  pur-
+            Normally  ncurses enables buffered output during ter-
+            minal initialization.   This  is  done  (as  in  SVr4
+            curses)  for  performance  reasons.  For testing pur-
             poses, both of ncurses and certain applications, this
             feature    is    made    optional.     Setting    the
             NCURSES_NO_SETBUF variable disables output buffering,
-            leaving the output  in  the  original  (usually  line
+            leaving  the  output  in  the  original (usually line
             buffered) mode.
 
        NCURSES_NO_UTF8_ACS
             During initialization, the ncurses library checks for
-            special cases where VT100 line-drawing (and the  cor-
-            responding   alternate  character  set  capabilities)
-            described in the terminfo are known  to  be  missing.
-            Specifically,  when  running  in  a UTF-8 locale, the
-            Linux console emulator and  the  GNU  screen  program
-            ignore  these.   Ncurses  checks the TERM environment
-            variable for these.  For  other  special  cases,  you
-            should  set  this  environment  variable.  Doing this
-            tells ncurses to use Unicode values which  correspond
+            special  cases where VT100 line-drawing (and the cor-
+            responding  alternate  character  set   capabilities)
+            described  in  the  terminfo are known to be missing.
+            Specifically, when running in  a  UTF-8  locale,  the
+            Linux  console  emulator  and  the GNU screen program
+            ignore these.  Ncurses checks  the  TERM  environment
+            variable  for  these.   For  other special cases, you
+            should set this  environment  variable.   Doing  this
+            tells  ncurses to use Unicode values which correspond
             to the VT100 line-drawing glyphs.  That works for the
             special cases cited, and is likely to work for termi-
             nal emulators.
 
-            When  setting  this  variable, you should set it to a
-            nonzero value.  Setting it to zero (or to  a  nonnum-
-            ber) disables the special check for Linux and screen.
+            When setting this variable, you should set  it  to  a
+            nonzero  value.   Setting it to zero (or to a nonnum-
+            ber) disables  the  special  check  for  "linux"  and
+            "screen".
 
        NCURSES_TRACE
-            During initialization, the ncurses debugging  library
-            checks  the  NCURSES_TRACE symbol.  If it is defined,
+            During  initialization, the ncurses debugging library
+            checks the NCURSES_TRACE symbol.  If it  is  defined,
             to a numeric value, ncurses calls the trace function,
             using that value as the argument.
 
-            The  argument  values, which are defined in curses.h,
-            provide several types of information.   When  running
-            with  traces enabled, your application will write the
+            The argument values, which are defined  in  curses.h,
+            provide  several  types of information.  When running
+            with traces enabled, your application will write  the
             file trace to the current directory.
 
-       TERM Denotes your terminal type.  Each  terminal  type  is
+       TERM Denotes  your  terminal  type.  Each terminal type is
             distinct, though many are similar.
 
        TERMCAP
             If the ncurses library has been configured with term-
-            cap support, ncurses  will  check  for  a  terminal's
+            cap  support,  ncurses  will  check  for a terminal's
             description in termcap form if it is not available in
             the terminfo database.
 
-            The  TERMCAP  symbol  contains  either   a   terminal
-            description  (with  newlines stripped out), or a file
-            name telling where the  information  denoted  by  the
-            TERM  symbol  exists.   In  either  case,  setting it
-            directs ncurses to ignore the usual  place  for  this
+            The   TERMCAP   symbol  contains  either  a  terminal
+            description (with newlines stripped out), or  a  file
+            name  telling  where  the  information denoted by the
+            TERM symbol  exists.   In  either  case,  setting  it
+            directs  ncurses  to  ignore the usual place for this
             information, e.g., /etc/termcap.
 
        TERMINFO
             Overrides the directory in which ncurses searches for
             your terminal description.  This is the simplest, but
-            not  the  only way to change the list of directories.
+            not the only way to change the list  of  directories.
             The complete list of directories in order follows:
 
             -  the last directory to which ncurses wrote, if any,
@@ -1009,57 +1015,57 @@
                /usr/share/terminfo
 
        TERMINFO_DIRS
-            Specifies  a list of directories to search for termi-
-            nal descriptions.  The list is  separated  by  colons
-            (i.e.,  ":") on Unix, semicolons on OS/2 EMX.  All of
+            Specifies a list of directories to search for  termi-
+            nal  descriptions.   The  list is separated by colons
+            (i.e., ":") on Unix, semicolons on OS/2 EMX.  All  of
             the terminal descriptions are in terminfo form, which
-            makes  a  subdirectory  named for the first letter of
+            makes a subdirectory named for the  first  letter  of
             the terminal names therein.
 
        TERMPATH
-            If TERMCAP does not hold a  file  name  then  ncurses
-            checks  the TERMPATH symbol.  This is a list of file-
-            names separated by spaces or colons  (i.e.,  ":")  on
+            If  TERMCAP  does  not  hold a file name then ncurses
+            checks the TERMPATH symbol.  This is a list of  file-
+            names  separated  by  spaces or colons (i.e., ":") on
             Unix, semicolons on OS/2 EMX.  If the TERMPATH symbol
-            is not set, ncurses looks in the files  /etc/termcap,
-            /usr/share/misc/termcap  and  $HOME/.termcap, in that
+            is  not set, ncurses looks in the files /etc/termcap,
+            /usr/share/misc/termcap and $HOME/.termcap,  in  that
             order.
 
-       The library may be configured to disregard  the  following
-       variables  when  the current user is the superuser (root),
-       or if the application uses setuid or  setgid  permissions:
+       The  library  may be configured to disregard the following
+       variables when the current user is the  superuser  (root),
+       or  if  the application uses setuid or setgid permissions:
        $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.

    ALTERNATE CONFIGURATIONS

    -       Several  different  configurations are possible, depending
-       on  the  configure  script  options  used  when   building
-       ncurses.   There  are a few main options whose effects are
+       Several different configurations are  possible,  depending
+       on   the  configure  script  options  used  when  building
+       ncurses.  There are a few main options whose  effects  are
        visible to the applications developer using ncurses:
 
        --disable-overwrite
-            The standard include for ncurses is as noted in  SYN-
+            The  standard include for ncurses is as noted in SYN-
             OPSIS:
 
             #include <curses.h>
 
-            This  option is used to avoid filename conflicts when
-            ncurses is not the main implementation of  curses  of
-            the  computer.   If  ncurses  is  installed disabling
-            overwrite, it puts its  headers  in  a  subdirectory,
+            This option is used to avoid filename conflicts  when
+            ncurses  is  not the main implementation of curses of
+            the computer.   If  ncurses  is  installed  disabling
+            overwrite,  it  puts  its  headers in a subdirectory,
             e.g.,
 
             #include <ncurses/curses.h>
 
-            It  also  omits a symbolic link which would allow you
+            It also omits a symbolic link which would  allow  you
             to use -lcurses to build executables.
 
        --enable-widec
-            The configure script renames the library and (if  the
-            --disable-overwrite  option  is used) puts the header
+            The  configure script renames the library and (if the
+            --disable-overwrite option is used) puts  the  header
             files  in  a  different  subdirectory.   All  of  the
-            library  names  have  a  "w"  appended to them, i.e.,
+            library names have a  "w"  appended  to  them,  i.e.,
             instead of
 
             -lncurses
@@ -1069,16 +1075,16 @@
             -lncursesw
 
             You must also define _XOPEN_SOURCE_EXTENDED when com-
-            piling  for  the  wide-character  library  to use the
-            extended (wide-character)  functions.   The  curses.h
-            file   which  is  installed  for  the  wide-character
-            library is designed to be compatible with the  normal
+            piling for the  wide-character  library  to  use  the
+            extended  (wide-character)  functions.   The curses.h
+            file  which  is  installed  for  the   wide-character
+            library  is designed to be compatible with the normal
             library's header.  Only the size of the WINDOW struc-
-            ture differs, and very few applications require  more
-            than  a  pointer  to  WINDOWs.   If  the  headers are
-            installed  allowing  overwrite,  the   wide-character
-            library's  headers should be installed last, to allow
-            applications to be built using  either  library  from
+            ture  differs, and very few applications require more
+            than a  pointer  to  WINDOWs.   If  the  headers  are
+            installed   allowing  overwrite,  the  wide-character
+            library's headers should be installed last, to  allow
+            applications  to  be  built using either library from
             the same set of headers.
 
        --with-shared
@@ -1088,16 +1094,16 @@
        --with-debug
 
        --with-profile
-            The  shared  and normal (static) library names differ
-            by their  suffixes,  e.g.,  libncurses.so  and  libn-
-            curses.a.   The  debug  and profiling libraries add a
+            The shared and normal (static) library  names  differ
+            by  their  suffixes,  e.g.,  libncurses.so  and libn-
+            curses.a.  The debug and profiling  libraries  add  a
             "_g" and a "_p" to the root names respectively, e.g.,
             libncurses_g.a and libncurses_p.a.
 
        --with-trace
-            The  trace  function  normally  resides  in the debug
+            The trace function  normally  resides  in  the  debug
             library, but it is sometimes useful to configure this
-            in  the  shared  library.   Configure  scripts should
+            in the  shared  library.   Configure  scripts  should
             check for the function's existence rather than assum-
             ing it is always in the debug library.
 
@@ -1105,14 +1111,14 @@

    FILES

            /usr/share/tabset
-            directory  containing  initialization  files  for the
+            directory containing  initialization  files  for  the
             terminal capability database /usr/share/terminfo ter-
             minal capability database

    SEE ALSO

    -       terminfo(5)  and  related  pages whose names begin "curs_"
+       terminfo(5) and related pages whose  names  begin  "curs_"
        for detailed routine descriptions.
 
 
@@ -1121,103 +1127,103 @@
        The  ncurses  library  can  be  compiled  with  an  option
        (-DUSE_GETCAP) that falls back to the old-style /etc/term-
        cap file if the terminal setup code cannot find a terminfo
-       entry  corresponding  to TERM.  Use of this feature is not
-       recommended, as it essentially includes an entire  termcap
-       compiler  in the ncurses startup code, at significant cost
+       entry corresponding to TERM.  Use of this feature  is  not
+       recommended,  as it essentially includes an entire termcap
+       compiler in the ncurses startup code, at significant  cost
        in core and startup cycles.
 
-       The ncurses  library  includes  facilities  for  capturing
-       mouse  events on certain terminals (including xterm).  See
+       The  ncurses  library  includes  facilities  for capturing
+       mouse events on certain terminals (including xterm).   See
        the curs_mouse(3x) manual page for details.
 
-       The ncurses library includes facilities for responding  to
-       window  resizing  events,  e.g., when running in an xterm.
-       See the resizeterm(3x) and wresize(3x)  manual  pages  for
-       details.   In addition, the library may be configured with
+       The  ncurses library includes facilities for responding to
+       window resizing events, e.g., when running  in  an  xterm.
+       See  the  resizeterm(3x)  and wresize(3x) manual pages for
+       details.  In addition, the library may be configured  with
        a SIGWINCH handler.
 
-       The ncurses library extends the fixed set of function  key
-       capabilities  of  terminals  by  allowing  the application
-       designer to define additional key  sequences  at  runtime.
+       The  ncurses library extends the fixed set of function key
+       capabilities of  terminals  by  allowing  the  application
+       designer  to  define  additional key sequences at runtime.
        See the define_key(3x) key_defined(3x), and keyok(3x) man-
        ual pages for details.
 
        The ncurses library can exploit the capabilities of termi-
-       nals  which  implement the ISO-6429 SGR 39 and SGR 49 con-
+       nals which implement the ISO-6429 SGR 39 and SGR  49  con-
        trols, which allow an application to reset the terminal to
-       its  original  foreground and background colors.  From the
-       users' perspective, the application is able to  draw  col-
-       ored  text  on  a  background  whose color is set indepen-
-       dently, providing better  control  over  color  contrasts.
+       its original foreground and background colors.   From  the
+       users'  perspective,  the application is able to draw col-
+       ored text on a background  whose  color  is  set  indepen-
+       dently,  providing  better  control  over color contrasts.
        See the default_colors(3x) manual page for details.
 
-       The  ncurses  library  includes  a  function for directing
-       application output to a printer attached to  the  terminal
+       The ncurses library  includes  a  function  for  directing
+       application  output  to a printer attached to the terminal
        device.  See the curs_print(3x) manual page for details.

    PORTABILITY

    -       The  ncurses  library is intended to be BASE-level confor-
+       The ncurses library is intended to be  BASE-level  confor-
        mant with XSI Curses.  The EXTENDED XSI Curses functional-
        ity (including color support) is supported.
 
-       A  small  number of local differences (that is, individual
-       differences between the XSI Curses and ncurses calls)  are
-       described  in  PORTABILITY  sections  of  the  library man
+       A small number of local differences (that  is,  individual
+       differences  between the XSI Curses and ncurses calls) are
+       described in  PORTABILITY  sections  of  the  library  man
        pages.
 
        This implementation also contains several extensions:
 
-            The routine has_key is not part of XPG4,  nor  is  it
-            present  in SVr4.  See the curs_getch(3x) manual page
+            The  routine  has_key  is not part of XPG4, nor is it
+            present in SVr4.  See the curs_getch(3x) manual  page
             for details.
 
-            The routine slk_attr is not part of XPG4, nor  is  it
-            present  in  SVr4.   See the curs_slk(3x) manual page
+            The  routine  slk_attr is not part of XPG4, nor is it
+            present in SVr4.  See the  curs_slk(3x)  manual  page
             for details.
 
-            The routines getmouse,  mousemask,  ungetmouse,  mou-
-            seinterval,  and wenclose relating to mouse interfac-
-            ing are not part of XPG4, nor  are  they  present  in
-            SVr4.    See   the  curs_mouse(3x)  manual  page  for
+            The  routines  getmouse,  mousemask, ungetmouse, mou-
+            seinterval, and wenclose relating to mouse  interfac-
+            ing  are  not  part  of XPG4, nor are they present in
+            SVr4.   See  the  curs_mouse(3x)  manual   page   for
             details.
 
-            The routine mcprint was not present in  any  previous
+            The  routine  mcprint was not present in any previous
             curses implementation.  See the curs_print(3x) manual
             page for details.
 
-            The routine wresize is not part of XPG4,  nor  is  it
+            The  routine  wresize  is not part of XPG4, nor is it
             present in SVr4.  See the wresize(3x) manual page for
             details.
 
             The WINDOW structure's internal details can be hidden
-            from  application  programs.  See curs_opaque(3x) for
+            from application programs.  See  curs_opaque(3x)  for
             the discussion of is_scrollok, etc.
 
-       In historic curses versions, delays embedded in the  capa-
+       In  historic curses versions, delays embedded in the capa-
        bilities cr, ind, cub1, ff and tab activated corresponding
-       delay bits in the UNIX tty driver.   In  this  implementa-
-       tion,  all  padding  is  done  by sending NUL bytes.  This
-       method is slightly more expensive, but narrows the  inter-
-       face  to  the  UNIX kernel significantly and increases the
+       delay  bits  in  the UNIX tty driver.  In this implementa-
+       tion, all padding is done  by  sending  NUL  bytes.   This
+       method  is slightly more expensive, but narrows the inter-
+       face to the UNIX kernel significantly  and  increases  the
        package's portability correspondingly.

    NOTES

    -       The header  file  <curses.h>  automatically  includes  the
+       The  header  file  <curses.h>  automatically  includes the
        header files <stdio.h> and <unctrl.h>.
 
-       If  standard  output from a ncurses program is re-directed
-       to something which is not a tty, screen  updates  will  be
+       If standard output from a ncurses program  is  re-directed
+       to  something  which  is not a tty, screen updates will be
        directed to standard error.  This was an undocumented fea-
        ture of AT&T System V Release 3 curses.

    AUTHORS

    -       Zeyd M. Ben-Halim, Eric  S.  Raymond,  Thomas  E.  Dickey.
+       Zeyd  M.  Ben-Halim,  Eric  S.  Raymond, Thomas E. Dickey.
        Based on pcurses by Pavel Curtis.
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index a5b5a060..02e561f9 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -109,30 +109,30 @@
               Use this function and not wrefresh or wnoutrefresh.
               update_panels() may be called more than once before
               a  call  to doupdate(), but doupdate() is the func-
-              tion responsible for updating the physical  screen.
+              tion responsible for updating the physical screen.
 
        del_panel(pan)
               removes the given panel from the  stack and deallo-
-              cates the PANEL structure (but not  its  associated
+              cates  the  PANEL structure (but not its associated
               window).
 
        hide_panel(pan)
-              removes  the  given  panel from the panel stack and
+              removes the given panel from the  panel  stack  and
               thus hides it from view. The PANEL structure is not
               lost, merely removed from the stack.
 
        panel_hidden(pan)
-              returns  TRUE  if  the panel is in the panel stack,
-              FALSE if it  is  not.   If  the  panel  is  a  null
+              returns TRUE if the panel is in  the  panel  stack,
+              FALSE  if  it  is  not.   If  the  panel  is a null
               pointer, return ERR.
 
        show_panel(pan)
-              makes  a  hidden panel visible by placing it on top
+              makes a hidden panel visible by placing it  on  top
               of the panels in the panel stack. See COMPATIBILITY
               below.
 
        top_panel(pan)
-              puts  the  given visible panel on top of all panels
+              puts the given visible panel on top of  all  panels
               in the stack.  See COMPATIBILITY below.
 
        bottom_panel(pan)
@@ -140,26 +140,26 @@
 
        move_panel(pan,starty,startx)
               moves the given panel window so that its upper-left
-              corner  is  at  starty, startx.  It does not change
+              corner is at starty, startx.  It  does  not  change
               the position of the panel in the stack.  Be sure to
-              use  this  function,  not  mvwin(), to move a panel
+              use this function, not mvwin(),  to  move  a  panel
               window.
 
        replace_panel(pan,window)
-              replaces the current window of  panel  with  window
+              replaces  the  current  window of panel with window
               (useful, for example if you want to resize a panel;
               if you're using ncurses, you can call replace_panel
-              on  the output of wresize(3x)).  It does not change
+              on the output of wresize(3x)).  It does not  change
               the position of the panel in the stack.
 
        panel_above(pan)
-              returns a pointer to the panel above pan.   If  the
-              panel  argument is (PANEL *)0, it returns a pointer
+              returns  a  pointer to the panel above pan.  If the
+              panel argument is (PANEL *)0, it returns a  pointer
               to the bottom panel in the stack.
 
        panel_below(pan)
-              returns a pointer to the panel just below pan.   If
-              the  panel  argument  is  (PANEL  *)0, it returns a
+              returns  a pointer to the panel just below pan.  If
+              the panel argument is  (PANEL  *)0,  it  returns  a
               pointer to the top panel in the stack.
 
        set_panel_userptr(pan,ptr)
@@ -183,10 +183,10 @@
 
    COMPATIBILITY
            Reasonable  care  has been taken to  ensure  compatibility
        with  the  native  panel  facility  introduced  in  SVr3.2
-       (inspection   of   the  SVr4  manual  pages  suggests  the
-       programming  interface  is  unchanged).   The  PANEL  data
-       structures  are  merely   similar. The  programmer is cau-
-       tioned not to directly use PANEL fields.
+       (inspection of the SVr4 manual pages suggests the program-
+       ming interface is unchanged).  The PANEL  data  structures
+       are  merely   similar. The  programmer is cautioned not to
+       directly use PANEL fields.
 
        The functions show_panel() and top_panel()  are  identical
        in  this  implementation,  and work equally well with dis-
@@ -218,7 +218,7 @@
 
    SEE ALSO
            curses(3x)
 
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
    
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
new file mode 100644
index 00000000..d5ddb259
--- /dev/null
+++ b/doc/html/man/tabs.1.html
@@ -0,0 +1,167 @@
+
+
+
+
+tabs 1
+
+
+
+
+
    tabs 1
    
+
    
+
    +
+tabs(1)                                                         tabs(1)
+
+
+
+
+
    
+
    NAME
    +       tabs - set tabs on a terminal
+
+
+
    
+
    SYNOPSIS
    +       tabs [-v[n]] [-ahuUV] file...
+
+
+
    
+
    DESCRIPTION
    +       The  tabs  program clears and sets tab-stops on the termi-
+       nal.  This uses the terminfo  clear_all_tabs  and  set_tab
+       capabilities.   If  either  is  absent,  tabs is unable to
+       clear/set tab-stops.  The terminal should be configured to
+       use hard tabs, e.g.,
+
+              stty tab0
+
+
+
    
+
    OPTIONS
    +   General Options
+       -Tname
+            Tell tabs which terminal type to use.  If this option
+            is not given, tabs will  use  the  $TERM  environment
+            variable.   If  that  is  not  set,  it  will use the
+            ansi+tabs entry.
+
+       -d   The debugging option shows a ruler line, followed  by
+            two  data  lines.   The  first  data  line  shows the
+            expected tab-stops marked with asterisks.  The second
+            data  line  shows  the  actual tab-stops, marked with
+            asterisks.
+
+       -n   This option tells tabs to check the options  and  run
+            any  debugging option, but not to modify the terminal
+            settings.
+
+       The tabs program processes a single  list  of  tab  stops.
+       The  last  option  to be processed which defines a list is
+       the one that determines the list to be processed.
+
+   Implicit Lists
+       Use a single number as an option, e.g., "-5" to  set  tabs
+       at  the  given  interval  (in  this case 1, 6, 11, 16, 21,
+       etc.).  Tabs are repeated up to the right  margin  of  the
+       screen.
+
+   Explicit Lists
+       An  explicit  list  can be defined after the options (this
+       does not use a "-").  The values in the list  must  be  in
+       increasing numeric order, and greater than zero.  They are
+       separated by a comma or a blank, for example,
+
+              tabs 1,6,11,16,21
+              tabs 1 6 11 16 21
+       Use a '+' to treat a number as an  increment  relative  to
+       the previous value, e.g.,
+
+              tabs 1,+5,+5,+5,+5
+       which is equivalent to the 1,6,11,16,21 example.
+
+   Predefined Tab-Stops
+       X/Open defines several predefined lists of tab stops.
+
+       -a   Assembler, IBM S/370, first format
+
+       -a2  Assembler, IBM S/370, second format
+
+       -c   COBOL, normal format
+
+       -c2  COBOL compact format
+
+       -c3  COBOL compact format extended
+
+       -f   FORTRAN
+
+       -p   PL/I
+
+       -s   SNOBOL
+
+       -u   UNIVAC 1100 Assembler
+
+
+
    
+
    PORTABILITY
    +       X/Open  describes  a  +m option, to set a terminal's left-
+       margin.  None of the entries in the terminal database pro-
+       vide this capability.
+
+       The  -d  (debug) and -n (no-op) options are extensions not
+       provided by other implementations.
+
+       Documentation for other implementations states that  there
+       is  a limit on the number of tab stops.  While some termi-
+       nals may not accept an arbitrary number of tab stops, this
+       implementation  will  attempt  to  set tab stops up to the
+       right margin of the screen, if the given list  happens  to
+       be that long.
+
+
+
    
+
    SEE ALSO
    +       tset(1), infocmp(1m), curses(3x), terminfo(5).
+
+       This describes ncurses version 5.7 (patch 20100109).
+
+
+
+                                                                tabs(1)
+
    
+
    
+
    
+Man(1) output converted with
+man2html
+
    
+
+
diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html
index 53ea633e..5c0a4238 100644
--- a/doc/html/man/term.7.html
+++ b/doc/html/man/term.7.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -59,7 +59,7 @@
        mailer.
 
        A  default  TERM  value will be set on a per-line basis by
-       either /etc/inittab (Linux and  System-V-like  UNIXes)  or
+       either  /etc/inittab  (e.g.,  System-V-like   UNIXes)   or
        /etc/ttys  (BSD  UNIXes).  This will nearly always suffice
        for workstation and microcomputer consoles.
 
@@ -85,9 +85,9 @@
        the tty device and baud rate.
 
        Setting your own TERM value may also be useful if you have
-       created a custom  entry  incorporating  options  (such  as
-       visual  bell  or reverse-video) which you wish to override
-       the system default type for your line.
+       created a custom entry incorporating options (such as vis-
+       ual  bell or reverse-video) which you wish to override the
+       system default type for your line.
 
        Terminal type descriptions are stored as files of capabil-
        ity data underneath /usr/share/terminfo.  To browse a list
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 1284d02f..9ca502dd 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -6,7 +6,7 @@
   * Note: this must be run through tbl before nroff.
   * The magic cookie on the first line triggers this under some man programs.
   ****************************************************************************
-  * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
+  * Copyright (c) 1998-2007,2009 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,9 +32,9 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.16 2007/03/04 00:09:46 tom Exp @
+  * @Id: terminfo.head,v 1.17 2009/09/19 19:59:38 tom Exp @
   * Head of terminfo man page ends here
-  * @Id: terminfo.tail,v 1.49 2008/02/16 20:57:43 tom Exp @
+  * @Id: terminfo.tail,v 1.50 2009/09/19 19:56:15 tom Exp @
   * Beginning of terminfo.tail file
   * This file is part of ncurses.
   * See "terminfo.head" for copyright.
@@ -78,7 +78,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
@@ -113,7 +113,6 @@
        vt100-w.  The following suffixes should be used where pos-
        sible:
 
-
       Suffix                  Meaning                   Example
       -nn      Number of lines on the screen            aaa-60
       -np      Number of pages of memory                c100-4p
@@ -126,8 +125,8 @@
       -ns      No status line                           hp2626-ns
       -rv      Reverse video                            c100-rv
       -s       Enable status line                       vt100-s
-
       -vb      Use visible bell instead of beep         wy370-vb
+
       -w       Wide mode (> 80 columns, usually 132)    vt100-w
 
        For more on terminal naming conventions, see  the  term(7)
@@ -176,133 +175,134 @@
        These are the boolean capabilities:
 
 
-               Variable          Cap-  TCap      Description
-               Booleans          name  Code
-       auto_left_margin          bw    bw    cub1 wraps from col-
+               Variable          Cap-   TCap     Description
+               Booleans          name   Code
+       auto_left_margin          bw     bw   cub1 wraps from col-
                                              umn 0 to last column
-       auto_right_margin         am    am    terminal has auto-
+       auto_right_margin         am     am   terminal has auto-
                                              matic margins
-       back_color_erase          bce   ut    screen erased with
+       back_color_erase          bce    ut   screen erased with
                                              background color
-       can_change                ccc   cc    terminal can re-
+       can_change                ccc    cc   terminal can re-
                                              define existing col-
                                              ors
-       ceol_standout_glitch      xhp   xs    standout not erased
+       ceol_standout_glitch      xhp    xs   standout not erased
                                              by overwriting (hp)
-       col_addr_glitch           xhpa  YA    only positive motion
+       col_addr_glitch           xhpa   YA   only positive motion
                                              for hpa/mhpa caps
 
 
-       cpi_changes_res           cpix  YF    changing character
+
+       cpi_changes_res           cpix   YF   changing character
                                              pitch changes reso-
                                              lution
-       cr_cancels_micro_mode     crxm  YB    using cr turns off
+       cr_cancels_micro_mode     crxm   YB   using cr turns off
                                              micro mode
-       dest_tabs_magic_smso      xt    xt    tabs destructive,
+       dest_tabs_magic_smso      xt     xt   tabs destructive,
                                              magic so char
                                              (t1061)
-       eat_newline_glitch        xenl  xn    newline ignored
+       eat_newline_glitch        xenl   xn   newline ignored
                                              after 80 cols (con-
                                              cept)
-       erase_overstrike          eo    eo    can erase over-
+       erase_overstrike          eo     eo   can erase over-
                                              strikes with a blank
-       generic_type              gn    gn    generic line type
-       hard_copy                 hc    hc    hardcopy terminal
-       hard_cursor               chts  HC    cursor is hard to
+       generic_type              gn     gn   generic line type
+       hard_copy                 hc     hc   hardcopy terminal
+       hard_cursor               chts   HC   cursor is hard to
                                              see
-       has_meta_key              km    km    Has a meta key
+       has_meta_key              km     km   Has a meta key
                                              (i.e., sets 8th-bit)
-       has_print_wheel           daisy YC    printer needs opera-
+       has_print_wheel           daisy  YC   printer needs opera-
                                              tor to change char-
                                              acter set
-       has_status_line           hs    hs    has extra status
+       has_status_line           hs     hs   has extra status
                                              line
-       hue_lightness_saturation  hls   hl    terminal uses only
+       hue_lightness_saturation  hls    hl   terminal uses only
                                              HLS color notation
                                              (Tektronix)
-       insert_null_glitch        in    in    insert mode distin-
+       insert_null_glitch        in     in   insert mode distin-
                                              guishes nulls
-       lpi_changes_res           lpix  YG    changing line pitch
+       lpi_changes_res           lpix   YG   changing line pitch
                                              changes resolution
-       memory_above              da    da    display may be
+       memory_above              da     da   display may be
                                              retained above the
                                              screen
-       memory_below              db    db    display may be
+       memory_below              db     db   display may be
                                              retained below the
                                              screen
-       move_insert_mode          mir   mi    safe to move while
+       move_insert_mode          mir    mi   safe to move while
                                              in insert mode
-       move_standout_mode        msgr  ms    safe to move while
+       move_standout_mode        msgr   ms   safe to move while
                                              in standout mode
-       needs_xon_xoff            nxon  nx    padding will not
+       needs_xon_xoff            nxon   nx   padding will not
                                              work, xon/xoff
                                              required
-       no_esc_ctlc               xsb   xb    beehive (f1=escape,
+       no_esc_ctlc               xsb    xb   beehive (f1=escape,
                                              f2=ctrl C)
-       no_pad_char               npc   NP    pad character does
+       no_pad_char               npc    NP   pad character does
                                              not exist
-       non_dest_scroll_region    ndscr ND    scrolling region is
+       non_dest_scroll_region    ndscr  ND   scrolling region is
                                              non-destructive
-       non_rev_rmcup             nrrmc NR    smcup does not
+       non_rev_rmcup             nrrmc  NR   smcup does not
                                              reverse rmcup
-       over_strike               os    os    terminal can over-
+       over_strike               os     os   terminal can over-
                                              strike
-       prtr_silent               mc5i  5i    printer will not
+       prtr_silent               mc5i   5i   printer will not
                                              echo on screen
-       row_addr_glitch           xvpa  YD    only positive motion
+       row_addr_glitch           xvpa   YD   only positive motion
                                              for vpa/mvpa caps
-       semi_auto_right_margin    sam   YE    printing in last
+       semi_auto_right_margin    sam    YE   printing in last
                                              column causes cr
-       status_line_esc_ok        eslok es    escape can be used
+       status_line_esc_ok        eslok  es   escape can be used
                                              on the status line
-       tilde_glitch              hz    hz    cannot print ~'s
+       tilde_glitch              hz     hz   cannot print ~'s
                                              (hazeltine)
 
 
-       transparent_underline     ul    ul    underline character
+       transparent_underline     ul     ul   underline character
                                              overstrikes
-       xon_xoff                  xon   xo    terminal uses
+       xon_xoff                  xon    xo   terminal uses
                                              xon/xoff handshaking
 
        These are the numeric capabilities:
 
 
-            Variable         Cap-     TCap       Description
-             Numeric         name     Code
-       columns               cols     co     number of columns in
+               Variable          Cap-   TCap     Description
+                Numeric          name   Code
+       columns                   cols   co   number of columns in
                                              a line
-       init_tabs             it       it     tabs initially every
+       init_tabs                 it     it   tabs initially every
                                              # spaces
-       label_height          lh       lh     rows in each label
-       label_width           lw       lw     columns in each
+       label_height              lh     lh   rows in each label
+       label_width               lw     lw   columns in each
                                              label
-       lines                 lines    li     number of lines on
+       lines                     lines  li   number of lines on
                                              screen or page
-       lines_of_memory       lm       lm     lines of memory if >
+       lines_of_memory           lm     lm   lines of memory if >
                                              line. 0 means varies
-       magic_cookie_glitch   xmc      sg     number of blank
+       magic_cookie_glitch       xmc    sg   number of blank
                                              characters left by
                                              smso or rmso
-       max_attributes        ma       ma     maximum combined
+       max_attributes            ma     ma   maximum combined
                                              attributes terminal
                                              can handle
-       max_colors            colors   Co     maximum number of
+       max_colors                colors Co   maximum number of
                                              colors on screen
-       max_pairs             pairs    pa     maximum number of
+       max_pairs                 pairs  pa   maximum number of
                                              color-pairs on the
                                              screen
-       maximum_windows       wnum     MW     maximum number of
+       maximum_windows           wnum   MW   maximum number of
                                              defineable windows
-       no_color_video        ncv      NC     video attributes
+       no_color_video            ncv    NC   video attributes
                                              that cannot be used
                                              with colors
-       num_labels            nlab     Nl     number of labels on
+       num_labels                nlab   Nl   number of labels on
                                              screen
-       padding_baud_rate     pb       pb     lowest baud rate
+       padding_baud_rate         pb     pb   lowest baud rate
                                              where padding needed
-       virtual_terminal      vt       vt     virtual terminal
+       virtual_terminal          vt     vt   virtual terminal
                                              number (CB/unix)
-       width_status_line     wsl      ws     number of columns in
+       width_status_line         wsl    ws   number of columns in
                                              status line
 
        The following numeric  capabilities  are  present  in  the
@@ -310,47 +310,47 @@
        man page.  They came in with SVr4's printer support.
 
 
-             Variable         Cap-    TCap       Description
-             Numeric          name    Code
-       bit_image_entwining    bitwin  Yo     number of passes for
+               Variable          Cap-   TCap     Description
+                Numeric          name   Code
+       bit_image_entwining       bitwin Yo   number of passes for
                                              each bit-image row
-       bit_image_type         bitype  Yp     type of bit-image
+       bit_image_type            bitype Yp   type of bit-image
                                              device
-       buffer_capacity        bufsz   Ya     numbers of bytes
+       buffer_capacity           bufsz  Ya   numbers of bytes
                                              buffered before
                                              printing
-       buttons                btns    BT     number of buttons on
+       buttons                   btns   BT   number of buttons on
                                              mouse
-       dot_horz_spacing       spinh   Yc     spacing of dots hor-
+       dot_horz_spacing          spinh  Yc   spacing of dots hor-
                                              izontally in dots
                                              per inch
 
-       dot_vert_spacing       spinv   Yb     spacing of pins ver-
+       dot_vert_spacing          spinv  Yb   spacing of pins ver-
                                              tically in pins per
                                              inch
-       max_micro_address      maddr   Yd     maximum value in
+       max_micro_address         maddr  Yd   maximum value in
                                              micro_..._address
-       max_micro_jump         mjump   Ye     maximum value in
+       max_micro_jump            mjump  Ye   maximum value in
                                              parm_..._micro
-       micro_col_size         mcs     Yf     character step size
+       micro_col_size            mcs    Yf   character step size
                                              when in micro mode
-       micro_line_size        mls     Yg     line step size when
+       micro_line_size           mls    Yg   line step size when
                                              in micro mode
-       number_of_pins         npins   Yh     numbers of pins in
+       number_of_pins            npins  Yh   numbers of pins in
                                              print-head
-       output_res_char        orc     Yi     horizontal resolu-
+       output_res_char           orc    Yi   horizontal resolu-
                                              tion in units per
                                              line
-       output_res_horz_inch   orhi    Yk     horizontal resolu-
+       output_res_horz_inch      orhi   Yk   horizontal resolu-
                                              tion in units per
                                              inch
-       output_res_line        orl     Yj     vertical resolution
+       output_res_line           orl    Yj   vertical resolution
                                              in units per line
-       output_res_vert_inch   orvi    Yl     vertical resolution
+       output_res_vert_inch      orvi   Yl   vertical resolution
                                              in units per inch
-       print_rate             cps     Ym     print rate in char-
+       print_rate                cps    Ym   print rate in char-
                                              acters per second
-       wide_char_size         widcs   Yn     character step size
+       wide_char_size            widcs  Yn   character step size
                                              when in double wide
                                              mode
 
@@ -402,8 +402,8 @@
                                              prototype !?
        create_window             cwin   CW   define a window #1
                                              from #2,#3 to #4,#5
-       cursor_address            cup    cm   move to row #1
-                                             columns #2
+       cursor_address            cup    cm   move to row #1 col-
+                                             umns #2
        cursor_down               cud1   do   down one line
        cursor_home               home   ho   home cursor (if no
                                              cup)
@@ -904,8 +904,8 @@
        zero_motion               zerom  Zx   No motion for subse-
                                              quent character
 
-       The  following  string  capabilities  are  present  in the
-       SVr4.0 term structure, but were originally not  documented
+       The following  string  capabilities  are  present  in  the
+       SVr4.0  term structure, but were originally not documented
        in the man page.
 
 
@@ -989,12 +989,12 @@
                                                bottom margins to
                                                #1, #2
 
-        The XSI Curses  standard  added  these.   They  are  some
-        post-4.1  versions  of System V curses, e.g., Solaris 2.5
-        and IRIX 6.x.  The ncurses termcap  names  for  them  are
+        The  XSI  Curses  standard  added  these.   They are some
+        post-4.1 versions of System V curses, e.g.,  Solaris  2.5
+        and  IRIX  6.x.   The  ncurses termcap names for them are
         invented; according to the XSI Curses standard, they have
-        no termcap names.  If your compiled terminfo entries  use
-        these,  they  may  not be binary-compatible with System V
+        no  termcap names.  If your compiled terminfo entries use
+        these, they may not be binary-compatible  with  System  V
         terminfo entries after SVr4.1; beware!
 
 
@@ -1021,7 +1021,7 @@
 
    A Sample Entry
        The following entry, describing an ANSI-standard terminal,
-       is  representative  of  what a terminfo entry for a modern
+       is representative of what a terminfo entry  for  a  modern
        terminal typically looks like.
 
      ansi|ansi/pc-term compatible with color,
@@ -1045,84 +1045,82 @@
              sgr0=\E[0;10m, tbc=\E[2g, u6=\E[%d;%dR, u7=\E[6n,
              u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%p1%dd,
 
-       Entries may continue onto multiple lines by placing  white
-       space  at  the  beginning  of  each line except the first.
-       Comments may be included on lines  beginning  with  ``#''.
+       Entries  may continue onto multiple lines by placing white
+       space at the beginning of  each  line  except  the  first.
+       Comments  may  be  included on lines beginning with ``#''.
        Capabilities in terminfo are of three types: Boolean capa-
        bilities which indicate that the terminal has some partic-
-       ular  feature, numeric capabilities giving the size of the
-       terminal or the size  of  particular  delays,  and  string
-       capabilities,  which  give a sequence which can be used to
+       ular feature, numeric capabilities giving the size of  the
+       terminal  or  the  size  of  particular delays, and string
+       capabilities, which give a sequence which can be  used  to
        perform particular terminal operations.
 
-
    Types of Capabilities
-       All capabilities have names.  For instance, the fact  that
-       ANSI-standard  terminals  have automatic margins (i.e., an
-       automatic return and line-feed when the end of a  line  is
-       reached)  is  indicated  by  the capability am.  Hence the
+       All  capabilities have names.  For instance, the fact that
+       ANSI-standard terminals have automatic margins  (i.e.,  an
+       automatic  return  and line-feed when the end of a line is
+       reached) is indicated by the  capability  am.   Hence  the
        description of ansi includes am.  Numeric capabilities are
-       followed  by  the character `#' and then a positive value.
-       Thus cols, which indicates the number of columns the  ter-
-       minal  has,  gives  the  value  `80' for ansi.  Values for
+       followed by the character `#' and then a  positive  value.
+       Thus  cols, which indicates the number of columns the ter-
+       minal has, gives the value  `80'  for  ansi.   Values  for
        numeric capabilities may be specified in decimal, octal or
-       hexadecimal,  using the C programming language conventions
+       hexadecimal, using the C programming language  conventions
        (e.g., 255, 0377 and 0xff or 0xFF).
 
-       Finally, string valued capabilities, such as el (clear  to
+       Finally,  string valued capabilities, such as el (clear to
        end of line sequence) are given by the two-character code,
-       an `=', and then a string ending  at  the  next  following
+       an  `=',  and  then  a string ending at the next following
        `,'.
 
-       A  number  of  escape sequences are provided in the string
+       A number of escape sequences are provided  in  the  string
        valued capabilities for easy encoding of characters there.
-       Both  \E  and  \e map to an ESCAPE character, ^x maps to a
-       control-x for any appropriate x, and the sequences  \n  \l
-       \r  \t  \b  \f  \s give a newline, line-feed, return, tab,
+       Both \E and \e map to an ESCAPE character, ^x  maps  to  a
+       control-x  for  any appropriate x, and the sequences \n \l
+       \r \t \b \f \s give a  newline,  line-feed,  return,  tab,
        backspace, form-feed, and space.  Other escapes include \^
-       for  ^, \\ for \, \, for comma, \: for :, and \0 for null.
-       (\0 will produce \200, which does not terminate  a  string
+       for ^, \\ for \, \, for comma, \: for :, and \0 for  null.
+       (\0  will  produce \200, which does not terminate a string
        but behaves as a null character on most terminals, provid-
-       ing CS7 is specified.  See stty(1).)  Finally,  characters
+       ing  CS7 is specified.  See stty(1).)  Finally, characters
        may be given as three octal digits after a \.
 
-       A  delay  in  milliseconds may appear anywhere in a string
-       capability, enclosed in $<..> brackets, as in  el=\EK$<5>,
-       and  padding  characters  are supplied by tputs to provide
-       this delay.  The delay must be a number with at  most  one
+       A delay in milliseconds may appear anywhere  in  a  string
+       capability,  enclosed in $<..> brackets, as in el=\EK$<5>,
+       and padding characters are supplied by  tputs  to  provide
+       this  delay.   The delay must be a number with at most one
        decimal place of precision; it may be followed by suffixes
-       `*' or '/' or both.  A  `*'  indicates  that  the  padding
-       required  is  proportional to the number of lines affected
-       by the  operation,  and  the  amount  given  is  the  per-
-       affected-unit  padding  required.   (In the case of insert
+       `*'  or  '/'  or  both.   A `*' indicates that the padding
+       required is proportional to the number of  lines  affected
+       by  the  operation,  and  the  amount  given  is  the per-
+       affected-unit padding required.  (In the  case  of  insert
        character,  the  factor  is  still  the  number  of  lines
-       affected.)   Normally,  padding  is advisory if the device
-       has the xon capability; it is used  for  cost  computation
-       but  does not trigger delays.  A `/' suffix indicates that
-       the padding is mandatory and forces a delay of  the  given
-       number  of  milliseconds  even on devices for which xon is
+       affected.)  Normally, padding is advisory  if  the  device
+       has  the  xon  capability; it is used for cost computation
+       but does not trigger delays.  A `/' suffix indicates  that
+       the  padding  is mandatory and forces a delay of the given
+       number of milliseconds even on devices for  which  xon  is
        present to indicate flow control.
 
-       Sometimes individual capabilities must be  commented  out.
-       To  do this, put a period before the capability name.  For
+       Sometimes  individual  capabilities must be commented out.
+       To do this, put a period before the capability name.   For
        example, see the second ind in the example above.
 
-
    Fetching Compiled Descriptions
-       If the environment variable TERMINFO is set, it is  inter-
-       preted  as the pathname of a directory containing the com-
+       If  the environment variable TERMINFO is set, it is inter-
+       preted as the pathname of a directory containing the  com-
        piled description you are working on.  Only that directory
        is searched.
 
-       If  TERMINFO  is  not set, the ncurses version of the ter-
-       minfo reader code  will  instead  look  in  the  directory
-       $HOME/.terminfo  for  a compiled description.  If it fails
-       to find one  there,  and  the  environment  variable  TER-
-       MINFO_DIRS  is set, it will interpret the contents of that
-       variable as a list of colon- separated directories  to  be
-       searched  (an  empty  entry is interpreted as a command to
-       search /usr/share/terminfo).  If no description  is  found
-       in  any of the TERMINFO_DIRS directories, the fetch fails.
+       If TERMINFO is not set, the ncurses version  of  the  ter-
+       minfo  reader  code  will  instead  look  in the directory
+       $HOME/.terminfo for a compiled description.  If  it  fails
+       to  find  one  there,  and  the  environment variable TER-
+       MINFO_DIRS is set, it will interpret the contents of  that
+       variable  as  a list of colon- separated directories to be
+       searched (an empty entry is interpreted as  a  command  to
+       search  /usr/share/terminfo).   If no description is found
+       in any of the TERMINFO_DIRS directories, the fetch fails.
 
        If neither TERMINFO nor TERMINFO_DIRS  is  set,  the  last
        place   tried  will  be  the  system  terminfo  directory,
@@ -1132,7 +1130,6 @@
        extensions   are  supported  under  stock  System  V  ter-
        minfo/curses.)
 
-
    Preparing Descriptions
        We now outline how to prepare descriptions  of  terminals.
        The  most  effective way to prepare a terminal description
@@ -1152,7 +1149,6 @@
        ally  needed.  A similar test can be used for insert char-
        acter.
 
-
    Basic Capabilities
        The number of columns on each line  for  the  terminal  is
        given  by the cols numeric capability.  If the terminal is
@@ -1190,35 +1186,35 @@
        left corner of the screen and send the ind (index) string.
 
        To scroll text down, a program goes to the top left corner
-       of  the  screen  and  sends the ri (reverse index) string.
-       The strings ind and ri are undefined  when  not  on  their
+       of the screen and sends the  ri  (reverse  index)  string.
+       The  strings  ind  and  ri are undefined when not on their
        respective corners of the screen.
 
        Parameterized versions of the scrolling sequences are indn
        and rin which have the same semantics as ind and ri except
-       that  they take one parameter, and scroll that many lines.
-       They are also undefined except at the appropriate edge  of
+       that they take one parameter, and scroll that many  lines.
+       They  are also undefined except at the appropriate edge of
        the screen.
 
-       The  am  capability tells whether the cursor sticks at the
-       right edge of the screen when text  is  output,  but  this
+       The am capability tells whether the cursor sticks  at  the
+       right  edge  of  the  screen when text is output, but this
        does not necessarily apply to a cuf1 from the last column.
-       The only local motion which is defined from the left  edge
-       is  if  bw  is  given, then a cub1 from the left edge will
-       move to the right edge of the previous row.  If bw is  not
-       given,  the effect is undefined.  This is useful for draw-
-       ing a box around the edge of the screen, for example.   If
-       the  terminal has switch selectable automatic margins, the
-       terminfo file usually assumes that this is on;  i.e.,  am.
-       If  the  terminal  has  a command which moves to the first
-       column of the next line, that command can be given as  nel
-       (newline).   It  does not matter if the command clears the
-       remainder of the current line, so if the terminal  has  no
-       cr  and lf it may still be possible to craft a working nel
+       The  only local motion which is defined from the left edge
+       is if bw is given, then a cub1 from  the  left  edge  will
+       move  to the right edge of the previous row.  If bw is not
+       given, the effect is undefined.  This is useful for  draw-
+       ing  a box around the edge of the screen, for example.  If
+       the terminal has switch selectable automatic margins,  the
+       terminfo  file  usually assumes that this is on; i.e., am.
+       If the terminal has a command which  moves  to  the  first
+       column  of the next line, that command can be given as nel
+       (newline).  It does not matter if the command  clears  the
+       remainder  of  the current line, so if the terminal has no
+       cr and lf it may still be possible to craft a working  nel
        out of one or both of them.
 
        These  capabilities  suffice  to  describe  hard-copy  and
-       "glass-tty"  terminals.   Thus  the  model  33 teletype is
+       "glass-tty" terminals.  Thus  the  model  33  teletype  is
        described as
 
        33|tty33|tty|model 33 teletype,
@@ -1230,34 +1226,32 @@
             am, bel=^G, clear=^Z, cols#80, cr=^M, cub1=^H, cud1=^J,
             ind=^J, lines#24,
 
-
    Parameterized Strings
-       Cursor addressing and other strings  requiring  parameters
-       in  the  terminal  are described by a parameterized string
-       capability, with printf(3) like escapes  %x  in  it.   For
-       example,  to  address  the  cursor,  the cup capability is
+       Cursor  addressing  and other strings requiring parameters
+       in the terminal are described by  a  parameterized  string
+       capability,  with  printf(3)  like  escapes %x in it.  For
+       example, to address the  cursor,  the  cup  capability  is
        given, using two parameters: the row and column to address
        to.  (Rows and columns are numbered from zero and refer to
        the physical screen visible to the user, not to any unseen
-       memory.)   If  the  terminal  has  memory  relative cursor
+       memory.)  If  the  terminal  has  memory  relative  cursor
        addressing, that can be indicated by mrcup.
 
-       The parameter mechanism uses a stack and special  %  codes
-       to  manipulate  it.  Typically a sequence will push one of
-       the parameters onto the stack and then print  it  in  some
-       format.   Print  (e.g.,  "%d")  is  a special case.  Other
-       operations, including "%t"  pop  their  operand  from  the
+       The  parameter  mechanism uses a stack and special % codes
+       to manipulate it.  Typically a sequence will push  one  of
+       the  parameters  onto  the stack and then print it in some
+       format.  Print (e.g., "%d")  is  a  special  case.   Other
+       operations,  including  "%t"  pop  their  operand from the
        stack.  It is noted that more complex operations are often
        necessary, e.g., in the sgr string.
 
        The % encodings have the following meanings:
 
-
        %%   outputs `%'
 
        %[[:]flags][width[.precision]][doxXs]
-            as in printf, flags are [-+#] and space.  Use  a  `:'
-            to  allow the next character to be a `-' flag, avoid-
+            as  in  printf, flags are [-+#] and space.  Use a `:'
+            to allow the next character to be a `-' flag,  avoid-
             ing interpreting "%-" as an operator.
 
        %c   print pop() like %c in printf
@@ -1279,11 +1273,11 @@
        %g[A-Z]
             get static variable [a-z] and push it
 
-            The terms  "static"  and  "dynamic"  are  misleading.
-            Historically,  these are simply two different sets of
-            variables, whose values are not reset  between  calls
-            to  tparm.   However,  that fact is not documented in
-            other implementations.  Relying on it will  adversely
+            The  terms  "static"  and  "dynamic"  are misleading.
+            Historically, these are simply two different sets  of
+            variables,  whose  values are not reset between calls
+            to tparm.  However, that fact is  not  documented  in
+            other  implementations.  Relying on it will adversely
             impact portability to other implementations.
 
        %'c' char constant c
@@ -1307,16 +1301,16 @@
             logical AND and OR operations (for conditionals)
 
        %! %~
-            unary  operations  (logical  and   bit   complement):
+            unary   operations   (logical  and  bit  complement):
             push(op pop())
 
        %i   add 1 to first two parameters (for ANSI terminals)
 
        %? expr %t thenpart %e elsepart %;
-            This  forms  an  if-then-else.   The  %e  elsepart is
-            optional.  Usually the %? expr part  pushes  a  value
-            onto  the stack, and %t pops it from the stack, test-
-            ing if it is nonzero (true).  If it is zero  (false),
+            This forms  an  if-then-else.   The  %e  elsepart  is
+            optional.   Usually  the  %? expr part pushes a value
+            onto the stack, and %t pops it from the stack,  test-
+            ing  if it is nonzero (true).  If it is zero (false),
             control passes to the %e (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1342,241 +1336,236 @@
        its.  Thus its cup capability is "cup=6\E&%p2%2dc%p1%2dY".
 
        The Microterm ACT-IV needs the current row and column sent
-       preceded  by  a ^T, with the row and column simply encoded
-       in binary, "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"
-       need  to  be  able  to backspace the cursor (cub1), and to
+       preceded by a ^T, with the row and column  simply  encoded
+       in  binary,  "cup=^T%p1%c%p2%c".  Terminals which use "%c"
+       need to be able to backspace the  cursor  (cub1),  and  to
        move the cursor up one line on the screen (cuu1).  This is
-       necessary  because it is not always safe to transmit \n ^D
-       and \r, as the system may change or  discard  them.   (The
-       library  routines  dealing  with terminfo set tty modes so
+       necessary because it is not always safe to transmit \n  ^D
+       and  \r,  as  the system may change or discard them.  (The
+       library routines dealing with terminfo set  tty  modes  so
        that tabs are never expanded, so \t is safe to send.  This
        turns out to be essential for the Ann Arbor 4080.)
 
        A final example is the LSI ADM-3a, which uses row and col-
        umn  offset  by  a  blank  character,  thus  "cup=\E=%p1%'
-       '%+%c%p2%'  '%+%c".   After sending `\E=', this pushes the
-       first parameter, pushes the ASCII value for a space  (32),
-       adds  them  (pushing  the sum on the stack in place of the
-       two previous values) and outputs that value as  a  charac-
-       ter.   Then  the  same  is  done for the second parameter.
+       '%+%c%p2%' '%+%c".  After sending `\E=', this  pushes  the
+       first  parameter, pushes the ASCII value for a space (32),
+       adds them (pushing the sum on the stack in  place  of  the
+       two  previous  values) and outputs that value as a charac-
+       ter.  Then the same is  done  for  the  second  parameter.
        More complex arithmetic is possible using the stack.
 
-
    Cursor Motions
        If the terminal has a fast way to home the cursor (to very
-       upper  left  corner  of  screen) then this can be given as
-       home; similarly a fast way of getting to the  lower  left-
-       hand  corner can be given as ll; this may involve going up
-       with cuu1 from the home position,  but  a  program  should
-       never  do this itself (unless ll does) because it can make
-       no assumption about the effect of moving up from the  home
-       position.   Note  that  the  home  position is the same as
+       upper left corner of screen) then this  can  be  given  as
+       home;  similarly  a fast way of getting to the lower left-
+       hand corner can be given as ll; this may involve going  up
+       with  cuu1  from  the  home position, but a program should
+       never do this itself (unless ll does) because it can  make
+       no  assumption about the effect of moving up from the home
+       position.  Note that the home  position  is  the  same  as
        addressing to (0,0): to the top left corner of the screen,
-       not  of  memory.   (Thus, the \EH sequence on HP terminals
+       not of memory.  (Thus, the \EH sequence  on  HP  terminals
        cannot be used for home.)
 
        If the terminal has row or column absolute cursor address-
-       ing,  these  can be given as single parameter capabilities
+       ing, these can be given as single  parameter  capabilities
        hpa (horizontal position absolute) and vpa (vertical posi-
        tion absolute).  Sometimes these are shorter than the more
-       general two parameter sequence (as with  the  hp2645)  and
-       can   be   used  in  preference  to  cup.   If  there  are
-       parameterized local motions (e.g., move n  spaces  to  the
-       right) these can be given as cud, cub, cuf, and cuu with a
-       single parameter  indicating  how  many  spaces  to  move.
-       These  are  primarily useful if the terminal does not have
-       cup, such as the TEKTRONIX 4025.
+       general  two  parameter  sequence (as with the hp2645) and
+       can be used in preference to cup.  If there are parameter-
+       ized  local  motions  (e.g.,  move  n spaces to the right)
+       these can be given as cud, cub, cuf, and cuu with a single
+       parameter  indicating  how many spaces to move.  These are
+       primarily useful if the terminal does not have  cup,  such
+       as the TEKTRONIX 4025.
 
        If the terminal needs to be in a special mode when running
        a program that uses these capabilities, the codes to enter
-       and exit this mode can be given as smcup and rmcup.   This
-       arises,  for example, from terminals like the Concept with
-       more than one page of memory.  If the  terminal  has  only
-       memory  relative cursor addressing and not screen relative
+       and  exit this mode can be given as smcup and rmcup.  This
+       arises, for example, from terminals like the Concept  with
+       more  than  one  page of memory.  If the terminal has only
+       memory relative cursor addressing and not screen  relative
        cursor addressing, a one screen-sized window must be fixed
-       into  the terminal for cursor addressing to work properly.
+       into the terminal for cursor addressing to work  properly.
        This is also used for the TEKTRONIX 4025, where smcup sets
-       the  command character to be the one used by terminfo.  If
-       the smcup sequence will not restore the  screen  after  an
+       the command character to be the one used by terminfo.   If
+       the  smcup  sequence  will not restore the screen after an
        rmcup sequence is output (to the state prior to outputting
        rmcup), specify nrrmc.
 
-
    Area Clears
        If the terminal can clear from the current position to the
-       end  of  the  line,  leaving  the cursor where it is, this
+       end of the line, leaving the  cursor  where  it  is,  this
        should be given as el.  If the terminal can clear from the
-       beginning  of  the line to the current position inclusive,
-       leaving the cursor where it is, this should  be  given  as
-       el1.   If the terminal can clear from the current position
-       to the end of the display, then this should  be  given  as
-       ed.   Ed  is only defined from the first column of a line.
-       (Thus, it can be simulated by a request to delete a  large
+       beginning of the line to the current  position  inclusive,
+       leaving  the  cursor  where it is, this should be given as
+       el1.  If the terminal can clear from the current  position
+       to  the  end  of the display, then this should be given as
+       ed.  Ed is only defined from the first column of  a  line.
+       (Thus,  it can be simulated by a request to delete a large
        number of lines, if a true ed is not available.)
 
-
    Insert/delete line and vertical motions
-       If  the terminal can open a new blank line before the line
-       where the cursor is, this should be given as il1; this  is
-       done  only  from the first position of a line.  The cursor
+       If the terminal can open a new blank line before the  line
+       where  the cursor is, this should be given as il1; this is
+       done only from the first position of a line.   The  cursor
        must then appear on the newly blank line.  If the terminal
-       can  delete  the  line  which  the cursor is on, then this
-       should be given as dl1; this is done only from  the  first
-       position  on  the line to be deleted.  Versions of il1 and
-       dl1 which take a single parameter  and  insert  or  delete
+       can delete the line which the  cursor  is  on,  then  this
+       should  be  given as dl1; this is done only from the first
+       position on the line to be deleted.  Versions of  il1  and
+       dl1  which  take  a  single parameter and insert or delete
        that many lines can be given as il and dl.
 
-       If  the terminal has a settable scrolling region (like the
-       vt100) the command to set this can be described  with  the
-       csr  capability,  which  takes two parameters: the top and
+       If the terminal has a settable scrolling region (like  the
+       vt100)  the  command to set this can be described with the
+       csr capability, which takes two parameters:  the  top  and
        bottom lines of the scrolling region.  The cursor position
        is, alas, undefined after using this command.
 
-       It  is possible to get the effect of insert or delete line
+       It is possible to get the effect of insert or delete  line
        using csr on a properly chosen region; the sc and rc (save
-       and  restore  cursor)  commands may be useful for ensuring
-       that your synthesized insert/delete string does  not  move
-       the  cursor.  (Note that the ncurses(3x) library does this
-       synthesis  automatically,  so   you   need   not   compose
+       and restore cursor) commands may be  useful  for  ensuring
+       that  your  synthesized insert/delete string does not move
+       the cursor.  (Note that the ncurses(3x) library does  this
+       synthesis   automatically,   so   you   need  not  compose
        insert/delete strings for an entry with csr).
 
        Yet another way to construct insert and delete might be to
-       use a combination of index with  the  memory-lock  feature
-       found  on some terminals (like the HP-700/90 series, which
+       use  a  combination  of index with the memory-lock feature
+       found on some terminals (like the HP-700/90 series,  which
        however also has insert/delete).
 
-       Inserting lines at the top or bottom  of  the  screen  can
-       also  be  done using ri or ind on many terminals without a
-       true insert/delete line, and is often faster even on  ter-
+       Inserting  lines  at  the  top or bottom of the screen can
+       also be done using ri or ind on many terminals  without  a
+       true  insert/delete line, and is often faster even on ter-
        minals with those features.
 
-       The  boolean  non_dest_scroll_region should be set if each
-       scrolling window is effectively a view port on  a  screen-
-       sized  canvas.   To  test  for  this  capability, create a
-       scrolling region in the middle of the screen, write  some-
-       thing  to  the  bottom line, move the cursor to the top of
+       The boolean non_dest_scroll_region should be set  if  each
+       scrolling  window  is effectively a view port on a screen-
+       sized canvas.  To  test  for  this  capability,  create  a
+       scrolling  region in the middle of the screen, write some-
+       thing to the bottom line, move the cursor to  the  top  of
        the region, and do ri followed by dl1 or ind.  If the data
-       scrolled  off  the  bottom  of  the  region  by the ri re-
-       appears, then scrolling is non-destructive.  System V  and
-       XSI  Curses  expect that ind, ri, indn, and rin will simu-
-       late destructive scrolling; their  documentation  cautions
-       you  not  to  define csr unless this is true.  This curses
+       scrolled off the bottom  of  the  region  by  the  ri  re-
+       appears,  then scrolling is non-destructive.  System V and
+       XSI Curses expect that ind, ri, indn, and rin  will  simu-
+       late  destructive  scrolling; their documentation cautions
+       you not to define csr unless this is  true.   This  curses
        implementation is more liberal and will do explicit erases
        after scrolling if ndstr is defined.
 
        If the terminal has the ability to define a window as part
-       of memory, which all commands affect, it should  be  given
+       of  memory,  which all commands affect, it should be given
        as the parameterized string wind.  The four parameters are
-       the starting and ending lines in memory and  the  starting
+       the  starting  and ending lines in memory and the starting
        and ending columns in memory, in that order.
 
-       If  the terminal can retain display memory above, then the
-       da capability should be given; if display  memory  can  be
-       retained  below,  then db should be given.  These indicate
-       that deleting a line  or  scrolling  may  bring  non-blank
-       lines  up  from  below  or that scrolling back with ri may
+       If the terminal can retain display memory above, then  the
+       da  capability  should  be given; if display memory can be
+       retained below, then db should be given.   These  indicate
+       that  deleting  a  line  or  scrolling may bring non-blank
+       lines up from below or that scrolling  back  with  ri  may
        bring down non-blank lines.
 
-
    Insert/Delete Character
-       There are two basic kinds of  intelligent  terminals  with
-       respect  to insert/delete character which can be described
-       using terminfo.  The most common  insert/delete  character
-       operations  affect only the characters on the current line
-       and shift characters off the  end  of  the  line  rigidly.
-       Other  terminals,  such  as the Concept 100 and the Perkin
-       Elmer Owl, make a distinction between  typed  and  untyped
-       blanks  on  the  screen, shifting upon an insert or delete
-       only to an untyped blank on the  screen  which  is  either
-       eliminated,  or  expanded  to two untyped blanks.  You can
-       determine the kind of terminal you have  by  clearing  the
-       screen  and  then typing text separated by cursor motions.
-       Type "abc    def" using local cursor motions (not  spaces)
+       There  are  two  basic kinds of intelligent terminals with
+       respect to insert/delete character which can be  described
+       using  terminfo.   The most common insert/delete character
+       operations affect only the characters on the current  line
+       and  shift  characters  off  the  end of the line rigidly.
+       Other terminals, such as the Concept 100  and  the  Perkin
+       Elmer  Owl,  make  a distinction between typed and untyped
+       blanks on the screen, shifting upon an  insert  or  delete
+       only  to  an  untyped  blank on the screen which is either
+       eliminated, or expanded to two untyped  blanks.   You  can
+       determine  the  kind  of terminal you have by clearing the
+       screen and then typing text separated by  cursor  motions.
+       Type  "abc    def" using local cursor motions (not spaces)
        between the "abc" and the "def".  Then position the cursor
-       before the "abc" and put the terminal in insert mode.   If
-       typing  characters  causes  the  rest of the line to shift
+       before  the "abc" and put the terminal in insert mode.  If
+       typing characters causes the rest of  the  line  to  shift
        rigidly and characters to fall off the end, then your ter-
-       minal  does  not  distinguish  between  blanks and untyped
-       positions.  If the "abc" shifts over to  the  "def"  which
-       then  move together around the end of the current line and
-       onto the next as you insert, you have the second  type  of
-       terminal,  and should give the capability in, which stands
+       minal does not  distinguish  between  blanks  and  untyped
+       positions.   If  the  "abc" shifts over to the "def" which
+       then move together around the end of the current line  and
+       onto  the  next as you insert, you have the second type of
+       terminal, and should give the capability in, which  stands
        for "insert null".  While these are two logically separate
-       attributes  (one  line  versus multi-line insert mode, and
-       special treatment of untyped spaces) we have seen no  ter-
+       attributes (one line versus multi-line  insert  mode,  and
+       special  treatment of untyped spaces) we have seen no ter-
        minals whose insert mode cannot be described with the sin-
        gle attribute.
 
-       Terminfo can describe both terminals which have an  insert
+       Terminfo  can describe both terminals which have an insert
        mode, and terminals which send a simple sequence to open a
-       blank position on the current  line.   Give  as  smir  the
-       sequence  to  get  into  insert  mode.   Give  as rmir the
-       sequence to leave insert  mode.   Now  give  as  ich1  any
-       sequence  needed  to  be  sent  just  before  sending  the
-       character to be inserted.   Most  terminals  with  a  true
-       insert  mode  will  not  give ich1; terminals which send a
-       sequence to open a screen position should give it here.
-
-       If your terminal has both, insert mode is usually  prefer-
-       able  to  ich1.   Technically,  you  should  not give both
-       unless the terminal actually requires both to be  used  in
-       combination.   Accordingly,  some  non-curses applications
-       get confused if both are present; the symptom  is  doubled
+       blank  position  on  the  current  line.  Give as smir the
+       sequence to get  into  insert  mode.   Give  as  rmir  the
+       sequence  to  leave  insert  mode.   Now  give as ich1 any
+       sequence needed to be sent just before sending the charac-
+       ter  to  be  inserted.   Most terminals with a true insert
+       mode will not give ich1; terminals which send  a  sequence
+       to open a screen position should give it here.
+
+       If  your terminal has both, insert mode is usually prefer-
+       able to ich1.   Technically,  you  should  not  give  both
+       unless  the  terminal actually requires both to be used in
+       combination.  Accordingly,  some  non-curses  applications
+       get  confused  if both are present; the symptom is doubled
        characters in an update using insert.  This requirement is
        now rare; most ich sequences do not require previous smir,
        and most smir insert modes do not require ich1 before each
-       character.  Therefore, the  new  curses  actually  assumes
-       this  is the case and uses either rmir/smir or ich/ich1 as
+       character.   Therefore,  the  new  curses actually assumes
+       this is the case and uses either rmir/smir or ich/ich1  as
        appropriate (but not both).  If you have to write an entry
-       to  be  used under new curses for a terminal old enough to
+       to be used under new curses for a terminal old  enough  to
        need both, include the rmir/smir sequences in ich1.
 
        If post insert padding is needed, give this as a number of
-       milliseconds  in ip (a string option).  Any other sequence
-       which may need to be sent after  an  insert  of  a  single
+       milliseconds in ip (a string option).  Any other  sequence
+       which  may  need  to  be  sent after an insert of a single
        character may also be given in ip.  If your terminal needs
        both to be placed into an `insert mode' and a special code
-       to  precede  each  inserted character, then both smir/rmir
-       and ich1 can be given, and both will  be  used.   The  ich
+       to precede each inserted character,  then  both  smir/rmir
+       and  ich1  can  be  given, and both will be used.  The ich
        capability, with one parameter, n, will repeat the effects
        of ich1 n times.
 
        If padding is necessary between characters typed while not
-       in  insert  mode,  give  this  as a number of milliseconds
-       padding in rmp.
-
-       It is occasionally  necessary  to  move  around  while  in
-       insert  mode  to delete characters on the same line (e.g.,
-       if there is a tab after the insertion position).  If  your
-       terminal  allows  motion while in insert mode you can give
-       the capability mir to speed up  inserting  in  this  case.
-       Omitting  mir  will  affect  only  speed.   Some terminals
+       in insert mode, give this as a number of milliseconds pad-
+       ding in rmp.
+
+       It  is  occasionally  necessary  to  move  around while in
+       insert mode to delete characters on the same  line  (e.g.,
+       if  there is a tab after the insertion position).  If your
+       terminal allows motion while in insert mode you  can  give
+       the  capability  mir  to  speed up inserting in this case.
+       Omitting mir  will  affect  only  speed.   Some  terminals
        (notably Datamedia's) must not have mir because of the way
        their insert mode works.
 
-       Finally,  you  can specify dch1 to delete a single charac-
-       ter, dch with one parameter, n, to  delete  n  characters,
-       and  delete mode by giving smdc and rmdc to enter and exit
-       delete mode (any mode the terminal needs to be  placed  in
+       Finally, you can specify dch1 to delete a  single  charac-
+       ter,  dch  with  one parameter, n, to delete n characters,
+       and delete mode by giving smdc and rmdc to enter and  exit
+       delete  mode  (any mode the terminal needs to be placed in
        for dch1 to work).
 
-       A  command to erase n characters (equivalent to outputting
-       n blanks without moving the cursor) can be  given  as  ech
+       A command to erase n characters (equivalent to  outputting
+       n  blanks  without  moving the cursor) can be given as ech
        with one parameter.
 
-
    Highlighting, Underlining, and Visible Bells
        If  your  terminal  has  one  or  more  kinds  of  display
-       attributes, these can be represented in a number  of  dif-
+       attributes,  these  can be represented in a number of dif-
        ferent ways.  You should choose one display form as stand-
        out mode, representing a good, high contrast, easy-on-the-
-       eyes,  format  for  highlighting  error messages and other
-       attention getters.  (If you have a choice,  reverse  video
-       plus  half-bright  is  good, or reverse video alone.)  The
-       sequences to enter and exit standout  mode  are  given  as
-       smso  and  rmso, respectively.  If the code to change into
-       or out of standout mode  leaves  one  or  even  two  blank
-       spaces  on the screen, as the TVI 912 and Teleray 1061 do,
+       eyes, format for highlighting  error  messages  and  other
+       attention  getters.   (If you have a choice, reverse video
+       plus half-bright is good, or reverse  video  alone.)   The
+       sequences  to  enter  and  exit standout mode are given as
+       smso and rmso, respectively.  If the code to  change  into
+       or  out of standout mode leaves one or even two blank spa-
+       ces on the screen, as the TVI 912  and  Teleray  1061  do,
        then xmc should be given to tell how many spaces are left.
 
        Codes  to  begin  underlining  and  end underlining can be
@@ -1605,19 +1594,18 @@
 
        For example, the DEC vt220 supports most of the modes:
 
+        tparm parameter      attribute        escape sequence
 
-           tparm parameter   attribute    escape sequence
-
-           none              none         \E[0m
-           p1                standout     \E[0;1;7m
-           p2                underline    \E[0;4m
-           p3                reverse      \E[0;7m
-           p4                blink        \E[0;5m
-           p5                dim          not available
-           p6                bold         \E[0;1m
-           p7                invis        \E[0;8m
-           p8                protect      not used
-           p9                altcharset   ^O (off) ^N (on)
+        none                 none             \E[0m
+        p1                   standout         \E[0;1;7m
+        p2                   underline        \E[0;4m
+        p3                   reverse          \E[0;7m
+        p4                   blink            \E[0;5m
+        p5                   dim              not available
+        p6                   bold             \E[0;1m
+        p7                   invis            \E[0;8m
+        p8                   protect          not used
+        p9                   altcharset       ^O (off) ^N (on)
 
        We  begin each escape sequence by turning off any existing
        modes, since there is no quick way  to  determine  whether
@@ -1637,18 +1625,16 @@
        Writing out the above sequences, along with  their  depen-
        dencies yields
 
+      sequence             when to output      terminfo translation
 
-         sequence    when to output     terminfo translation
-
-         \E[0       always              \E[0
-         ;1         if p1 or p6         %?%p1%p6%|%t;1%;
-         ;4         if p2               %?%p2%|%t;4%;
-         ;5         if p4               %?%p4%|%t;5%;
-
-         ;7         if p1 or p3         %?%p1%p3%|%t;7%;
-         ;8         if p7               %?%p7%|%t;8%;
-         m          always              m
-         ^N or ^O   if p9 ^N, else ^O   %?%p9%t^N%e^O%;
+      \E[0                 always              \E[0
+      ;1                   if p1 or p6         %?%p1%p6%|%t;1%;
+      ;4                   if p2               %?%p2%|%t;4%;
+      ;5                   if p4               %?%p4%|%t;5%;
+      ;7                   if p1 or p3         %?%p1%p3%|%t;7%;
+      ;8                   if p7               %?%p7%|%t;8%;
+      m                    always              m
+      ^N or ^O             if p9 ^N, else ^O   %?%p9%t^N%e^O%;
 
        Putting this all together into the sgr sequence gives:
 
@@ -1695,7 +1681,6 @@
        erasable with a blank, then this should  be  indicated  by
        giving eo.
 
-
    Keypad and Function Keys
        If the terminal has a keypad that transmits codes when the
        keys are pressed, this information  can  be  given.   Note
@@ -1710,70 +1695,68 @@
        tion  keys  such  as f0, f1, ..., f10, the codes they send
        can be given as kf0, kf1, ..., kf10.  If these  keys  have
        labels  other  than the default f0 through f10, the labels
-       can  be  given  as  lf0,  lf1,  ...,  lf10.    The   codes
-       transmitted  by  certain  other special keys can be given:
-       kll (home down), kbs (backspace), ktbc (clear  all  tabs),
-       kctab  (clear  the  tab  stop in this column), kclr (clear
-       screen or  erase  key),  kdch1  (delete  character),  kdl1
-       (delete line), krmir (exit insert mode), kel (clear to end
-       of line), ked (clear to  end  of  screen),  kich1  (insert
-       character  or  enter insert mode), kil1 (insert line), knp
-       (next  page),  kpp  (previous  page),  kind  (scroll  for-
-       ward/down), kri (scroll backward/up), khts (set a tab stop
-       in this column).  In addition, if the keypad has a 3 by  3
-       array  of  keys  including  the four arrow keys, the other
-       five keys can be given as ka1, ka3,  kb2,  kc1,  and  kc3.
-       These  keys are useful when the effects of a 3 by 3 direc-
-       tional pad are needed.
-
-       Strings to program function keys can be  given  as  pfkey,
-       pfloc,  and pfx.  A string to program screen labels should
-       be specified as pln.  Each  of  these  strings  takes  two
-       parameters:  the function key number to program (from 0 to
-       10) and the string to program it with.  Function key  num-
-       bers  out  of  this  range may program undefined keys in a
-       terminal dependent manner.   The  difference  between  the
-       capabilities  is  that pfkey causes pressing the given key
-       to be the same as the user typing the given string;  pfloc
+       can be given as lf0, lf1, ..., lf10.  The codes  transmit-
+       ted  by certain other special keys can be given: kll (home
+       down), kbs  (backspace),  ktbc  (clear  all  tabs),  kctab
+       (clear the tab stop in this column), kclr (clear screen or
+       erase key), kdch1 (delete character), kdl1 (delete  line),
+       krmir  (exit insert mode), kel (clear to end of line), ked
+       (clear to end of screen), kich1 (insert character or enter
+       insert  mode),  kil1  (insert  line), knp (next page), kpp
+       (previous page), kind (scroll forward/down),  kri  (scroll
+       backward/up),  khts  (set  a tab stop in this column).  In
+       addition, if the keypad has a 3 by 3 array of keys includ-
+       ing  the four arrow keys, the other five keys can be given
+       as ka1, ka3, kb2, kc1, and kc3.   These  keys  are  useful
+       when the effects of a 3 by 3 directional pad are needed.
+
+       Strings  to  program  function keys can be given as pfkey,
+       pfloc, and pfx.  A string to program screen labels  should
+       be  specified  as  pln.   Each  of these strings takes two
+       parameters: the function key number to program (from 0  to
+       10)  and the string to program it with.  Function key num-
+       bers out of this range may program  undefined  keys  in  a
+       terminal  dependent  manner.   The  difference between the
+       capabilities is that pfkey causes pressing the  given  key
+       to  be the same as the user typing the given string; pfloc
        causes the string to be executed by the terminal in local;
-       and pfx causes the string to be transmitted  to  the  com-
+       and  pfx  causes  the string to be transmitted to the com-
        puter.
 
        The capabilities nlab, lw and lh define the number of pro-
-       grammable screen labels and their width  and  height.   If
-       there  are  commands  to  turn the labels on and off, give
-       them in smln and rmln.  smln is normally output after  one
+       grammable  screen  labels  and their width and height.  If
+       there are commands to turn the labels  on  and  off,  give
+       them  in smln and rmln.  smln is normally output after one
        or more pln sequences to make sure that the change becomes
        visible.
 
-
    Tabs and Initialization
-       If the terminal has hardware tabs, the command to  advance
-       to  the  next tab stop can be given as ht (usually control
-       I).  A ``back-tab'' command which moves  leftward  to  the
+       If  the terminal has hardware tabs, the command to advance
+       to the next tab stop can be given as ht  (usually  control
+       I).   A  ``back-tab''  command which moves leftward to the
        preceding tab stop can be given as cbt.  By convention, if
-       the teletype modes indicate that tabs are  being  expanded
-       by  the  computer  rather than being sent to the terminal,
-       programs should not  use  ht  or  cbt  even  if  they  are
-       present,  since  the user may not have the tab stops prop-
-       erly set.  If the terminal has  hardware  tabs  which  are
-       initially  set every n spaces when the terminal is powered
-       up, the numeric parameter it is given, showing the  number
-       of  spaces  the tabs are set to.  This is normally used by
-       the tset command to determine whether to set the mode  for
-       hardware  tab expansion, and whether to set the tab stops.
-       If the terminal has tab stops that can be  saved  in  non-
-       volatile  memory, the terminfo description can assume that
+       the  teletype  modes indicate that tabs are being expanded
+       by the computer rather than being sent  to  the  terminal,
+       programs  should  not  use  ht  or  cbt  even  if they are
+       present, since the user may not have the tab  stops  prop-
+       erly  set.   If  the  terminal has hardware tabs which are
+       initially set every n spaces when the terminal is  powered
+       up,  the numeric parameter it is given, showing the number
+       of spaces the tabs are set to.  This is normally  used  by
+       the  tset command to determine whether to set the mode for
+       hardware tab expansion, and whether to set the tab  stops.
+       If  the  terminal  has tab stops that can be saved in non-
+       volatile memory, the terminfo description can assume  that
        they are properly set.
 
-       Other capabilities include is1, is2, and is3,  initializa-
-       tion  strings  for the terminal, iprog, the path name of a
-       program to be run to initialize the terminal, and if,  the
-       name  of  a  file  containing long initialization strings.
-       These strings are expected to set the terminal into  modes
-       consistent  with  the  rest  of  the terminfo description.
+       Other  capabilities include is1, is2, and is3, initializa-
+       tion strings for the terminal, iprog, the path name  of  a
+       program  to be run to initialize the terminal, and if, the
+       name of a file  containing  long  initialization  strings.
+       These  strings are expected to set the terminal into modes
+       consistent with the  rest  of  the  terminfo  description.
        They are normally sent to the terminal, by the init option
-       of  the  tput  program,  each time the user logs in.  They
+       of the tput program, each time the  user  logs  in.   They
        will be printed in the following order:
 
               run the program
@@ -1793,101 +1776,99 @@
               and finally
                      output is3.
 
-       Most initialization is done with  is2.   Special  terminal
+       Most  initialization  is  done with is2.  Special terminal
        modes can be set up without duplicating strings by putting
-       the common sequences in is2 and special cases in  is1  and
+       the  common  sequences in is2 and special cases in is1 and
        is3.
 
        A set of sequences that does a harder reset from a totally
        unknown state can be given as rs1, rs2, rf and rs3, analo-
-       gous  to  is1  ,  is2  ,  if  and is3 respectively.  These
-       strings are output by the reset  program,  which  is  used
-       when  the terminal gets into a wedged state.  Commands are
-       normally placed in rs1, rs2 rs3 and rf only if  they  pro-
-       duce  annoying effects on the screen and are not necessary
-       when logging in.  For example,  the  command  to  set  the
-       vt100  into  80-column mode would normally be part of is2,
-       but it causes an annoying glitch of the screen and is  not
-       normally  needed  since the terminal is usually already in
+       gous to is1 ,  is2  ,  if  and  is3  respectively.   These
+       strings  are  output  by  the reset program, which is used
+       when the terminal gets into a wedged state.  Commands  are
+       normally  placed  in rs1, rs2 rs3 and rf only if they pro-
+       duce annoying effects on the screen and are not  necessary
+       when  logging  in.   For  example,  the command to set the
+       vt100 into 80-column mode would normally be part  of  is2,
+       but  it causes an annoying glitch of the screen and is not
+       normally needed since the terminal is usually  already  in
        80 column mode.
 
        The reset program writes strings including iprog, etc., in
-       the  same  order  as  the  init  program, using rs1, etc.,
+       the same order as  the  init  program,  using  rs1,  etc.,
        instead of is1, etc.  If any of rs1, rs2, rs3, or rf reset
-       capability  strings  are  missing, the reset program falls
+       capability strings are missing, the  reset  program  falls
        back  upon  the  corresponding  initialization  capability
        string.
 
        If there are commands to set and clear tab stops, they can
-       be given as tbc (clear all tab stops) and hts (set  a  tab
-       stop  in the current column of every row).  If a more com-
-       plex sequence is needed  to  set  the  tabs  than  can  be
-       described  by  this,  the sequence can be placed in is2 or
+       be  given  as tbc (clear all tab stops) and hts (set a tab
+       stop in the current column of every row).  If a more  com-
+       plex  sequence  is  needed  to  set  the  tabs than can be
+       described by this, the sequence can be placed  in  is2  or
        if.
 
    Delays and Padding
-       Many older and slower  terminals  do  not  support  either
+       Many  older  and  slower  terminals  do not support either
        XON/XOFF or DTR handshaking, including hard copy terminals
-       and some very archaic CRTs (including,  for  example,  DEC
-       VT100s).   These may require padding characters after cer-
+       and  some  very  archaic CRTs (including, for example, DEC
+       VT100s).  These may require padding characters after  cer-
        tain cursor motions and screen changes.
 
        If the terminal uses xon/xoff handshaking for flow control
-       (that  is, it automatically emits ^S back to the host when
+       (that is, it automatically emits ^S back to the host  when
        its input buffers are close to full), set xon.  This capa-
-       bility  suppresses  the emission of padding.  You can also
-       set it for memory-mapped console devices effectively  that
-       do  not  have  a  speed limit.  Padding information should
-       still be included so that routines can make  better  deci-
+       bility suppresses the emission of padding.  You  can  also
+       set  it for memory-mapped console devices effectively that
+       do not have a speed  limit.   Padding  information  should
+       still  be  included so that routines can make better deci-
        sions about relative costs, but actual pad characters will
        not be transmitted.
 
-       If pb (padding baud rate) is given, padding is  suppressed
-       at  baud rates below the value of pb.  If the entry has no
-       padding baud rate, then whether padding is emitted or  not
+       If  pb (padding baud rate) is given, padding is suppressed
+       at baud rates below the value of pb.  If the entry has  no
+       padding  baud rate, then whether padding is emitted or not
        is completely controlled by xon.
 
-       If  the terminal requires other than a null (zero) charac-
-       ter as a pad, then this can be given  as  pad.   Only  the
+       If the terminal requires other than a null (zero)  charac-
+       ter  as  a  pad,  then this can be given as pad.  Only the
        first character of the pad string is used.
 
-
    Status Lines
-       Some  terminals  have  an extra `status line' which is not
-       normally used by software (and thus  not  counted  in  the
+       Some terminals have an extra `status line'  which  is  not
+       normally  used  by  software  (and thus not counted in the
        terminal's lines capability).
 
-       The  simplest  case  is  a  status  line  which is cursor-
-       addressable but not part of the main scrolling  region  on
-       the  screen;  the  Heathkit  H19 has a status line of this
-       kind, as would a 24-line VT100 with  a  23-line  scrolling
-       region  set up on initialization.  This situation is indi-
+       The simplest case  is  a  status  line  which  is  cursor-
+       addressable  but  not part of the main scrolling region on
+       the screen; the Heathkit H19 has a  status  line  of  this
+       kind,  as  would  a 24-line VT100 with a 23-line scrolling
+       region set up on initialization.  This situation is  indi-
        cated by the hs capability.
 
        Some terminals with status lines need special sequences to
-       access  the  status  line.   These  may  be expressed as a
+       access the status line.   These  may  be  expressed  as  a
        string with single parameter tsl which takes the cursor to
-       a  given zero-origin column on the status line.  The capa-
+       a given zero-origin column on the status line.  The  capa-
        bility fsl must return to the main-screen cursor positions
-       before  the  last  tsl.   You may need to embed the string
-       values of sc (save cursor) and rc (restore cursor) in  tsl
+       before the last tsl.  You may need  to  embed  the  string
+       values  of sc (save cursor) and rc (restore cursor) in tsl
        and fsl to accomplish this.
 
-       The  status  line is normally assumed to be the same width
-       as the width of the terminal.  If this is untrue, you  can
+       The status line is normally assumed to be the  same  width
+       as  the width of the terminal.  If this is untrue, you can
        specify it with the numeric capability wsl.
 
-       A  command to erase or blank the status line may be speci-
+       A command to erase or blank the status line may be  speci-
        fied as dsl.
 
-       The  boolean  capability  eslok  specifies   that   escape
+       The   boolean   capability  eslok  specifies  that  escape
        sequences, tabs, etc., work ordinarily in the status line.
 
        The ncurses implementation does not yet use any  of  these
        capabilities.   They are documented here in case they ever
        become important.
 
-
    Line Graphics
        Many terminals have alternate character  sets  useful  for
        forms-drawing.   Terminfo  and curses build in support for
@@ -1895,42 +1876,41 @@
        characters  from  the  AT&T  4410v1 added.  This alternate
        character set may be specified by the acsc capability.
 
-
-                Glyph             ACS            Ascii      VT100
-                 Name             Name           Default    Name
-       UK pound sign              ACS_STERLING   f          }
-       arrow pointing down        ACS_DARROW     v          .
-       arrow pointing left        ACS_LARROW     <          ,
-       arrow pointing right       ACS_RARROW     >          +
-       arrow pointing up          ACS_UARROW     ^          -
-       board of squares           ACS_BOARD      #          h
-       bullet                     ACS_BULLET     o          ~
-       checker board (stipple)    ACS_CKBOARD    :          a
-       degree symbol              ACS_DEGREE     \          f
-       diamond                    ACS_DIAMOND    +          `
-       greater-than-or-equal-to   ACS_GEQUAL     >          z
-       greek pi                   ACS_PI         *          {
-       horizontal line            ACS_HLINE      -          q
-       lantern symbol             ACS_LANTERN    #          i
-       large plus or crossover    ACS_PLUS       +          n
-       less-than-or-equal-to      ACS_LEQUAL     <          y
-
-       lower left corner          ACS_LLCORNER   +          m
-       lower right corner         ACS_LRCORNER   +          j
-       not-equal                  ACS_NEQUAL     !          |
-       plus/minus                 ACS_PLMINUS    #          g
-       scan line 1                ACS_S1         ~          o
-       scan line 3                ACS_S3         -          p
-       scan line 7                ACS_S7         -          r
-       scan line 9                ACS_S9         _          s
-       solid square block         ACS_BLOCK      #          0
-       tee pointing down          ACS_TTEE       +          w
-       tee pointing left          ACS_RTEE       +          u
-       tee pointing right         ACS_LTEE       +          t
-       tee pointing up            ACS_BTEE       +          v
-       upper left corner          ACS_ULCORNER   +          l
-       upper right corner         ACS_URCORNER   +          k
-       vertical line              ACS_VLINE      |          x
+       Glyph                       ACS           Ascii     VT100
+       Name                        Name          Default   Name
+       UK pound sign               ACS_STERLING  f         }
+       arrow pointing down         ACS_DARROW    v         .
+       arrow pointing left         ACS_LARROW    <         ,
+       arrow pointing right        ACS_RARROW    >         +
+       arrow pointing up           ACS_UARROW    ^         -
+       board of squares            ACS_BOARD     #         h
+       bullet                      ACS_BULLET    o         ~
+       checker board (stipple)     ACS_CKBOARD   :         a
+       degree symbol               ACS_DEGREE    \         f
+       diamond                     ACS_DIAMOND   +         `
+       greater-than-or-equal-to    ACS_GEQUAL    >         z
+       greek pi                    ACS_PI        *         {
+       horizontal line             ACS_HLINE     -         q
+       lantern symbol              ACS_LANTERN   #         i
+       large plus or crossover     ACS_PLUS      +         n
+       less-than-or-equal-to       ACS_LEQUAL    <         y
+       lower left corner           ACS_LLCORNER  +         m
+       lower right corner          ACS_LRCORNER  +         j
+       not-equal                   ACS_NEQUAL    !         |
+       plus/minus                  ACS_PLMINUS   #         g
+       scan line 1                 ACS_S1        ~         o
+       scan line 3                 ACS_S3        -         p
+       scan line 7                 ACS_S7        -         r
+       scan line 9                 ACS_S9        _         s
+       solid square block          ACS_BLOCK     #         0
+       tee pointing down           ACS_TTEE      +         w
+       tee pointing left           ACS_RTEE      +         u
+       tee pointing right          ACS_LTEE      +         t
+       tee pointing up             ACS_BTEE      +         v
+       upper left corner           ACS_ULCORNER  +         l
+
+       upper right corner          ACS_URCORNER  +         k
+       vertical line               ACS_VLINE     |         x
 
        The best way to define a new device's graphics set  is  to
        add  a  column  to a copy of this table for your terminal,
@@ -1940,7 +1920,6 @@
        acter  pairs  right  to left in sequence; these become the
        ACSC string.
 
-
    Color Handling
        Most color terminals are either `Tektronix-like'  or  `HP-
        like'.   Tektronix-like terminals have a predefined set of
@@ -1986,7 +1965,6 @@
        these  as  it  likes,  but  the RGB values indicate normal
        locations in color space.
 
-
              Color       #define       Value       RGB
              black     COLOR_BLACK       0     0, 0, 0
              red       COLOR_RED         1     max,0,0
@@ -2038,17 +2016,16 @@
        ors  are  enabled.  The correspondence with the attributes
        understood by curses is as follows:
 
-
-                      Attribute      Bit   Decimal
-                      A_STANDOUT     0     1
-                      A_UNDERLINE    1     2
-                      A_REVERSE      2     4
-                      A_BLINK        3     8
-                      A_DIM          4     16
-                      A_BOLD         5     32
-                      A_INVIS        6     64
-                      A_PROTECT      7     128
-                      A_ALTCHARSET   8     256
+              Attribute                   Bit    Decimal
+              A_STANDOUT                  0     1
+              A_UNDERLINE                 1     2
+              A_REVERSE                   2     4
+              A_BLINK                     3     8
+              A_DIM                       4     16
+              A_BOLD                      5     32
+              A_INVIS                     6     64
+              A_PROTECT                   7     128
+              A_ALTCHARSET                8     256
 
        For example,  on  many  IBM  PC  consoles,  the  underline
        attribute  collides  with the foreground color blue and is
@@ -2058,7 +2035,6 @@
        SVr4  curses  does nothing with ncv, ncurses recognizes it
        and optimizes the output in favor of colors.
 
-
    Miscellaneous
        If the terminal requires other than a null (zero)  charac-
        ter  as  a  pad,  then this can be given as pad.  Only the
@@ -2132,7 +2108,6 @@
        text,  including  mc4,  is  transparently  passed  to  the
        printer while an mc5p is in effect.
 
-
    Glitches and Braindamage
        Hazeltine terminals, which do not allow `~' characters  to
        be displayed should indicate hz.
@@ -2140,209 +2115,207 @@
        Terminals which ignore a line-feed immediately after an am
        wrap, such as the Concept and vt100, should indicate xenl.
 
-       If  el  is  required  to  get  rid of standout (instead of
-       merely writing normal text on top of it),  xhp  should  be
+       If el is required to  get  rid  of  standout  (instead  of
+       merely  writing  normal  text on top of it), xhp should be
        given.
 
-       Teleray  terminals,  where  tabs turn all characters moved
-       over to blanks, should  indicate  xt  (destructive  tabs).
-       Note:    the    variable    indicating    this    is   now
-       `dest_tabs_magic_smso'; in older  versions,  it  was  tel-
+       Teleray terminals, where tabs turn  all  characters  moved
+       over  to  blanks,  should  indicate xt (destructive tabs).
+       Note:   the    variable    indicating    this    is    now
+       `dest_tabs_magic_smso';  in  older  versions,  it was tel-
        eray_glitch.  This glitch is also taken to mean that it is
-       not possible to position the cursor on top  of  a  ``magic
+       not  possible  to  position the cursor on top of a ``magic
        cookie'', that to erase standout mode it is instead neces-
        sary to use delete and insert line.  The ncurses implemen-
        tation ignores this glitch.
 
-       The  Beehive Superbee, which is unable to correctly trans-
-       mit the escape or control C characters, has xsb,  indicat-
-       ing  that the f1 key is used for escape and f2 for control
-       C.  (Only certain Superbees have this  problem,  depending
-       on  the  ROM.)  Note that in older terminfo versions, this
-       capability  was  called  `beehive_glitch';   it   is   now
+       The Beehive Superbee, which is unable to correctly  trans-
+       mit  the escape or control C characters, has xsb, indicat-
+       ing that the f1 key is used for escape and f2 for  control
+       C.   (Only  certain Superbees have this problem, depending
+       on the ROM.)  Note that in older terminfo  versions,  this
+       capability   was   called   `beehive_glitch';  it  is  now
        `no_esc_ctl_c'.
 
-       Other  specific  terminal  problems  may  be  corrected by
+       Other specific  terminal  problems  may  be  corrected  by
        adding more capabilities of the form xx.
 
-
    Similar Terminals
        If there are two very similar terminals, one (the variant)
-       can  be  defined  as  being just like the other (the base)
-       with certain exceptions.  In the definition of  the  vari-
-       ant,  the string capability use can be given with the name
-       of the base terminal.  The capabilities given  before  use
-       override  those  in  the base type named by use.  If there
-       are multiple use capabilities, they are merged in  reverse
-       order.   That is, the rightmost use reference is processed
-       first, then the one to its left, and so forth.   Capabili-
-       ties  given explicitly in the entry override those brought
+       can be defined as being just like  the  other  (the  base)
+       with  certain  exceptions.  In the definition of the vari-
+       ant, the string capability use can be given with the  name
+       of  the  base terminal.  The capabilities given before use
+       override those in the base type named by  use.   If  there
+       are  multiple use capabilities, they are merged in reverse
+       order.  That is, the rightmost use reference is  processed
+       first,  then the one to its left, and so forth.  Capabili-
+       ties given explicitly in the entry override those  brought
        in by use references.
 
        A capability can be canceled by placing xx@ to the left of
-       the  use  reference that imports it, where xx is the capa-
+       the use reference that imports it, where xx is  the  capa-
        bility.  For example, the entry
 
-                   2621-nl, smkx@, rmkx@, use=2621,
+                                2621-nl, smkx@, rmkx@, use=2621,
 
-       defines a 2621-nl that does not  have  the  smkx  or  rmkx
-       capabilities,  and hence does not turn on the function key
-       labels when in visual mode.  This is useful for  different
+       defines  a  2621-nl  that  does  not have the smkx or rmkx
+       capabilities, and hence does not turn on the function  key
+       labels  when in visual mode.  This is useful for different
        modes for a terminal, or for different user preferences.
 
-
    Pitfalls of Long Entries
-       Long  terminfo  entries  are  unlikely to be a problem; to
-       date, no entry has even  approached  terminfo's  4096-byte
+       Long terminfo entries are unlikely to  be  a  problem;  to
+       date,  no  entry  has even approached terminfo's 4096-byte
        string-table maximum.  Unfortunately, the termcap transla-
        tions are much more strictly limited (to 1023 bytes), thus
-       termcap  translations  of  long terminfo entries can cause
+       termcap translations of long terminfo  entries  can  cause
        problems.
 
-       The man pages for 4.3BSD and older versions  of  tgetent()
-       instruct  the  user to allocate a 1024-byte buffer for the
-       termcap entry.  The  entry  gets  null-terminated  by  the
+       The  man  pages for 4.3BSD and older versions of tgetent()
+       instruct the user to allocate a 1024-byte buffer  for  the
+       termcap  entry.   The  entry  gets  null-terminated by the
        termcap library, so that makes the maximum safe length for
-       a termcap entry 1k-1 (1023) bytes.  Depending on what  the
-       application  and  the termcap library being used does, and
+       a  termcap entry 1k-1 (1023) bytes.  Depending on what the
+       application and the termcap library being used  does,  and
        where in the termcap file the terminal type that tgetent()
        is searching for is, several bad things can happen.
 
-       Some  termcap libraries print a warning message or exit if
-       they find an entry that's longer than 1023  bytes;  others
-       do  not;  others truncate the entries to 1023 bytes.  Some
+       Some termcap libraries print a warning message or exit  if
+       they  find  an entry that's longer than 1023 bytes; others
+       do not; others truncate the entries to 1023  bytes.   Some
        application programs allocate more than the recommended 1K
        for the termcap entry; others do not.
 
        Each termcap entry has two important sizes associated with
        it: before "tc" expansion, and after "tc" expansion.  "tc"
-       is  the  capability that tacks on another termcap entry to
-       the end of the current one, to add  on  its  capabilities.
-       If  a termcap entry does not use the "tc" capability, then
+       is the capability that tacks on another termcap  entry  to
+       the  end  of  the current one, to add on its capabilities.
+       If a termcap entry does not use the "tc" capability,  then
        of course the two lengths are the same.
 
-       The "before tc expansion" length  is  the  most  important
-       one,  because it affects more than just users of that par-
-       ticular terminal.  This is the length of the entry  as  it
+       The  "before  tc  expansion"  length is the most important
+       one, because it affects more than just users of that  par-
+       ticular  terminal.   This is the length of the entry as it
        exists in /etc/termcap, minus the backslash-newline pairs,
        which tgetent() strips out while reading it.  Some termcap
-       libraries  strip  off  the final newline, too (GNU termcap
+       libraries strip off the final newline,  too  (GNU  termcap
        does not).  Now suppose:
 
-       *    a termcap entry before expansion is  more  than  1023
+       *    a  termcap  entry  before expansion is more than 1023
             bytes long,
 
        *    and the application has only allocated a 1k buffer,
 
-       *    and  the  termcap library (like the one in BSD/OS 1.1
-            and GNU) reads the whole entry into  the  buffer,  no
-            matter  what its length, to see if it is the entry it
+       *    and the termcap library (like the one in  BSD/OS  1.1
+            and  GNU)  reads  the whole entry into the buffer, no
+            matter what its length, to see if it is the entry  it
             wants,
 
-       *    and tgetent() is searching for a terminal  type  that
+       *    and  tgetent()  is searching for a terminal type that
             either is the long entry, appears in the termcap file
-            after the long entry, or does not appear in the  file
-            at  all  (so  that  tgetent() has to search the whole
+            after  the long entry, or does not appear in the file
+            at all (so that tgetent() has  to  search  the  whole
             termcap file).
 
-       Then tgetent() will overwrite memory, perhaps  its  stack,
-       and  probably core dump the program.  Programs like telnet
-       are particularly vulnerable;  modern  telnets  pass  along
-       values  like the terminal type automatically.  The results
-       are almost as undesirable with  a  termcap  library,  like
-       SunOS  4.1.3  and Ultrix 4.4, that prints warning messages
-       when it reads an overly long termcap entry.  If a  termcap
-       library  truncates  long  entries,  like  OSF/1 3.0, it is
-       immune to dying here but will return  incorrect  data  for
+       Then  tgetent()  will overwrite memory, perhaps its stack,
+       and probably core dump the program.  Programs like  telnet
+       are  particularly  vulnerable;  modern  telnets pass along
+       values like the terminal type automatically.  The  results
+       are  almost  as  undesirable  with a termcap library, like
+       SunOS 4.1.3 and Ultrix 4.4, that prints  warning  messages
+       when  it reads an overly long termcap entry.  If a termcap
+       library truncates long entries,  like  OSF/1  3.0,  it  is
+       immune  to  dying  here but will return incorrect data for
        the terminal.
 
        The "after tc expansion" length will have a similar effect
        to the above, but only for people who actually set TERM to
-       that  terminal type, since tgetent() only does "tc" expan-
-       sion once it is found the terminal  type  it  was  looking
+       that terminal type, since tgetent() only does "tc"  expan-
+       sion  once  it  is  found the terminal type it was looking
        for, not while searching.
 
        In summary, a termcap entry that is longer than 1023 bytes
-       can cause, on various combinations  of  termcap  libraries
-       and  applications,  a  core  dump,  warnings, or incorrect
-       operation.  If it is too long even before "tc"  expansion,
+       can  cause,  on  various combinations of termcap libraries
+       and applications, a  core  dump,  warnings,  or  incorrect
+       operation.   If it is too long even before "tc" expansion,
        it will have this effect even for users of some other ter-
-       minal types and users whose TERM variable does not have  a
+       minal  types and users whose TERM variable does not have a
        termcap entry.
 
        When in -C (translate to termcap) mode, the ncurses imple-
        mentation of tic(1m) issues warning messages when the pre-
-       tc  length  of  a termcap translation is too long.  The -c
-       (check) option also checks resolved (after  tc  expansion)
+       tc length of a termcap translation is too  long.   The  -c
+       (check)  option  also checks resolved (after tc expansion)
        lengths.
 
    Binary Compatibility
-       It  is not wise to count on portability of binary terminfo
-       entries between commercial UNIX versions.  The problem  is
-       that  there  are  at least two versions of terminfo (under
+       It is not wise to count on portability of binary  terminfo
+       entries  between commercial UNIX versions.  The problem is
+       that there are at least two versions  of  terminfo  (under
        HP-UX and AIX) which diverged from System V terminfo after
-       SVr1,  and have added extension capabilities to the string
-       table that (in the binary format) collide  with  System  V
+       SVr1, and have added extension capabilities to the  string
+       table  that  (in  the binary format) collide with System V
        and XSI Curses extensions.
 
 
 
    
 
    EXTENSIONS
    -       Some  SVr4  curses  implementations,  and  all previous to
-       SVr4, do not interpret the %A and %O operators in  parame-
+       Some SVr4 curses  implementations,  and  all  previous  to
+       SVr4,  do not interpret the %A and %O operators in parame-
        ter strings.
 
-       SVr4/XPG4  do  not  specify whether msgr licenses movement
-       while in an alternate-character-set mode (such modes  may,
-       among  other  things,  map CR and NL to characters that do
-       not trigger local motions).   The  ncurses  implementation
-       ignores  msgr  in ALTCHARSET mode.  This raises the possi-
-       bility that an XPG4  implementation  making  the  opposite
-       interpretation  may need terminfo entries made for ncurses
+       SVr4/XPG4 do not specify whether  msgr  licenses  movement
+       while  in an alternate-character-set mode (such modes may,
+       among other things, map CR and NL to  characters  that  do
+       not  trigger  local  motions).  The ncurses implementation
+       ignores msgr in ALTCHARSET mode.  This raises  the  possi-
+       bility  that  an  XPG4  implementation making the opposite
+       interpretation may need terminfo entries made for  ncurses
        to have msgr turned off.
 
-       The ncurses library handles insert-character  and  insert-
+       The  ncurses  library handles insert-character and insert-
        character modes in a slightly non-standard way to get bet-
-       ter update efficiency.  See  the  Insert/Delete  Character
+       ter  update  efficiency.   See the Insert/Delete Character
        subsection above.
 
-       The   parameter   substitutions  for  set_clock  and  dis-
-       play_clock are not documented in SVr4 or  the  XSI  Curses
+       The  parameter  substitutions  for  set_clock   and   dis-
+       play_clock  are  not  documented in SVr4 or the XSI Curses
        standard.  They are deduced from the documentation for the
        AT&T 505 terminal.
 
-       Be careful assigning the kmous  capability.   The  ncurses
-       wants  to  interpret it as KEY_MOUSE, for use by terminals
-       and emulators like xterm that  can  return  mouse-tracking
+       Be  careful  assigning  the kmous capability.  The ncurses
+       wants to interpret it as KEY_MOUSE, for use  by  terminals
+       and  emulators  like  xterm that can return mouse-tracking
        information in the keyboard-input stream.
 
-       Different  commercial ports of terminfo and curses support
-       different subsets of the XSI Curses standard and (in  some
+       Different commercial ports of terminfo and curses  support
+       different  subsets of the XSI Curses standard and (in some
        cases) different extension sets.  Here is a summary, accu-
        rate as of October 1995:
 
        SVR4, Solaris, ncurses -- These support all SVr4 capabili-
        ties.
 
-       SGI  --  Supports  the  SVr4  set,  adds  one undocumented
+       SGI --  Supports  the  SVr4  set,  adds  one  undocumented
        extended string capability (set_pglen).
 
-       SVr1, Ultrix -- These support a restricted subset of  ter-
-       minfo  capabilities.   The booleans end with xon_xoff; the
-       numerics with  width_status_line;  and  the  strings  with
+       SVr1,  Ultrix -- These support a restricted subset of ter-
+       minfo capabilities.  The booleans end with  xon_xoff;  the
+       numerics  with  width_status_line;  and  the  strings with
        prtr_non.
 
-       HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234]
+       HP/UX -- Supports  the  SVr1  subset,  plus  the  SVr[234]
        numerics num_labels, label_height, label_width, plus func-
-       tion  keys  11  through  63, plus plab_norm, label_on, and
+       tion keys 11 through 63,  plus  plab_norm,  label_on,  and
        label_off, plus some incompatible extensions in the string
        table.
 
-       AIX  --  Supports  the  SVr1 subset, plus function keys 11
-       through 63, plus a number  of  incompatible  string  table
+       AIX -- Supports the SVr1 subset,  plus  function  keys  11
+       through  63,  plus  a  number of incompatible string table
        extensions.
 
-       OSF  -- Supports both the SVr4 set and the AIX extensions.
+       OSF -- Supports both the SVr4 set and the AIX extensions.
 
 
 
    
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index b3103ad9..742160ed 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -160,11 +160,11 @@
 
        -r     Force entry resolution (so there are  no  remaining
               tc  capabilities)  even  when  doing translation to
-              termcap format.  This may  be  needed  if  you  are
-              preparing  a  termcap  file  for  a termcap library
-              (such as GNU termcap through  version  1.3  or  BSD
-              termcap through 4.3BSD) that does not handle multi-
-              ple tc capabilities per entry.
+              termcap format.  This may be needed if you are pre-
+              paring  a  termcap file for a termcap library (such
+              as GNU termcap through version 1.3 or  BSD  termcap
+              through  4.3BSD)  that  does not handle multiple tc
+              capabilities per entry.
 
        -s     Summarize the compile by showing the directory into
               which  entries  are  written,  and  the  number  of
@@ -228,45 +228,45 @@
        9      All values computed in construction of the hash ta-
               ble
 
-       If the debug level n is not given, it is taken to be  one.
+       If the debug level n is not given, it is taken to be one.
 
        All but one of the capabilities recognized by tic are doc-
        umented in terminfo(5).  The exception is the use capabil-
        ity.
 
-       When  a  use=entry-name  field is discovered in a terminal
-       entry currently being compiled, tic reads  in  the  binary
-       from  /usr/share/terminfo to complete the entry.  (Entries
-       created from file will be used first.  If the  environment
-       variable  TERMINFO  is  set,  that  directory  is searched
+       When a use=entry-name field is discovered  in  a  terminal
+       entry  currently  being  compiled, tic reads in the binary
+       from /usr/share/terminfo to complete the entry.   (Entries
+       created  from file will be used first.  If the environment
+       variable TERMINFO  is  set,  that  directory  is  searched
        instead of /usr/share/terminfo.)  tic duplicates the capa-
-       bilities  in  entry-name  for  the current entry, with the
-       exception  of  those  capabilities  that  explicitly   are
+       bilities in entry-name for the  current  entry,  with  the
+       exception   of  those  capabilities  that  explicitly  are
        defined in the current entry.
 
-       When    an   entry,   e.g.,   entry_name_1,   contains   a
-       use=entry_name_2  field,  any  canceled  capabilities   in
-       entry_name_2  must also appear in entry_name_1 before use=
+       When   an   entry,   e.g.,   entry_name_1,   contains    a
+       use=entry_name_2   field,  any  canceled  capabilities  in
+       entry_name_2 must also appear in entry_name_1 before  use=
        for these capabilities to be canceled in entry_name_1.
 
-       If the environment variable TERMINFO is set, the  compiled
+       If  the environment variable TERMINFO is set, the compiled
        results are placed there instead of /usr/share/terminfo.
 
        Total compiled entries cannot exceed 4096 bytes.  The name
-       field cannot exceed 512 bytes.  Terminal  names  exceeding
-       the  maximum  alias  length (32 characters on systems with
+       field  cannot  exceed 512 bytes.  Terminal names exceeding
+       the maximum alias length (32 characters  on  systems  with
        long filenames, 14 characters otherwise) will be truncated
-       to  the maximum alias length and a warning message will be
+       to the maximum alias length and a warning message will  be
        printed.

    COMPATIBILITY

    -       There is some evidence that historic  tic  implementations
-       treated  description  fields with no whitespace in them as
-       additional aliases or short names.  This tic does  not  do
-       that,  but  it  does  warn  when description fields may be
-       treated that way and check them for dangerous  characters.
+       There  is  some evidence that historic tic implementations
+       treated description fields with no whitespace in  them  as
+       additional  aliases  or short names.  This tic does not do
+       that, but it does warn  when  description  fields  may  be
+       treated that way and check them for dangerous characters.
    @@ -309,7 +309,7 @@ infocmp(1m), captoinfo(1m), infotocap(1m), toe(1m), curses(3x), terminfo(5). - This describes ncurses version 5.6 (patch 20081011). + This describes ncurses version 5.7 (patch 20100109). diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html index 7f4372fc..a44e91f6 100644 --- a/doc/html/man/toe.1m.html +++ b/doc/html/man/toe.1m.html @@ -111,7 +111,7 @@ tic(1m), infocmp(1m), captoinfo(1m), infotocap(1m), curses(3x), terminfo(5). - This describes ncurses version 5.6 (patch 20081011). + This describes ncurses version 5.7 (patch 20100109). diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html index 2d31aa55..d380a282 100644 --- a/doc/html/man/tput.1.html +++ b/doc/html/man/tput.1.html @@ -99,8 +99,8 @@ be queried for the actual screen size. capname - indicates the capability from the terminfo - database. When termcap support is compiled in, the + indicates the capability from the terminfo data- + base. When termcap support is compiled in, the termcap name for the capability is also accepted. parms If the capability is a string that takes parame- @@ -112,8 +112,8 @@ table to decide which to pass as strings. Normally tput uses tparm (3x) to perform the substitution. If no parameters are given for the capability, tput - writes the string without performing the - substitution. + writes the string without performing the substitu- + tion. -S allows more than one capability per invocation of tput. The capabilities must be passed to tput from @@ -204,16 +204,16 @@ bold=`tputsmso`offbold=`tputrmso` Set the shell variables bold, to begin stand-out mode sequence, and offbold, to end standout mode sequence, - for the current terminal. This might be followed by - a prompt: echo"${bold}Pleasetypeinyourname: + for the current terminal. This might be followed by + a prompt: echo"${bold}Pleasetypeinyourname:${offbold}\c"tputhc - Set exit code to indicate if the current terminal is + Set exit code to indicate if the current terminal is a hard copy terminal. tputcup234 - Send the sequence to move the cursor to row 23, col- + Send the sequence to move the cursor to row 23, col- umn 4. tputcup @@ -221,8 +221,8 @@ parameters substituted. tputlongname - Print the long name from the terminfo database for - the type of terminal specified in the environmental + Print the long name from the terminfo database for + the type of terminal specified in the environmental variable TERM. tput-S<<! @@ -231,10 +231,10 @@ >bold>! - This example shows tput processing several capabili- - ties in one invocation. It clears the screen, moves - the cursor to position 10, 10 and turns on bold - (extra bright) mode. The list is terminated by an + This example shows tput processing several capabili- + ties in one invocation. It clears the screen, moves + the cursor to position 10, 10 and turns on bold + (extra bright) mode. The list is terminated by an exclamation mark (!) on a line by itself. @@ -245,8 +245,8 @@ /usr/share/tabset/* tab settings for some terminals, in a format appro- - priate to be output to the terminal (escape - sequences that set margins and tabs); for more + priate to be output to the terminal (escape + sequences that set margins and tabs); for more information, see the "Tabs and Initialization" sec- tion of terminfo(5) @@ -254,16 +254,16 @@

    EXIT CODES

            If the -S option is used, tput checks for errors from each
-       line, and if any errors are found, will set the exit  code
-       to  4  plus the number of lines with errors.  If no errors
-       are found, the exit code is 0.   No  indication  of  which
+       line,  and if any errors are found, will set the exit code
+       to 4 plus the number of lines with errors.  If  no  errors
+       are  found,  the  exit  code is 0.  No indication of which
        line failed can be given so exit code 1 will never appear.
-       Exit codes 2, 3, and 4 retain their usual  interpretation.
+       Exit  codes 2, 3, and 4 retain their usual interpretation.
        If the -S option is not used, the exit code depends on the
        type of capname:
 
             boolean
-                   a value of 0 is set for TRUE and 1 for  FALSE.
+                   a value of 0 is set for TRUE and 1 for FALSE.
 
             string a  value of 0 is set if the capname is defined
                    for this terminal type (the value  of  capname
@@ -294,7 +294,6 @@
        tput prints the following error messages and sets the cor-
        responding exit codes.
 
-
        exit code   error message
        ---------------------------------------------------------------------
        0           (capname is a numeric variable that is not specified  in
@@ -318,9 +317,9 @@
        reset.   In this implementation, clear is part of the cap-
        name support.  Other implementations of tput on SVr4-based
        systems such as Solaris, IRIX64 and HPUX as well as others
-       such  as  AIX  and  Tru64  provide  support  for   capname
-       operands.  A few platforms such as FreeBSD and NetBSD rec-
-       ognize termcap names rather than terminfo capability names
+       such as AIX and Tru64 provide support  for  capname  oper-
+       ands.   A  few platforms such as FreeBSD and NetBSD recog-
+       nize termcap names rather than terminfo  capability  names
        in their respective tput commands.
 
 
@@ -328,7 +327,7 @@
 
    SEE ALSO
            clear(1), stty(1), tabs(1), terminfo(5).
 
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 951fd0cb..d83511dd 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -70,9 +70,9 @@
 
        3.  (BSD  systems only.) The terminal type associated with
        the standard error output device in  the  /etc/ttys  file.
-       (On Linux and System-V-like UNIXes, getty does this job by
-       setting TERM  according  to  the  type  passed  to  it  by
-       /etc/inittab.)
+       (On  System-V-like  UNIXes  and systems using that conven-
+       tion, getty does this job by setting TERM according to the
+       type passed to it by /etc/inittab.)
 
        4. The default terminal type, ``unknown''.
 
@@ -141,9 +141,9 @@
 
        -r   Print the terminal type to the standard error output.
 
-       -s   Print  the  sequence  of shell commands to initialize
+       -s   Print the sequence of shell  commands  to  initialize
             the environment variable TERM to the standard output.
-            See  the section SETTING THE ENVIRONMENT for details.
+            See the section SETTING THE ENVIRONMENT for details.
 
        -V   reports the version of ncurses which was used in this
             program, and exits.
@@ -159,17 +159,17 @@
 
 
    
 
    SETTING THE ENVIRONMENT
    -       It is often desirable  to  enter  the  terminal  type  and
-       information  about  the  terminal's  capabilities into the
+       It  is  often  desirable  to  enter  the terminal type and
+       information about the  terminal's  capabilities  into  the
        shell's environment.  This is done using the -s option.
 
        When the -s option is specified, the commands to enter the
-       information  into  the  shell's environment are written to
-       the standard output.  If the SHELL environmental  variable
+       information into the shell's environment  are  written  to
+       the  standard output.  If the SHELL environmental variable
        ends in ``csh'', the commands are for csh, otherwise, they
-       are for sh.  Note, the csh  commands  set  and  unset  the
-       shell  variable  noglob,  leaving it unset.  The following
-       line in the .login or .profile files will  initialize  the
+       are  for  sh.   Note,  the  csh commands set and unset the
+       shell variable noglob, leaving it  unset.   The  following
+       line  in  the .login or .profile files will initialize the
        environment correctly:
 
            eval `tset -s options ... `
@@ -179,107 +179,107 @@
 
    TERMINAL TYPE MAPPING
            When the terminal is not hardwired into the system (or the
        current system information is incorrect) the terminal type
-       derived  from the /etc/ttys file or the TERM environmental
-       variable is often something generic like network,  dialup,
-       or  unknown.   When tset is used in a startup script it is
-       often desirable to provide information about the  type  of
+       derived from the /etc/ttys file or the TERM  environmental
+       variable  is often something generic like network, dialup,
+       or unknown.  When tset is used in a startup script  it  is
+       often  desirable  to provide information about the type of
        terminal used on such ports.
 
-       The  purpose  of  the -m option is to map from some set of
-       conditions to a terminal type, that is, to tell tset  ``If
-       I'm  on this port at a particular speed, guess that I'm on
+       The purpose of the -m option is to map from  some  set  of
+       conditions  to a terminal type, that is, to tell tset ``If
+       I'm on this port at a particular speed, guess that I'm  on
        that kind of terminal''.
 
        The argument to the -m option consists of an optional port
        type, an optional operator, an optional baud rate specifi-
        cation, an optional colon (``:'') character and a terminal
-       type.   The port type is a string (delimited by either the
+       type.  The port type is a string (delimited by either  the
        operator or the colon character).  The operator may be any
        combination of ``>'', ``<'', ``@'', and ``!''; ``>'' means
-       greater than, ``<'' means less than, ``@'' means equal  to
+       greater  than, ``<'' means less than, ``@'' means equal to
        and ``!'' inverts the sense of the test.  The baud rate is
-       specified as a number and is compared with  the  speed  of
-       the  standard  error  output  (which should be the control
+       specified  as  a  number and is compared with the speed of
+       the standard error output (which  should  be  the  control
        terminal).  The terminal type is a string.
 
        If the terminal type is not specified on the command line,
-       the  -m mappings are applied to the terminal type.  If the
-       port type and baud rate match the  mapping,  the  terminal
-       type  specified  in the mapping replaces the current type.
-       If more than one mapping is specified, the first  applica-
+       the -m mappings are applied to the terminal type.  If  the
+       port  type  and  baud rate match the mapping, the terminal
+       type specified in the mapping replaces the  current  type.
+       If  more than one mapping is specified, the first applica-
        ble mapping is used.
 
-       For    example,    consider    the    following   mapping:
+       For   example,    consider    the    following    mapping:
        dialup>9600:vt100.  The port type is dialup , the operator
-       is  >, the baud rate specification is 9600, and the termi-
+       is >, the baud rate specification is 9600, and the  termi-
        nal type is vt100.  The result of this mapping is to spec-
        ify that if the terminal type is dialup, and the baud rate
-       is greater than 9600 baud, a terminal type of  vt100  will
+       is  greater  than 9600 baud, a terminal type of vt100 will
        be used.
 
        If no baud rate is specified, the terminal type will match
        any baud rate.  If no port type is specified, the terminal
-       type   will   match   any  port  type.   For  example,  -m
+       type  will  match  any  port  type.    For   example,   -m
        dialup:vt100  -m  :?xterm  will  cause  any  dialup  port,
        regardless of baud rate, to match the terminal type vt100,
-       and any non-dialup port type to match  the  terminal  type
-       ?xterm.   Note,  because of the leading question mark, the
-       user will be queried on a default port as to whether  they
+       and  any  non-dialup  port type to match the terminal type
+       ?xterm.  Note, because of the leading question  mark,  the
+       user  will be queried on a default port as to whether they
        are actually using an xterm terminal.
 
-       No  whitespace  characters  are permitted in the -m option
-       argument.  Also, to avoid problems  with  meta-characters,
-       it  is  suggested  that  the  entire -m option argument be
-       placed within single quote characters, and that csh  users
-       insert  a  backslash character (``\'') before any exclama-
+       No whitespace characters are permitted in  the  -m  option
+       argument.   Also,  to avoid problems with meta-characters,
+       it is suggested that the  entire  -m  option  argument  be
+       placed  within single quote characters, and that csh users
+       insert a backslash character (``\'') before  any  exclama-
        tion marks (``!'').
 
 
 
    
 
    HISTORY
    -       The tset command appeared in BSD 3.0.  The ncurses  imple-
-       mentation  was lightly adapted from the 4.4BSD sources for
+       The  tset command appeared in BSD 3.0.  The ncurses imple-
+       mentation was lightly adapted from the 4.4BSD sources  for
        a terminfo environment by Eric S. Raymond <esr@snark.thyr-
        sus.com>.
 
 
 
    
 
    COMPATIBILITY
    -       The  tset  utility has been provided for backward-compati-
-       bility with BSD environments (under  most  modern  UNIXes,
-       /etc/inittab  and  getty(1) can set TERM appropriately for
-       each dial-up line; this  obviates  what  was  tset's  most
-       important  use).   This implementation behaves like 4.4BSD
+       The tset utility has been provided  for  backward-compati-
+       bility  with  BSD  environments (under most modern UNIXes,
+       /etc/inittab and getty(1) can set TERM  appropriately  for
+       each  dial-up  line;  this  obviates  what was tset's most
+       important use).  This implementation behaves  like  4.4BSD
        tset, with a few exceptions specified here.
 
-       The -S option of BSD tset no longer works;  it  prints  an
+       The  -S  option  of BSD tset no longer works; it prints an
        error message to stderr and dies.  The -s option only sets
-       TERM, not TERMCAP.  Both these  changes  are  because  the
-       TERMCAP  variable  is  no longer supported under terminfo-
+       TERM,  not  TERMCAP.   Both  these changes are because the
+       TERMCAP variable is no longer  supported  under  terminfo-
        based ncurses, which makes tset -S useless (we made it die
        noisily rather than silently induce lossage).
 
-       There  was  an  undocumented  4.4BSD feature that invoking
+       There was an undocumented  4.4BSD  feature  that  invoking
        tset via a link named `TSET` (or via any other name begin-
-       ning  with  an  upper-case letter) set the terminal to use
+       ning with an upper-case letter) set the  terminal  to  use
        upper-case only.  This feature has been omitted.
 
-       The -A, -E, -h, -u and -v options were  deleted  from  the
-       tset  utility  in 4.4BSD.  None of them were documented in
-       4.3BSD and all are of limited utility at  best.   The  -a,
+       The  -A,  -E,  -h, -u and -v options were deleted from the
+       tset utility in 4.4BSD.  None of them were  documented  in
+       4.3BSD  and  all  are of limited utility at best.  The -a,
        -d, and -p options are similarly not documented or useful,
-       but were retained as they appear to be in widespread  use.
-       It  is  strongly recommended that any usage of these three
-       options be changed to use the -m option instead.   The  -n
-       option  remains, but has no effect.  The -adnp options are
+       but  were retained as they appear to be in widespread use.
+       It is strongly recommended that any usage of  these  three
+       options  be  changed to use the -m option instead.  The -n
+       option remains, but has no effect.  The -adnp options  are
        therefore omitted from the usage summary above.
 
-       It is still permissible to specify  the  -e,  -i,  and  -k
-       options  without arguments, although it is strongly recom-
-       mended that such usage be fixed to explicitly specify  the
+       It  is  still  permissible  to  specify the -e, -i, and -k
+       options without arguments, although it is strongly  recom-
+       mended  that such usage be fixed to explicitly specify the
        character.
 
-       As  of  4.4BSD,  executing tset as reset no longer implies
+       As of 4.4BSD, executing tset as reset  no  longer  implies
        the -Q option.  Also, the interaction between the - option
        and the terminal argument in some historic implementations
        of tset has been removed.
@@ -293,7 +293,7 @@
             tells tset whether to initialize TERM using sh or csh
             syntax.
 
-       TERM Denotes  your  terminal  type.  Each terminal type is
+       TERM Denotes your terminal type.  Each  terminal  type  is
             distinct, though many are similar.
 
        TERMCAP
@@ -306,7 +306,7 @@
 
    
 
    FILES
            /etc/ttys
-            system  port  name  to terminal type mapping database
+            system port name to terminal  type  mapping  database
             (BSD versions only).
 
        /usr/share/terminfo
@@ -315,10 +315,10 @@
 
 
    
 
    SEE ALSO
    -       csh(1), sh(1), stty(1),  curs_terminfo(3x),  tty(4),  ter-
+       csh(1),  sh(1),  stty(1),  curs_terminfo(3x), tty(4), ter-
        minfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 5.6 (patch 20081011).
+       This describes ncurses version 5.7 (patch 20100109).
 
 
 
diff --git a/form/llib-lform b/form/llib-lform
index bd7c3a4f..2b6abdcd 100644
--- a/form/llib-lform
+++ b/form/llib-lform
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey       1996,1997,2002,2005                      *
+ *  Author: Thomas E. Dickey       1996-2005,2010                           *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 /* ./f_trace.c */
 
-#include "form.priv.h"
+#include 
 
 #undef _nc_retrace_field_ptr
 FIELD	**_nc_retrace_field_ptr(
@@ -264,7 +264,7 @@ int	move_field(
 /* ./fld_newftyp.c */
 
 #undef _nc_Default_FieldType
-const FIELDTYPE *_nc_Default_FieldType = {0};
+FIELDTYPE *_nc_Default_FieldType;
 
 #undef new_fieldtype
 FIELDTYPE *new_fieldtype(
@@ -396,6 +396,12 @@ NCURSES_BOOL data_ahead(
 #undef _nc_Default_Form
 FORM	*_nc_Default_Form;
 
+#undef new_form_sp
+FORM	*new_form_sp(
+		SCREEN	*sp, 
+		FIELD	**fields)
+		{ return(*(FORM **)0); }
+
 #undef new_form
 FORM	*new_form(
 		FIELD	**fields)
@@ -424,6 +430,13 @@ int	field_count(
 
 /* ./frm_driver.c */
 
+#undef _nc_get_fieldbuffer
+void	_nc_get_fieldbuffer(
+		FORM	*form, 
+		FIELD	*field, 
+		char	*buf)
+		{ /* void */ }
+
 #undef _nc_Position_Form_Cursor
 int	_nc_Position_Form_Cursor(
 		FORM	*form)
@@ -683,9 +696,23 @@ typedef struct
   }
 enumARG;
 
+typedef struct
+  {
+    char **kwds;
+    int ccase;
+    int cunique;
+  }
+enumParams;
+
 #undef TYPE_ENUM
 FIELDTYPE *TYPE_ENUM;
 
+/* ./fty_generic.c */
+
+#undef _nc_fty_generic
+void	_nc_fty_generic(void)
+		{ /* void */ }
+
 /* ./fty_int.c */
 
 typedef struct
@@ -696,6 +723,14 @@ typedef struct
   }
 integerARG;
 
+typedef struct
+  {
+    int precision;
+    long low;
+    long high;
+  }
+integerPARM;
+
 #undef TYPE_INTEGER
 FIELDTYPE *TYPE_INTEGER;
 
@@ -716,6 +751,14 @@ typedef struct
   }
 numericARG;
 
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+  }
+thisPARM;
+
 #undef TYPE_NUMERIC
 FIELDTYPE *TYPE_NUMERIC;
 
diff --git a/form/llib-lformt b/form/llib-lformt
new file mode 100644
index 00000000..33de63cd
--- /dev/null
+++ b/form/llib-lformt
@@ -0,0 +1,777 @@
+/****************************************************************************
+ * Copyright (c) 2010 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       2010                                     *
+ ****************************************************************************/
+/* LINTLIBRARY */
+
+/* ./f_trace.c */
+
+#include 
+
+#undef _nc_retrace_field_ptr
+FIELD	**_nc_retrace_field_ptr(
+		FIELD	**code)
+		{ return(*(FIELD ***)0); }
+
+#undef _nc_retrace_field
+FIELD	*_nc_retrace_field(
+		FIELD	*code)
+		{ return(*(FIELD **)0); }
+
+#undef _nc_retrace_field_type
+FIELDTYPE *_nc_retrace_field_type(
+		FIELDTYPE *code)
+		{ return(*(FIELDTYPE **)0); }
+
+#undef _nc_retrace_form
+FORM	*_nc_retrace_form(
+		FORM	*code)
+		{ return(*(FORM **)0); }
+
+#undef _nc_retrace_form_hook
+Form_Hook _nc_retrace_form_hook(
+		Form_Hook code)
+		{ return(*(Form_Hook *)0); }
+
+/* ./fld_arg.c */
+
+#undef set_fieldtype_arg
+int	set_fieldtype_arg(
+		FIELDTYPE *typ, 
+		void	*(*const make_arg)(
+		va_list	*p1), 
+		void	*(*const copy_arg)(
+		const void *p1), 
+		void	(*const free_arg)(
+		void	*p1))
+		{ return(*(int *)0); }
+
+#undef field_arg
+void	*field_arg(
+		const FIELD *field)
+		{ return(*(void **)0); }
+
+/* ./fld_attr.c */
+
+#undef set_field_fore
+int	set_field_fore(
+		FIELD	*field, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef field_fore
+chtype	field_fore(
+		const FIELD *field)
+		{ return(*(chtype *)0); }
+
+#undef set_field_back
+int	set_field_back(
+		FIELD	*field, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef field_back
+chtype	field_back(
+		const FIELD *field)
+		{ return(*(chtype *)0); }
+
+/* ./fld_current.c */
+
+#undef set_current_field
+int	set_current_field(
+		FORM	*form, 
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+#undef current_field
+FIELD	*current_field(
+		const FORM *form)
+		{ return(*(FIELD **)0); }
+
+#undef field_index
+int	field_index(
+		const FIELD *field)
+		{ return(*(int *)0); }
+
+/* ./fld_def.c */
+
+#undef _nc_Default_Field
+FIELD	*_nc_Default_Field;
+
+#undef _nc_Make_Argument
+TypeArgument *_nc_Make_Argument(
+		const FIELDTYPE *typ, 
+		va_list	*ap, 
+		int	*err)
+		{ return(*(TypeArgument **)0); }
+
+#undef _nc_Copy_Argument
+TypeArgument *_nc_Copy_Argument(
+		const FIELDTYPE *typ, 
+		const TypeArgument *argp, 
+		int	*err)
+		{ return(*(TypeArgument **)0); }
+
+#undef _nc_Free_Argument
+void	_nc_Free_Argument(
+		const FIELDTYPE *typ, 
+		TypeArgument *argp)
+		{ /* void */ }
+
+#undef _nc_Copy_Type
+NCURSES_BOOL _nc_Copy_Type(
+		FIELD	*dst, 
+		FIELD const *src)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef _nc_Free_Type
+void	_nc_Free_Type(
+		FIELD	*field)
+		{ /* void */ }
+
+#undef new_field
+FIELD	*new_field(
+		int	rows, 
+		int	cols, 
+		int	frow, 
+		int	fcol, 
+		int	nrow, 
+		int	nbuf)
+		{ return(*(FIELD **)0); }
+
+#undef free_field
+int	free_field(
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+/* ./fld_dup.c */
+
+#undef dup_field
+FIELD	*dup_field(
+		FIELD	*field, 
+		int	frow, 
+		int	fcol)
+		{ return(*(FIELD **)0); }
+
+/* ./fld_ftchoice.c */
+
+#undef set_fieldtype_choice
+int	set_fieldtype_choice(
+		FIELDTYPE *typ, 
+		NCURSES_BOOL (*const next_choice)(
+		FIELD	*p1, 
+		const void *p2), 
+		NCURSES_BOOL (*const prev_choice)(
+		FIELD	*p1, 
+		const void *p2))
+		{ return(*(int *)0); }
+
+/* ./fld_ftlink.c */
+
+#undef link_fieldtype
+FIELDTYPE *link_fieldtype(
+		FIELDTYPE *type1, 
+		FIELDTYPE *type2)
+		{ return(*(FIELDTYPE **)0); }
+
+/* ./fld_info.c */
+
+#undef field_info
+int	field_info(
+		const FIELD *field, 
+		int	*rows, 
+		int	*cols, 
+		int	*frow, 
+		int	*fcol, 
+		int	*nrow, 
+		int	*nbuf)
+		{ return(*(int *)0); }
+
+#undef dynamic_field_info
+int	dynamic_field_info(
+		const FIELD *field, 
+		int	*drows, 
+		int	*dcols, 
+		int	*maxgrow)
+		{ return(*(int *)0); }
+
+/* ./fld_just.c */
+
+#undef set_field_just
+int	set_field_just(
+		FIELD	*field, 
+		int	just)
+		{ return(*(int *)0); }
+
+#undef field_just
+int	field_just(
+		const FIELD *field)
+		{ return(*(int *)0); }
+
+/* ./fld_link.c */
+
+#undef link_field
+FIELD	*link_field(
+		FIELD	*field, 
+		int	frow, 
+		int	fcol)
+		{ return(*(FIELD **)0); }
+
+/* ./fld_max.c */
+
+#undef set_max_field
+int	set_max_field(
+		FIELD	*field, 
+		int	maxgrow)
+		{ return(*(int *)0); }
+
+/* ./fld_move.c */
+
+#undef move_field
+int	move_field(
+		FIELD	*field, 
+		int	frow, 
+		int	fcol)
+		{ return(*(int *)0); }
+
+/* ./fld_newftyp.c */
+
+#undef _nc_Default_FieldType
+FIELDTYPE *_nc_Default_FieldType;
+
+#undef new_fieldtype
+FIELDTYPE *new_fieldtype(
+		NCURSES_BOOL (*const field_check)(
+		FIELD	*p1, 
+		const void *p2), 
+		NCURSES_BOOL (*const char_check)(
+		int	p1, 
+		const void *p2))
+		{ return(*(FIELDTYPE **)0); }
+
+#undef free_fieldtype
+int	free_fieldtype(
+		FIELDTYPE *typ)
+		{ return(*(int *)0); }
+
+/* ./fld_opts.c */
+
+#undef set_field_opts
+int	set_field_opts(
+		FIELD	*field, 
+		Field_Options opts)
+		{ return(*(int *)0); }
+
+#undef field_opts
+Field_Options field_opts(
+		const FIELD *field)
+		{ return(*(Field_Options *)0); }
+
+#undef field_opts_on
+int	field_opts_on(
+		FIELD	*field, 
+		Field_Options opts)
+		{ return(*(int *)0); }
+
+#undef field_opts_off
+int	field_opts_off(
+		FIELD	*field, 
+		Field_Options opts)
+		{ return(*(int *)0); }
+
+/* ./fld_pad.c */
+
+#undef set_field_pad
+int	set_field_pad(
+		FIELD	*field, 
+		int	ch)
+		{ return(*(int *)0); }
+
+#undef field_pad
+int	field_pad(
+		const FIELD *field)
+		{ return(*(int *)0); }
+
+/* ./fld_page.c */
+
+#undef set_new_page
+int	set_new_page(
+		FIELD	*field, 
+		NCURSES_BOOL new_page_flag)
+		{ return(*(int *)0); }
+
+#undef new_page
+NCURSES_BOOL new_page(
+		const FIELD *field)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./fld_stat.c */
+
+#undef set_field_status
+int	set_field_status(
+		FIELD	*field, 
+		NCURSES_BOOL status)
+		{ return(*(int *)0); }
+
+#undef field_status
+NCURSES_BOOL field_status(
+		const FIELD *field)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./fld_type.c */
+
+#undef set_field_type
+int	set_field_type(
+		FIELD	*field, 
+		FIELDTYPE *type, 
+		...)
+		{ return(*(int *)0); }
+
+#undef field_type
+FIELDTYPE *field_type(
+		const FIELD *field)
+		{ return(*(FIELDTYPE **)0); }
+
+/* ./fld_user.c */
+
+#undef set_field_userptr
+int	set_field_userptr(
+		FIELD	*field, 
+		void	*usrptr)
+		{ return(*(int *)0); }
+
+#undef field_userptr
+void	*field_userptr(
+		const FIELD *field)
+		{ return(*(void **)0); }
+
+/* ./frm_cursor.c */
+
+#undef pos_form_cursor
+int	pos_form_cursor(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+/* ./frm_data.c */
+
+#undef data_behind
+NCURSES_BOOL data_behind(
+		const FORM *form)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef data_ahead
+NCURSES_BOOL data_ahead(
+		const FORM *form)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./frm_def.c */
+
+#undef _nc_Default_Form
+FORM	*_nc_Default_Form;
+
+#undef new_form_sp
+FORM	*new_form_sp(
+		SCREEN	*sp, 
+		FIELD	**fields)
+		{ return(*(FORM **)0); }
+
+#undef new_form
+FORM	*new_form(
+		FIELD	**fields)
+		{ return(*(FORM **)0); }
+
+#undef free_form
+int	free_form(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef set_form_fields
+int	set_form_fields(
+		FORM	*form, 
+		FIELD	**fields)
+		{ return(*(int *)0); }
+
+#undef form_fields
+FIELD	**form_fields(
+		const FORM *form)
+		{ return(*(FIELD ***)0); }
+
+#undef field_count
+int	field_count(
+		const FORM *form)
+		{ return(*(int *)0); }
+
+/* ./frm_driver.c */
+
+#undef _nc_get_fieldbuffer
+void	_nc_get_fieldbuffer(
+		FORM	*form, 
+		FIELD	*field, 
+		char	*buf)
+		{ /* void */ }
+
+#undef _nc_Position_Form_Cursor
+int	_nc_Position_Form_Cursor(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef _nc_Refresh_Current_Field
+int	_nc_Refresh_Current_Field(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef _nc_Synchronize_Attributes
+int	_nc_Synchronize_Attributes(
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+#undef _nc_Synchronize_Options
+int	_nc_Synchronize_Options(
+		FIELD	*field, 
+		Field_Options newopts)
+		{ return(*(int *)0); }
+
+#undef _nc_Set_Current_Field
+int	_nc_Set_Current_Field(
+		FORM	*form, 
+		FIELD	*newfield)
+		{ return(*(int *)0); }
+
+#undef _nc_Internal_Validation
+NCURSES_BOOL _nc_Internal_Validation(
+		FORM	*form)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef _nc_First_Active_Field
+FIELD	*_nc_First_Active_Field(
+		FORM	*form)
+		{ return(*(FIELD **)0); }
+
+#undef _nc_Set_Form_Page
+int	_nc_Set_Form_Page(
+		FORM	*form, 
+		int	page, 
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+typedef struct
+{
+  int keycode; 
+  int (*cmd) (FORM *); 
+}
+Binding_Info;
+
+#undef form_driver
+int	form_driver(
+		FORM	*form, 
+		int	c)
+		{ return(*(int *)0); }
+
+#undef set_field_buffer
+int	set_field_buffer(
+		FIELD	*field, 
+		int	buffer, 
+		const char *value)
+		{ return(*(int *)0); }
+
+#undef field_buffer
+char	*field_buffer(
+		const FIELD *field, 
+		int	buffer)
+		{ return(*(char **)0); }
+
+/* ./frm_hook.c */
+
+#undef set_field_init
+int	set_field_init(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef field_init
+Form_Hook field_init(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+#undef set_field_term
+int	set_field_term(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef field_term
+Form_Hook field_term(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+#undef set_form_init
+int	set_form_init(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef form_init
+Form_Hook form_init(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+#undef set_form_term
+int	set_form_term(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef form_term
+Form_Hook form_term(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+/* ./frm_opts.c */
+
+#undef set_form_opts
+int	set_form_opts(
+		FORM	*form, 
+		Form_Options opts)
+		{ return(*(int *)0); }
+
+#undef form_opts
+Form_Options form_opts(
+		const FORM *form)
+		{ return(*(Form_Options *)0); }
+
+#undef form_opts_on
+int	form_opts_on(
+		FORM	*form, 
+		Form_Options opts)
+		{ return(*(int *)0); }
+
+#undef form_opts_off
+int	form_opts_off(
+		FORM	*form, 
+		Form_Options opts)
+		{ return(*(int *)0); }
+
+/* ./frm_page.c */
+
+#undef set_form_page
+int	set_form_page(
+		FORM	*form, 
+		int	page)
+		{ return(*(int *)0); }
+
+#undef form_page
+int	form_page(
+		const FORM *form)
+		{ return(*(int *)0); }
+
+/* ./frm_post.c */
+
+#undef post_form
+int	post_form(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef unpost_form
+int	unpost_form(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+/* ./frm_req_name.c */
+
+#undef form_request_name
+const char *form_request_name(
+		int	request)
+		{ return(*(const char **)0); }
+
+#undef form_request_by_name
+int	form_request_by_name(
+		const char *str)
+		{ return(*(int *)0); }
+
+/* ./frm_scale.c */
+
+#undef scale_form
+int	scale_form(
+		const FORM *form, 
+		int	*rows, 
+		int	*cols)
+		{ return(*(int *)0); }
+
+/* ./frm_sub.c */
+
+#undef set_form_sub
+int	set_form_sub(
+		FORM	*form, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef form_sub
+WINDOW	*form_sub(
+		const FORM *form)
+		{ return(*(WINDOW **)0); }
+
+/* ./frm_user.c */
+
+#undef set_form_userptr
+int	set_form_userptr(
+		FORM	*form, 
+		void	*usrptr)
+		{ return(*(int *)0); }
+
+#undef form_userptr
+void	*form_userptr(
+		const FORM *form)
+		{ return(*(void **)0); }
+
+/* ./frm_win.c */
+
+#undef set_form_win
+int	set_form_win(
+		FORM	*form, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef form_win
+WINDOW	*form_win(
+		const FORM *form)
+		{ return(*(WINDOW **)0); }
+
+/* ./fty_alnum.c */
+
+typedef struct
+  {
+    int width;
+  }
+alnumARG;
+
+#undef TYPE_ALNUM
+FIELDTYPE *TYPE_ALNUM;
+
+/* ./fty_alpha.c */
+
+typedef struct
+  {
+    int width;
+  }
+alphaARG;
+
+#undef TYPE_ALPHA
+FIELDTYPE *TYPE_ALPHA;
+
+/* ./fty_enum.c */
+
+typedef struct
+  {
+    char **kwds;
+    int count;
+    NCURSES_BOOL checkcase;
+    NCURSES_BOOL checkunique;
+  }
+enumARG;
+
+typedef struct
+  {
+    char **kwds;
+    int ccase;
+    int cunique;
+  }
+enumParams;
+
+#undef TYPE_ENUM
+FIELDTYPE *TYPE_ENUM;
+
+/* ./fty_generic.c */
+
+#undef _nc_fty_generic
+void	_nc_fty_generic(void)
+		{ /* void */ }
+
+/* ./fty_int.c */
+
+typedef struct
+  {
+    int precision;
+    long low;
+    long high;
+  }
+integerARG;
+
+typedef struct
+  {
+    int precision;
+    long low;
+    long high;
+  }
+integerPARM;
+
+#undef TYPE_INTEGER
+FIELDTYPE *TYPE_INTEGER;
+
+/* ./fty_ipv4.c */
+#undef TYPE_IPV4
+FIELDTYPE *TYPE_IPV4;
+
+/* ./fty_num.c */
+
+#include 
+
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+    struct lconv *L;
+  }
+numericARG;
+
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+  }
+thisPARM;
+
+#undef TYPE_NUMERIC
+FIELDTYPE *TYPE_NUMERIC;
+
+/* ./fty_regex.c */
+
+#include 
+
+typedef struct
+  {
+    regex_t *pRegExp;
+    unsigned long *refCount;
+  }
+RegExp_Arg;
+
+#undef TYPE_REGEXP
+FIELDTYPE *TYPE_REGEXP;
diff --git a/form/llib-lformtw b/form/llib-lformtw
new file mode 100644
index 00000000..10639490
--- /dev/null
+++ b/form/llib-lformtw
@@ -0,0 +1,783 @@
+/****************************************************************************
+ * Copyright (c) 2010 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       2010                                     *
+ ****************************************************************************/
+/* LINTLIBRARY */
+
+/* ./f_trace.c */
+
+#include 
+
+#undef _nc_retrace_field_ptr
+FIELD	**_nc_retrace_field_ptr(
+		FIELD	**code)
+		{ return(*(FIELD ***)0); }
+
+#undef _nc_retrace_field
+FIELD	*_nc_retrace_field(
+		FIELD	*code)
+		{ return(*(FIELD **)0); }
+
+#undef _nc_retrace_field_type
+FIELDTYPE *_nc_retrace_field_type(
+		FIELDTYPE *code)
+		{ return(*(FIELDTYPE **)0); }
+
+#undef _nc_retrace_form
+FORM	*_nc_retrace_form(
+		FORM	*code)
+		{ return(*(FORM **)0); }
+
+#undef _nc_retrace_form_hook
+Form_Hook _nc_retrace_form_hook(
+		Form_Hook code)
+		{ return(*(Form_Hook *)0); }
+
+/* ./fld_arg.c */
+
+#undef set_fieldtype_arg
+int	set_fieldtype_arg(
+		FIELDTYPE *typ, 
+		void	*(*const make_arg)(
+		va_list	*p1), 
+		void	*(*const copy_arg)(
+		const void *p1), 
+		void	(*const free_arg)(
+		void	*p1))
+		{ return(*(int *)0); }
+
+#undef field_arg
+void	*field_arg(
+		const FIELD *field)
+		{ return(*(void **)0); }
+
+/* ./fld_attr.c */
+
+#undef set_field_fore
+int	set_field_fore(
+		FIELD	*field, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef field_fore
+chtype	field_fore(
+		const FIELD *field)
+		{ return(*(chtype *)0); }
+
+#undef set_field_back
+int	set_field_back(
+		FIELD	*field, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef field_back
+chtype	field_back(
+		const FIELD *field)
+		{ return(*(chtype *)0); }
+
+/* ./fld_current.c */
+
+#undef set_current_field
+int	set_current_field(
+		FORM	*form, 
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+#undef current_field
+FIELD	*current_field(
+		const FORM *form)
+		{ return(*(FIELD **)0); }
+
+#undef field_index
+int	field_index(
+		const FIELD *field)
+		{ return(*(int *)0); }
+
+/* ./fld_def.c */
+
+#undef _nc_Default_Field
+FIELD	*_nc_Default_Field;
+
+#undef _nc_Make_Argument
+TypeArgument *_nc_Make_Argument(
+		const FIELDTYPE *typ, 
+		va_list	*ap, 
+		int	*err)
+		{ return(*(TypeArgument **)0); }
+
+#undef _nc_Copy_Argument
+TypeArgument *_nc_Copy_Argument(
+		const FIELDTYPE *typ, 
+		const TypeArgument *argp, 
+		int	*err)
+		{ return(*(TypeArgument **)0); }
+
+#undef _nc_Free_Argument
+void	_nc_Free_Argument(
+		const FIELDTYPE *typ, 
+		TypeArgument *argp)
+		{ /* void */ }
+
+#undef _nc_Copy_Type
+NCURSES_BOOL _nc_Copy_Type(
+		FIELD	*dst, 
+		FIELD const *src)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef _nc_Free_Type
+void	_nc_Free_Type(
+		FIELD	*field)
+		{ /* void */ }
+
+#undef new_field
+FIELD	*new_field(
+		int	rows, 
+		int	cols, 
+		int	frow, 
+		int	fcol, 
+		int	nrow, 
+		int	nbuf)
+		{ return(*(FIELD **)0); }
+
+#undef free_field
+int	free_field(
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+/* ./fld_dup.c */
+
+#undef dup_field
+FIELD	*dup_field(
+		FIELD	*field, 
+		int	frow, 
+		int	fcol)
+		{ return(*(FIELD **)0); }
+
+/* ./fld_ftchoice.c */
+
+#undef set_fieldtype_choice
+int	set_fieldtype_choice(
+		FIELDTYPE *typ, 
+		NCURSES_BOOL (*const next_choice)(
+		FIELD	*p1, 
+		const void *p2), 
+		NCURSES_BOOL (*const prev_choice)(
+		FIELD	*p1, 
+		const void *p2))
+		{ return(*(int *)0); }
+
+/* ./fld_ftlink.c */
+
+#undef link_fieldtype
+FIELDTYPE *link_fieldtype(
+		FIELDTYPE *type1, 
+		FIELDTYPE *type2)
+		{ return(*(FIELDTYPE **)0); }
+
+/* ./fld_info.c */
+
+#undef field_info
+int	field_info(
+		const FIELD *field, 
+		int	*rows, 
+		int	*cols, 
+		int	*frow, 
+		int	*fcol, 
+		int	*nrow, 
+		int	*nbuf)
+		{ return(*(int *)0); }
+
+#undef dynamic_field_info
+int	dynamic_field_info(
+		const FIELD *field, 
+		int	*drows, 
+		int	*dcols, 
+		int	*maxgrow)
+		{ return(*(int *)0); }
+
+/* ./fld_just.c */
+
+#undef set_field_just
+int	set_field_just(
+		FIELD	*field, 
+		int	just)
+		{ return(*(int *)0); }
+
+#undef field_just
+int	field_just(
+		const FIELD *field)
+		{ return(*(int *)0); }
+
+/* ./fld_link.c */
+
+#undef link_field
+FIELD	*link_field(
+		FIELD	*field, 
+		int	frow, 
+		int	fcol)
+		{ return(*(FIELD **)0); }
+
+/* ./fld_max.c */
+
+#undef set_max_field
+int	set_max_field(
+		FIELD	*field, 
+		int	maxgrow)
+		{ return(*(int *)0); }
+
+/* ./fld_move.c */
+
+#undef move_field
+int	move_field(
+		FIELD	*field, 
+		int	frow, 
+		int	fcol)
+		{ return(*(int *)0); }
+
+/* ./fld_newftyp.c */
+
+#undef _nc_Default_FieldType
+FIELDTYPE *_nc_Default_FieldType;
+
+#undef new_fieldtype
+FIELDTYPE *new_fieldtype(
+		NCURSES_BOOL (*const field_check)(
+		FIELD	*p1, 
+		const void *p2), 
+		NCURSES_BOOL (*const char_check)(
+		int	p1, 
+		const void *p2))
+		{ return(*(FIELDTYPE **)0); }
+
+#undef free_fieldtype
+int	free_fieldtype(
+		FIELDTYPE *typ)
+		{ return(*(int *)0); }
+
+/* ./fld_opts.c */
+
+#undef set_field_opts
+int	set_field_opts(
+		FIELD	*field, 
+		Field_Options opts)
+		{ return(*(int *)0); }
+
+#undef field_opts
+Field_Options field_opts(
+		const FIELD *field)
+		{ return(*(Field_Options *)0); }
+
+#undef field_opts_on
+int	field_opts_on(
+		FIELD	*field, 
+		Field_Options opts)
+		{ return(*(int *)0); }
+
+#undef field_opts_off
+int	field_opts_off(
+		FIELD	*field, 
+		Field_Options opts)
+		{ return(*(int *)0); }
+
+/* ./fld_pad.c */
+
+#undef set_field_pad
+int	set_field_pad(
+		FIELD	*field, 
+		int	ch)
+		{ return(*(int *)0); }
+
+#undef field_pad
+int	field_pad(
+		const FIELD *field)
+		{ return(*(int *)0); }
+
+/* ./fld_page.c */
+
+#undef set_new_page
+int	set_new_page(
+		FIELD	*field, 
+		NCURSES_BOOL new_page_flag)
+		{ return(*(int *)0); }
+
+#undef new_page
+NCURSES_BOOL new_page(
+		const FIELD *field)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./fld_stat.c */
+
+#undef set_field_status
+int	set_field_status(
+		FIELD	*field, 
+		NCURSES_BOOL status)
+		{ return(*(int *)0); }
+
+#undef field_status
+NCURSES_BOOL field_status(
+		const FIELD *field)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./fld_type.c */
+
+#undef set_field_type
+int	set_field_type(
+		FIELD	*field, 
+		FIELDTYPE *type, 
+		...)
+		{ return(*(int *)0); }
+
+#undef field_type
+FIELDTYPE *field_type(
+		const FIELD *field)
+		{ return(*(FIELDTYPE **)0); }
+
+/* ./fld_user.c */
+
+#undef set_field_userptr
+int	set_field_userptr(
+		FIELD	*field, 
+		void	*usrptr)
+		{ return(*(int *)0); }
+
+#undef field_userptr
+void	*field_userptr(
+		const FIELD *field)
+		{ return(*(void **)0); }
+
+/* ./frm_cursor.c */
+
+#undef pos_form_cursor
+int	pos_form_cursor(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+/* ./frm_data.c */
+
+#undef data_behind
+NCURSES_BOOL data_behind(
+		const FORM *form)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef data_ahead
+NCURSES_BOOL data_ahead(
+		const FORM *form)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./frm_def.c */
+
+#undef _nc_Default_Form
+FORM	*_nc_Default_Form;
+
+#undef new_form_sp
+FORM	*new_form_sp(
+		SCREEN	*sp, 
+		FIELD	**fields)
+		{ return(*(FORM **)0); }
+
+#undef new_form
+FORM	*new_form(
+		FIELD	**fields)
+		{ return(*(FORM **)0); }
+
+#undef free_form
+int	free_form(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef set_form_fields
+int	set_form_fields(
+		FORM	*form, 
+		FIELD	**fields)
+		{ return(*(int *)0); }
+
+#undef form_fields
+FIELD	**form_fields(
+		const FORM *form)
+		{ return(*(FIELD ***)0); }
+
+#undef field_count
+int	field_count(
+		const FORM *form)
+		{ return(*(int *)0); }
+
+/* ./frm_driver.c */
+
+#undef _nc_get_fieldbuffer
+void	_nc_get_fieldbuffer(
+		FORM	*form, 
+		FIELD	*field, 
+		cchar_t	*buf)
+		{ /* void */ }
+
+#undef _nc_Position_Form_Cursor
+int	_nc_Position_Form_Cursor(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef _nc_Refresh_Current_Field
+int	_nc_Refresh_Current_Field(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef _nc_Synchronize_Attributes
+int	_nc_Synchronize_Attributes(
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+#undef _nc_Synchronize_Options
+int	_nc_Synchronize_Options(
+		FIELD	*field, 
+		Field_Options newopts)
+		{ return(*(int *)0); }
+
+#undef _nc_Set_Current_Field
+int	_nc_Set_Current_Field(
+		FORM	*form, 
+		FIELD	*newfield)
+		{ return(*(int *)0); }
+
+#undef _nc_Internal_Validation
+NCURSES_BOOL _nc_Internal_Validation(
+		FORM	*form)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef _nc_First_Active_Field
+FIELD	*_nc_First_Active_Field(
+		FORM	*form)
+		{ return(*(FIELD **)0); }
+
+#undef _nc_Set_Form_Page
+int	_nc_Set_Form_Page(
+		FORM	*form, 
+		int	page, 
+		FIELD	*field)
+		{ return(*(int *)0); }
+
+typedef struct
+{
+  int keycode; 
+  int (*cmd) (FORM *); 
+}
+Binding_Info;
+
+#undef form_driver
+int	form_driver(
+		FORM	*form, 
+		int	c)
+		{ return(*(int *)0); }
+
+#undef set_field_buffer
+int	set_field_buffer(
+		FIELD	*field, 
+		int	buffer, 
+		const char *value)
+		{ return(*(int *)0); }
+
+#undef field_buffer
+char	*field_buffer(
+		const FIELD *field, 
+		int	buffer)
+		{ return(*(char **)0); }
+
+#undef _nc_Widen_String
+wchar_t	*_nc_Widen_String(
+		char	*source, 
+		int	*lengthp)
+		{ return(*(wchar_t **)0); }
+
+/* ./frm_hook.c */
+
+#undef set_field_init
+int	set_field_init(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef field_init
+Form_Hook field_init(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+#undef set_field_term
+int	set_field_term(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef field_term
+Form_Hook field_term(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+#undef set_form_init
+int	set_form_init(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef form_init
+Form_Hook form_init(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+#undef set_form_term
+int	set_form_term(
+		FORM	*form, 
+		Form_Hook func)
+		{ return(*(int *)0); }
+
+#undef form_term
+Form_Hook form_term(
+		const FORM *form)
+		{ return(*(Form_Hook *)0); }
+
+/* ./frm_opts.c */
+
+#undef set_form_opts
+int	set_form_opts(
+		FORM	*form, 
+		Form_Options opts)
+		{ return(*(int *)0); }
+
+#undef form_opts
+Form_Options form_opts(
+		const FORM *form)
+		{ return(*(Form_Options *)0); }
+
+#undef form_opts_on
+int	form_opts_on(
+		FORM	*form, 
+		Form_Options opts)
+		{ return(*(int *)0); }
+
+#undef form_opts_off
+int	form_opts_off(
+		FORM	*form, 
+		Form_Options opts)
+		{ return(*(int *)0); }
+
+/* ./frm_page.c */
+
+#undef set_form_page
+int	set_form_page(
+		FORM	*form, 
+		int	page)
+		{ return(*(int *)0); }
+
+#undef form_page
+int	form_page(
+		const FORM *form)
+		{ return(*(int *)0); }
+
+/* ./frm_post.c */
+
+#undef post_form
+int	post_form(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+#undef unpost_form
+int	unpost_form(
+		FORM	*form)
+		{ return(*(int *)0); }
+
+/* ./frm_req_name.c */
+
+#undef form_request_name
+const char *form_request_name(
+		int	request)
+		{ return(*(const char **)0); }
+
+#undef form_request_by_name
+int	form_request_by_name(
+		const char *str)
+		{ return(*(int *)0); }
+
+/* ./frm_scale.c */
+
+#undef scale_form
+int	scale_form(
+		const FORM *form, 
+		int	*rows, 
+		int	*cols)
+		{ return(*(int *)0); }
+
+/* ./frm_sub.c */
+
+#undef set_form_sub
+int	set_form_sub(
+		FORM	*form, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef form_sub
+WINDOW	*form_sub(
+		const FORM *form)
+		{ return(*(WINDOW **)0); }
+
+/* ./frm_user.c */
+
+#undef set_form_userptr
+int	set_form_userptr(
+		FORM	*form, 
+		void	*usrptr)
+		{ return(*(int *)0); }
+
+#undef form_userptr
+void	*form_userptr(
+		const FORM *form)
+		{ return(*(void **)0); }
+
+/* ./frm_win.c */
+
+#undef set_form_win
+int	set_form_win(
+		FORM	*form, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef form_win
+WINDOW	*form_win(
+		const FORM *form)
+		{ return(*(WINDOW **)0); }
+
+/* ./fty_alnum.c */
+
+typedef struct
+  {
+    int width;
+  }
+alnumARG;
+
+#undef TYPE_ALNUM
+FIELDTYPE *TYPE_ALNUM;
+
+/* ./fty_alpha.c */
+
+typedef struct
+  {
+    int width;
+  }
+alphaARG;
+
+#undef TYPE_ALPHA
+FIELDTYPE *TYPE_ALPHA;
+
+/* ./fty_enum.c */
+
+typedef struct
+  {
+    char **kwds;
+    int count;
+    NCURSES_BOOL checkcase;
+    NCURSES_BOOL checkunique;
+  }
+enumARG;
+
+typedef struct
+  {
+    char **kwds;
+    int ccase;
+    int cunique;
+  }
+enumParams;
+
+#undef TYPE_ENUM
+FIELDTYPE *TYPE_ENUM;
+
+/* ./fty_generic.c */
+
+#undef _nc_fty_generic
+void	_nc_fty_generic(void)
+		{ /* void */ }
+
+/* ./fty_int.c */
+
+typedef struct
+  {
+    int precision;
+    long low;
+    long high;
+  }
+integerARG;
+
+typedef struct
+  {
+    int precision;
+    long low;
+    long high;
+  }
+integerPARM;
+
+#undef TYPE_INTEGER
+FIELDTYPE *TYPE_INTEGER;
+
+/* ./fty_ipv4.c */
+#undef TYPE_IPV4
+FIELDTYPE *TYPE_IPV4;
+
+/* ./fty_num.c */
+
+#include 
+
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+    struct lconv *L;
+  }
+numericARG;
+
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+  }
+thisPARM;
+
+#undef TYPE_NUMERIC
+FIELDTYPE *TYPE_NUMERIC;
+
+/* ./fty_regex.c */
+
+#include 
+
+typedef struct
+  {
+    regex_t *pRegExp;
+    unsigned long *refCount;
+  }
+RegExp_Arg;
+
+#undef TYPE_REGEXP
+FIELDTYPE *TYPE_REGEXP;
diff --git a/form/llib-lformw b/form/llib-lformw
index 7690c5b0..30c24b56 100644
--- a/form/llib-lformw
+++ b/form/llib-lformw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002,2005 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey                    2002,2005                   *
+ *  Author: Thomas E. Dickey                    2002-2005,2010              *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 /* ./f_trace.c */
 
-#include "form.priv.h"
+#include 
 
 #undef _nc_retrace_field_ptr
 FIELD	**_nc_retrace_field_ptr(
@@ -264,7 +264,7 @@ int	move_field(
 /* ./fld_newftyp.c */
 
 #undef _nc_Default_FieldType
-const FIELDTYPE *_nc_Default_FieldType = {0};
+FIELDTYPE *_nc_Default_FieldType;
 
 #undef new_fieldtype
 FIELDTYPE *new_fieldtype(
@@ -396,6 +396,12 @@ NCURSES_BOOL data_ahead(
 #undef _nc_Default_Form
 FORM	*_nc_Default_Form;
 
+#undef new_form_sp
+FORM	*new_form_sp(
+		SCREEN	*sp, 
+		FIELD	**fields)
+		{ return(*(FORM **)0); }
+
 #undef new_form
 FORM	*new_form(
 		FIELD	**fields)
@@ -424,6 +430,13 @@ int	field_count(
 
 /* ./frm_driver.c */
 
+#undef _nc_get_fieldbuffer
+void	_nc_get_fieldbuffer(
+		FORM	*form, 
+		FIELD	*field, 
+		cchar_t	*buf)
+		{ /* void */ }
+
 #undef _nc_Position_Form_Cursor
 int	_nc_Position_Form_Cursor(
 		FORM	*form)
@@ -689,9 +702,23 @@ typedef struct
   }
 enumARG;
 
+typedef struct
+  {
+    char **kwds;
+    int ccase;
+    int cunique;
+  }
+enumParams;
+
 #undef TYPE_ENUM
 FIELDTYPE *TYPE_ENUM;
 
+/* ./fty_generic.c */
+
+#undef _nc_fty_generic
+void	_nc_fty_generic(void)
+		{ /* void */ }
+
 /* ./fty_int.c */
 
 typedef struct
@@ -702,6 +729,14 @@ typedef struct
   }
 integerARG;
 
+typedef struct
+  {
+    int precision;
+    long low;
+    long high;
+  }
+integerPARM;
+
 #undef TYPE_INTEGER
 FIELDTYPE *TYPE_INTEGER;
 
@@ -722,6 +757,14 @@ typedef struct
   }
 numericARG;
 
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+  }
+thisPARM;
+
 #undef TYPE_NUMERIC
 FIELDTYPE *TYPE_NUMERIC;
 
diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 215d6d24..261c40d7 100644
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,7 +1,7 @@
 # vile:awkmode
 BEGIN		{
 		    print  "/****************************************************************************"
-		    print  " * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *"
+		    print  " * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *"
 		    print  " *                                                                          *"
 		    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
 		    print  " * copy of this software and associated documentation files (the            *"
@@ -34,7 +34,7 @@ BEGIN		{
 		    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
 		    print  "/****************************************************************************/"
 		    print  ""
-		    print  "/* $Id: MKterm.h.awk.in,v 1.57 2009/05/09 15:54:50 tom Exp $ */"
+		    print  "/* $Id: MKterm.h.awk.in,v 1.58 2010/01/09 19:53:26 tom Exp $ */"
 		    print  ""
 		    print  "/*"
 		    print  "**	term.h -- Definition of struct term"
@@ -309,6 +309,8 @@ END		{
 			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */"
 			print  "#endif"
 			print  ""
+			print  "extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */"
+			print  ""
 			print  "#endif /* __NCURSES_H */"
 			print  ""
 			print  "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */"
diff --git a/include/curses.h.in b/include/curses.h.in
index 3b1ceec6..ac5a400a 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.207 2009/11/07 19:14:00 tom Exp $ */
+/* $Id: curses.h.in,v 1.208 2010/01/09 19:34:26 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -823,6 +823,8 @@ extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,l
 extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
 #endif
 
+extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
+
 /*
  * These functions are not in X/Open, but we use them in macro definitions:
  */
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 4412a6a6..d9ddb03a 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1999-2008,2010 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.30 2008/08/16 20:53:27 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.31 2010/01/09 19:43:39 tom Exp $
 .TH curs_terminfo 3X ""
 .ds n 5
 .na
@@ -42,6 +42,7 @@
 \fBtigetflag\fR,
 \fBtigetnum\fR,
 \fBtigetstr\fR,
+\fBtiparm\fR,
 \fBtparm\fR,
 \fBtputs\fR,
 \fBvid_attr\fR,
@@ -88,6 +89,8 @@
 .br
 \fBchar *tigetstr(char *\fR\fIcapname\fR\fB);\fR
 .br
+\fBchar *tiparm(const char *\fR\fIstr\fR\fB, ...);\fR
+.br
 .fi
 .SH DESCRIPTION
 These low-level routines must be called by programs that have to deal
@@ -196,6 +199,10 @@ The \fBtparm\fR routine instantiates the string \fIstr\fR with
 parameters \fIpi\fR.  A pointer is returned to the result of \fIstr\fR
 with the parameters applied.
 .PP
+\fBtiparm\fP is a newer form of \fBtparm\fP which uses \fI\fP
+rather than a fixed-parameter list.
+Its numeric parameters are integers (int) rather than longs.
+.PP
 The \fBtputs\fR routine applies padding information to the string
 \fIstr\fR and outputs it.  The \fIstr\fR must be a terminfo string
 variable or the return value from \fBtparm\fR, \fBtgetstr\fR, or
@@ -319,10 +326,14 @@ That returns the length of the string, and does no error-checking.
 .PP
 X/Open Curses prototypes \fBtparm\fR with a fixed number of parameters,
 rather than a variable argument list.
-This implementation uses a variable argument list.
+This implementation uses a variable argument list, but can be
+configured to use the fixed-parameter list.
 Portable applications should provide 9 parameters after the format;
 zeroes are fine for this purpose.
 .PP
+In response to comments by Thomas E. Dickey,
+X/Open Curses Issue 7 proposed the \fBtiparam\fP function in mid-2009.
+.PP
 X/Open notes that after calling \fBmvcur\fR, the curses state may not match the
 actual terminal state, and that an application should touch and refresh
 the window before resuming normal curses calls.
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 4bc28c15..651531b0 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.93 2009/10/31 20:45:09 tom Exp $
+.\" $Id: ncurses.3x,v 1.94 2010/01/09 16:34:57 tom Exp $
 .hy 0
 .TH ncurses 3X ""
 .ds n 5
@@ -926,7 +926,7 @@ and is likely to work for terminal emulators.
 .IP
 When setting this variable, you should set it to a nonzero value.
 Setting it to zero (or to a nonnumber)
-disables the special check for Linux and screen.
+disables the special check for "linux" and "screen".
 .TP 5
 NCURSES_TRACE
 During initialization, the \fBncurses\fR debugging library
diff --git a/man/term.7 b/man/term.7
index 7eda6fbd..33d6c735 100644
--- a/man/term.7
+++ b/man/term.7
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.7,v 1.18 2007/06/02 20:40:07 tom Exp $
+.\" $Id: term.7,v 1.19 2010/01/09 16:42:15 tom Exp $
 .TH term 7
 .ds n 5
 .ds d @TERMINFO@
@@ -39,9 +39,9 @@ the terminal, console or display-device type you are using.  This information
 is critical for all screen-oriented programs, including your editor and mailer.
 .PP
 A default \fBTERM\fR value will be set on a per-line basis by either
-\fB/etc/inittab\fR (Linux and System-V-like UNIXes) or \fB/etc/ttys\fR (BSD
-UNIXes).  This will nearly always suffice for workstation and microcomputer
-consoles.
+\fB/etc/inittab\fR (e.g., System-V-like UNIXes)
+or \fB/etc/ttys\fR (BSD UNIXes).
+This will nearly always suffice for workstation and microcomputer consoles.
 .PP
 If you use a dialup line, the type of device attached to it may vary.  Older
 UNIX systems pre-set a very dumb terminal type like `dumb' or `dialup' on
diff --git a/man/tset.1 b/man/tset.1
index 28d385b0..dbf02f9a 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.20 2008/11/15 23:14:06 tom Exp $
+.\" $Id: tset.1,v 1.21 2010/01/09 16:39:45 tom Exp $
 .TH @TSET@ 1 ""
 .SH NAME
 \fBtset\fR, \fBreset\fR - terminal initialization
@@ -44,8 +44,9 @@ This determination is done as follows, using the first terminal type found.
 2. The value of the \fBTERM\fR environmental variable.
 .PP
 3. (BSD systems only.) The terminal type associated with the standard
-error output device in the \fI/etc/ttys\fR file.  (On Linux and
-System-V-like UNIXes, \fIgetty\fR does this job by setting
+error output device in the \fI/etc/ttys\fR file.
+(On System-V-like UNIXes and systems using that convention,
+\fIgetty\fR does this job by setting
 \fBTERM\fR according to the type passed to it by \fI/etc/inittab\fR.)
 .PP
 4. The default terminal type, ``unknown''.
diff --git a/menu/llib-lmenu b/menu/llib-lmenu
index fc17cc36..13ecaf8b 100644
--- a/menu/llib-lmenu
+++ b/menu/llib-lmenu
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2002,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2005,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey        1996-2002,2005                          *
+ *  Author: Thomas E. Dickey        1996-2005,2010                          *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 /* ./m_attribs.c */
 
-#include "menu.priv.h"
+#include 
 
 #undef set_menu_fore
 int	set_menu_fore(
@@ -350,6 +350,12 @@ int	item_count(
 
 /* ./m_new.c */
 
+#undef new_menu_sp
+MENU	*new_menu_sp(
+		SCREEN	*sp, 
+		ITEM	**items)
+		{ return(*(MENU **)0); }
+
 #undef new_menu
 MENU	*new_menu(
 		ITEM	**items)
diff --git a/menu/llib-lmenut b/menu/llib-lmenut
new file mode 100644
index 00000000..951719f4
--- /dev/null
+++ b/menu/llib-lmenut
@@ -0,0 +1,551 @@
+/****************************************************************************
+ * Copyright (c) 2010 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        2010                                    *
+ ****************************************************************************/
+/* LINTLIBRARY */
+
+/* ./m_attribs.c */
+
+#include 
+
+#undef set_menu_fore
+int	set_menu_fore(
+		MENU	*menu, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef menu_fore
+chtype	menu_fore(
+		const MENU *menu)
+		{ return(*(chtype *)0); }
+
+#undef set_menu_back
+int	set_menu_back(
+		MENU	*menu, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef menu_back
+chtype	menu_back(
+		const MENU *menu)
+		{ return(*(chtype *)0); }
+
+#undef set_menu_grey
+int	set_menu_grey(
+		MENU	*menu, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef menu_grey
+chtype	menu_grey(
+		const MENU *menu)
+		{ return(*(chtype *)0); }
+
+/* ./m_cursor.c */
+
+#undef _nc_menu_cursor_pos
+int	_nc_menu_cursor_pos(
+		const MENU *menu, 
+		const ITEM *item, 
+		int	*pY, 
+		int	*pX)
+		{ return(*(int *)0); }
+
+#undef pos_menu_cursor
+int	pos_menu_cursor(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_driver.c */
+
+#undef _nc_Match_Next_Character_In_Item_Name
+int	_nc_Match_Next_Character_In_Item_Name(
+		MENU	*menu, 
+		int	ch, 
+		ITEM	**item)
+		{ return(*(int *)0); }
+
+#undef menu_driver
+int	menu_driver(
+		MENU	*menu, 
+		int	c)
+		{ return(*(int *)0); }
+
+/* ./m_format.c */
+
+#undef set_menu_format
+int	set_menu_format(
+		MENU	*menu, 
+		int	rows, 
+		int	cols)
+		{ return(*(int *)0); }
+
+#undef menu_format
+void	menu_format(
+		const MENU *menu, 
+		int	*rows, 
+		int	*cols)
+		{ /* void */ }
+
+/* ./m_global.c */
+
+#undef _nc_Default_Menu
+MENU	_nc_Default_Menu;
+#undef _nc_Default_Item
+ITEM	_nc_Default_Item;
+
+#undef _nc_Connect_Items
+NCURSES_BOOL _nc_Connect_Items(
+		MENU	*menu, 
+		ITEM	**items)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef _nc_Disconnect_Items
+void	_nc_Disconnect_Items(
+		MENU	*menu)
+		{ /* void */ }
+
+#undef _nc_Calculate_Text_Width
+int	_nc_Calculate_Text_Width(
+		const TEXT *item)
+		{ return(*(int *)0); }
+
+#undef _nc_Calculate_Item_Length_and_Width
+void	_nc_Calculate_Item_Length_and_Width(
+		MENU	*menu)
+		{ /* void */ }
+
+#undef _nc_Link_Items
+void	_nc_Link_Items(
+		MENU	*menu)
+		{ /* void */ }
+
+#undef _nc_Show_Menu
+void	_nc_Show_Menu(
+		const MENU *menu)
+		{ /* void */ }
+
+#undef _nc_New_TopRow_and_CurrentItem
+void	_nc_New_TopRow_and_CurrentItem(
+		MENU	*menu, 
+		int	new_toprow, 
+		ITEM	*new_current_item)
+		{ /* void */ }
+
+/* ./m_hook.c */
+
+#undef set_menu_init
+int	set_menu_init(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef menu_init
+Menu_Hook menu_init(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+#undef set_menu_term
+int	set_menu_term(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef menu_term
+Menu_Hook menu_term(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+#undef set_item_init
+int	set_item_init(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef item_init
+Menu_Hook item_init(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+#undef set_item_term
+int	set_item_term(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef item_term
+Menu_Hook item_term(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+/* ./m_item_cur.c */
+
+#undef set_current_item
+int	set_current_item(
+		MENU	*menu, 
+		ITEM	*item)
+		{ return(*(int *)0); }
+
+#undef current_item
+ITEM	*current_item(
+		const MENU *menu)
+		{ return(*(ITEM **)0); }
+
+#undef item_index
+int	item_index(
+		const ITEM *item)
+		{ return(*(int *)0); }
+
+/* ./m_item_nam.c */
+
+#undef item_name
+const char *item_name(
+		const ITEM *item)
+		{ return(*(const char **)0); }
+
+#undef item_description
+const char *item_description(
+		const ITEM *item)
+		{ return(*(const char **)0); }
+
+/* ./m_item_new.c */
+
+#undef new_item
+ITEM	*new_item(
+		const char *name, 
+		const char *description)
+		{ return(*(ITEM **)0); }
+
+#undef free_item
+int	free_item(
+		ITEM	*item)
+		{ return(*(int *)0); }
+
+#undef set_menu_mark
+int	set_menu_mark(
+		MENU	*menu, 
+		const char *mark)
+		{ return(*(int *)0); }
+
+#undef menu_mark
+const char *menu_mark(
+		const MENU *menu)
+		{ return(*(const char **)0); }
+
+/* ./m_item_opt.c */
+
+#undef set_item_opts
+int	set_item_opts(
+		ITEM	*item, 
+		Item_Options opts)
+		{ return(*(int *)0); }
+
+#undef item_opts_off
+int	item_opts_off(
+		ITEM	*item, 
+		Item_Options opts)
+		{ return(*(int *)0); }
+
+#undef item_opts_on
+int	item_opts_on(
+		ITEM	*item, 
+		Item_Options opts)
+		{ return(*(int *)0); }
+
+#undef item_opts
+Item_Options item_opts(
+		const ITEM *item)
+		{ return(*(Item_Options *)0); }
+
+/* ./m_item_top.c */
+
+#undef set_top_row
+int	set_top_row(
+		MENU	*menu, 
+		int	row)
+		{ return(*(int *)0); }
+
+#undef top_row
+int	top_row(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_item_use.c */
+
+#undef set_item_userptr
+int	set_item_userptr(
+		ITEM	*item, 
+		void	*userptr)
+		{ return(*(int *)0); }
+
+#undef item_userptr
+void	*item_userptr(
+		const ITEM *item)
+		{ return(*(void **)0); }
+
+/* ./m_item_val.c */
+
+#undef set_item_value
+int	set_item_value(
+		ITEM	*item, 
+		NCURSES_BOOL value)
+		{ return(*(int *)0); }
+
+#undef item_value
+NCURSES_BOOL item_value(
+		const ITEM *item)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./m_item_vis.c */
+
+#undef item_visible
+NCURSES_BOOL item_visible(
+		const ITEM *item)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./m_items.c */
+
+#undef set_menu_items
+int	set_menu_items(
+		MENU	*menu, 
+		ITEM	**items)
+		{ return(*(int *)0); }
+
+#undef menu_items
+ITEM	**menu_items(
+		const MENU *menu)
+		{ return(*(ITEM ***)0); }
+
+#undef item_count
+int	item_count(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_new.c */
+
+#undef new_menu_sp
+MENU	*new_menu_sp(
+		SCREEN	*sp, 
+		ITEM	**items)
+		{ return(*(MENU **)0); }
+
+#undef new_menu
+MENU	*new_menu(
+		ITEM	**items)
+		{ return(*(MENU **)0); }
+
+#undef free_menu
+int	free_menu(
+		MENU	*menu)
+		{ return(*(int *)0); }
+
+/* ./m_opts.c */
+
+#undef set_menu_opts
+int	set_menu_opts(
+		MENU	*menu, 
+		Menu_Options opts)
+		{ return(*(int *)0); }
+
+#undef menu_opts_off
+int	menu_opts_off(
+		MENU	*menu, 
+		Menu_Options opts)
+		{ return(*(int *)0); }
+
+#undef menu_opts_on
+int	menu_opts_on(
+		MENU	*menu, 
+		Menu_Options opts)
+		{ return(*(int *)0); }
+
+#undef menu_opts
+Menu_Options menu_opts(
+		const MENU *menu)
+		{ return(*(Menu_Options *)0); }
+
+/* ./m_pad.c */
+
+#undef set_menu_pad
+int	set_menu_pad(
+		MENU	*menu, 
+		int	pad)
+		{ return(*(int *)0); }
+
+#undef menu_pad
+int	menu_pad(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_pattern.c */
+
+#undef menu_pattern
+char	*menu_pattern(
+		const MENU *menu)
+		{ return(*(char **)0); }
+
+#undef set_menu_pattern
+int	set_menu_pattern(
+		MENU	*menu, 
+		const char *p)
+		{ return(*(int *)0); }
+
+/* ./m_post.c */
+
+#undef _nc_Post_Item
+void	_nc_Post_Item(
+		const MENU *menu, 
+		const ITEM *item)
+		{ /* void */ }
+
+#undef _nc_Draw_Menu
+void	_nc_Draw_Menu(
+		const MENU *menu)
+		{ /* void */ }
+
+#undef post_menu
+int	post_menu(
+		MENU	*menu)
+		{ return(*(int *)0); }
+
+#undef unpost_menu
+int	unpost_menu(
+		MENU	*menu)
+		{ return(*(int *)0); }
+
+/* ./m_req_name.c */
+
+#undef menu_request_name
+const char *menu_request_name(
+		int	request)
+		{ return(*(const char **)0); }
+
+#undef menu_request_by_name
+int	menu_request_by_name(
+		const char *str)
+		{ return(*(int *)0); }
+
+/* ./m_scale.c */
+
+#undef scale_menu
+int	scale_menu(
+		const MENU *menu, 
+		int	*rows, 
+		int	*cols)
+		{ return(*(int *)0); }
+
+/* ./m_spacing.c */
+
+#undef set_menu_spacing
+int	set_menu_spacing(
+		MENU	*menu, 
+		int	s_desc, 
+		int	s_row, 
+		int	s_col)
+		{ return(*(int *)0); }
+
+#undef menu_spacing
+int	menu_spacing(
+		const MENU *menu, 
+		int	*s_desc, 
+		int	*s_row, 
+		int	*s_col)
+		{ return(*(int *)0); }
+
+/* ./m_sub.c */
+
+#undef set_menu_sub
+int	set_menu_sub(
+		MENU	*menu, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef menu_sub
+WINDOW	*menu_sub(
+		const MENU *menu)
+		{ return(*(WINDOW **)0); }
+
+/* ./m_trace.c */
+
+#undef _nc_retrace_item
+ITEM	*_nc_retrace_item(
+		ITEM	*code)
+		{ return(*(ITEM **)0); }
+
+#undef _nc_retrace_item_ptr
+ITEM	**_nc_retrace_item_ptr(
+		ITEM	**code)
+		{ return(*(ITEM ***)0); }
+
+#undef _nc_retrace_item_opts
+Item_Options _nc_retrace_item_opts(
+		Item_Options code)
+		{ return(*(Item_Options *)0); }
+
+#undef _nc_retrace_menu
+MENU	*_nc_retrace_menu(
+		MENU	*code)
+		{ return(*(MENU **)0); }
+
+#undef _nc_retrace_menu_hook
+Menu_Hook _nc_retrace_menu_hook(
+		Menu_Hook code)
+		{ return(*(Menu_Hook *)0); }
+
+#undef _nc_retrace_menu_opts
+Menu_Options _nc_retrace_menu_opts(
+		Menu_Options code)
+		{ return(*(Menu_Options *)0); }
+
+/* ./m_userptr.c */
+
+#undef set_menu_userptr
+int	set_menu_userptr(
+		MENU	*menu, 
+		void	*userptr)
+		{ return(*(int *)0); }
+
+#undef menu_userptr
+void	*menu_userptr(
+		const MENU *menu)
+		{ return(*(void **)0); }
+
+/* ./m_win.c */
+
+#undef set_menu_win
+int	set_menu_win(
+		MENU	*menu, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef menu_win
+WINDOW	*menu_win(
+		const MENU *menu)
+		{ return(*(WINDOW **)0); }
diff --git a/menu/llib-lmenutw b/menu/llib-lmenutw
new file mode 100644
index 00000000..0cd559eb
--- /dev/null
+++ b/menu/llib-lmenutw
@@ -0,0 +1,553 @@
+/****************************************************************************
+ * Copyright (c) 2010 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                    2010                        *
+ ****************************************************************************/
+/* LINTLIBRARY */
+
+/* ./m_attribs.c */
+
+#include 
+
+#undef set_menu_fore
+int	set_menu_fore(
+		MENU	*menu, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef menu_fore
+chtype	menu_fore(
+		const MENU *menu)
+		{ return(*(chtype *)0); }
+
+#undef set_menu_back
+int	set_menu_back(
+		MENU	*menu, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef menu_back
+chtype	menu_back(
+		const MENU *menu)
+		{ return(*(chtype *)0); }
+
+#undef set_menu_grey
+int	set_menu_grey(
+		MENU	*menu, 
+		chtype	attr)
+		{ return(*(int *)0); }
+
+#undef menu_grey
+chtype	menu_grey(
+		const MENU *menu)
+		{ return(*(chtype *)0); }
+
+/* ./m_cursor.c */
+
+#undef _nc_menu_cursor_pos
+int	_nc_menu_cursor_pos(
+		const MENU *menu, 
+		const ITEM *item, 
+		int	*pY, 
+		int	*pX)
+		{ return(*(int *)0); }
+
+#undef pos_menu_cursor
+int	pos_menu_cursor(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_driver.c */
+
+#undef _nc_Match_Next_Character_In_Item_Name
+int	_nc_Match_Next_Character_In_Item_Name(
+		MENU	*menu, 
+		int	ch, 
+		ITEM	**item)
+		{ return(*(int *)0); }
+
+#undef menu_driver
+int	menu_driver(
+		MENU	*menu, 
+		int	c)
+		{ return(*(int *)0); }
+
+/* ./m_format.c */
+
+#undef set_menu_format
+int	set_menu_format(
+		MENU	*menu, 
+		int	rows, 
+		int	cols)
+		{ return(*(int *)0); }
+
+#undef menu_format
+void	menu_format(
+		const MENU *menu, 
+		int	*rows, 
+		int	*cols)
+		{ /* void */ }
+
+/* ./m_global.c */
+
+#undef _nc_Default_Menu
+MENU	_nc_Default_Menu;
+#undef _nc_Default_Item
+ITEM	_nc_Default_Item;
+
+#undef _nc_Connect_Items
+NCURSES_BOOL _nc_Connect_Items(
+		MENU	*menu, 
+		ITEM	**items)
+		{ return(*(NCURSES_BOOL *)0); }
+
+#undef _nc_Disconnect_Items
+void	_nc_Disconnect_Items(
+		MENU	*menu)
+		{ /* void */ }
+
+#undef _nc_Calculate_Text_Width
+int	_nc_Calculate_Text_Width(
+		const TEXT *item)
+		{ return(*(int *)0); }
+
+#undef _nc_Calculate_Item_Length_and_Width
+void	_nc_Calculate_Item_Length_and_Width(
+		MENU	*menu)
+		{ /* void */ }
+
+#undef _nc_Link_Items
+void	_nc_Link_Items(
+		MENU	*menu)
+		{ /* void */ }
+
+#undef _nc_Show_Menu
+void	_nc_Show_Menu(
+		const MENU *menu)
+		{ /* void */ }
+
+#undef _nc_New_TopRow_and_CurrentItem
+void	_nc_New_TopRow_and_CurrentItem(
+		MENU	*menu, 
+		int	new_toprow, 
+		ITEM	*new_current_item)
+		{ /* void */ }
+
+/* ./m_hook.c */
+
+#undef set_menu_init
+int	set_menu_init(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef menu_init
+Menu_Hook menu_init(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+#undef set_menu_term
+int	set_menu_term(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef menu_term
+Menu_Hook menu_term(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+#undef set_item_init
+int	set_item_init(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef item_init
+Menu_Hook item_init(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+#undef set_item_term
+int	set_item_term(
+		MENU	*menu, 
+		Menu_Hook func)
+		{ return(*(int *)0); }
+
+#undef item_term
+Menu_Hook item_term(
+		const MENU *menu)
+		{ return(*(Menu_Hook *)0); }
+
+/* ./m_item_cur.c */
+
+#undef set_current_item
+int	set_current_item(
+		MENU	*menu, 
+		ITEM	*item)
+		{ return(*(int *)0); }
+
+#undef current_item
+ITEM	*current_item(
+		const MENU *menu)
+		{ return(*(ITEM **)0); }
+
+#undef item_index
+int	item_index(
+		const ITEM *item)
+		{ return(*(int *)0); }
+
+/* ./m_item_nam.c */
+
+#undef item_name
+const char *item_name(
+		const ITEM *item)
+		{ return(*(const char **)0); }
+
+#undef item_description
+const char *item_description(
+		const ITEM *item)
+		{ return(*(const char **)0); }
+
+/* ./m_item_new.c */
+
+#include 
+
+#undef new_item
+ITEM	*new_item(
+		const char *name, 
+		const char *description)
+		{ return(*(ITEM **)0); }
+
+#undef free_item
+int	free_item(
+		ITEM	*item)
+		{ return(*(int *)0); }
+
+#undef set_menu_mark
+int	set_menu_mark(
+		MENU	*menu, 
+		const char *mark)
+		{ return(*(int *)0); }
+
+#undef menu_mark
+const char *menu_mark(
+		const MENU *menu)
+		{ return(*(const char **)0); }
+
+/* ./m_item_opt.c */
+
+#undef set_item_opts
+int	set_item_opts(
+		ITEM	*item, 
+		Item_Options opts)
+		{ return(*(int *)0); }
+
+#undef item_opts_off
+int	item_opts_off(
+		ITEM	*item, 
+		Item_Options opts)
+		{ return(*(int *)0); }
+
+#undef item_opts_on
+int	item_opts_on(
+		ITEM	*item, 
+		Item_Options opts)
+		{ return(*(int *)0); }
+
+#undef item_opts
+Item_Options item_opts(
+		const ITEM *item)
+		{ return(*(Item_Options *)0); }
+
+/* ./m_item_top.c */
+
+#undef set_top_row
+int	set_top_row(
+		MENU	*menu, 
+		int	row)
+		{ return(*(int *)0); }
+
+#undef top_row
+int	top_row(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_item_use.c */
+
+#undef set_item_userptr
+int	set_item_userptr(
+		ITEM	*item, 
+		void	*userptr)
+		{ return(*(int *)0); }
+
+#undef item_userptr
+void	*item_userptr(
+		const ITEM *item)
+		{ return(*(void **)0); }
+
+/* ./m_item_val.c */
+
+#undef set_item_value
+int	set_item_value(
+		ITEM	*item, 
+		NCURSES_BOOL value)
+		{ return(*(int *)0); }
+
+#undef item_value
+NCURSES_BOOL item_value(
+		const ITEM *item)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./m_item_vis.c */
+
+#undef item_visible
+NCURSES_BOOL item_visible(
+		const ITEM *item)
+		{ return(*(NCURSES_BOOL *)0); }
+
+/* ./m_items.c */
+
+#undef set_menu_items
+int	set_menu_items(
+		MENU	*menu, 
+		ITEM	**items)
+		{ return(*(int *)0); }
+
+#undef menu_items
+ITEM	**menu_items(
+		const MENU *menu)
+		{ return(*(ITEM ***)0); }
+
+#undef item_count
+int	item_count(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_new.c */
+
+#undef new_menu_sp
+MENU	*new_menu_sp(
+		SCREEN	*sp, 
+		ITEM	**items)
+		{ return(*(MENU **)0); }
+
+#undef new_menu
+MENU	*new_menu(
+		ITEM	**items)
+		{ return(*(MENU **)0); }
+
+#undef free_menu
+int	free_menu(
+		MENU	*menu)
+		{ return(*(int *)0); }
+
+/* ./m_opts.c */
+
+#undef set_menu_opts
+int	set_menu_opts(
+		MENU	*menu, 
+		Menu_Options opts)
+		{ return(*(int *)0); }
+
+#undef menu_opts_off
+int	menu_opts_off(
+		MENU	*menu, 
+		Menu_Options opts)
+		{ return(*(int *)0); }
+
+#undef menu_opts_on
+int	menu_opts_on(
+		MENU	*menu, 
+		Menu_Options opts)
+		{ return(*(int *)0); }
+
+#undef menu_opts
+Menu_Options menu_opts(
+		const MENU *menu)
+		{ return(*(Menu_Options *)0); }
+
+/* ./m_pad.c */
+
+#undef set_menu_pad
+int	set_menu_pad(
+		MENU	*menu, 
+		int	pad)
+		{ return(*(int *)0); }
+
+#undef menu_pad
+int	menu_pad(
+		const MENU *menu)
+		{ return(*(int *)0); }
+
+/* ./m_pattern.c */
+
+#undef menu_pattern
+char	*menu_pattern(
+		const MENU *menu)
+		{ return(*(char **)0); }
+
+#undef set_menu_pattern
+int	set_menu_pattern(
+		MENU	*menu, 
+		const char *p)
+		{ return(*(int *)0); }
+
+/* ./m_post.c */
+
+#undef _nc_Post_Item
+void	_nc_Post_Item(
+		const MENU *menu, 
+		const ITEM *item)
+		{ /* void */ }
+
+#undef _nc_Draw_Menu
+void	_nc_Draw_Menu(
+		const MENU *menu)
+		{ /* void */ }
+
+#undef post_menu
+int	post_menu(
+		MENU	*menu)
+		{ return(*(int *)0); }
+
+#undef unpost_menu
+int	unpost_menu(
+		MENU	*menu)
+		{ return(*(int *)0); }
+
+/* ./m_req_name.c */
+
+#undef menu_request_name
+const char *menu_request_name(
+		int	request)
+		{ return(*(const char **)0); }
+
+#undef menu_request_by_name
+int	menu_request_by_name(
+		const char *str)
+		{ return(*(int *)0); }
+
+/* ./m_scale.c */
+
+#undef scale_menu
+int	scale_menu(
+		const MENU *menu, 
+		int	*rows, 
+		int	*cols)
+		{ return(*(int *)0); }
+
+/* ./m_spacing.c */
+
+#undef set_menu_spacing
+int	set_menu_spacing(
+		MENU	*menu, 
+		int	s_desc, 
+		int	s_row, 
+		int	s_col)
+		{ return(*(int *)0); }
+
+#undef menu_spacing
+int	menu_spacing(
+		const MENU *menu, 
+		int	*s_desc, 
+		int	*s_row, 
+		int	*s_col)
+		{ return(*(int *)0); }
+
+/* ./m_sub.c */
+
+#undef set_menu_sub
+int	set_menu_sub(
+		MENU	*menu, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef menu_sub
+WINDOW	*menu_sub(
+		const MENU *menu)
+		{ return(*(WINDOW **)0); }
+
+/* ./m_trace.c */
+
+#undef _nc_retrace_item
+ITEM	*_nc_retrace_item(
+		ITEM	*code)
+		{ return(*(ITEM **)0); }
+
+#undef _nc_retrace_item_ptr
+ITEM	**_nc_retrace_item_ptr(
+		ITEM	**code)
+		{ return(*(ITEM ***)0); }
+
+#undef _nc_retrace_item_opts
+Item_Options _nc_retrace_item_opts(
+		Item_Options code)
+		{ return(*(Item_Options *)0); }
+
+#undef _nc_retrace_menu
+MENU	*_nc_retrace_menu(
+		MENU	*code)
+		{ return(*(MENU **)0); }
+
+#undef _nc_retrace_menu_hook
+Menu_Hook _nc_retrace_menu_hook(
+		Menu_Hook code)
+		{ return(*(Menu_Hook *)0); }
+
+#undef _nc_retrace_menu_opts
+Menu_Options _nc_retrace_menu_opts(
+		Menu_Options code)
+		{ return(*(Menu_Options *)0); }
+
+/* ./m_userptr.c */
+
+#undef set_menu_userptr
+int	set_menu_userptr(
+		MENU	*menu, 
+		void	*userptr)
+		{ return(*(int *)0); }
+
+#undef menu_userptr
+void	*menu_userptr(
+		const MENU *menu)
+		{ return(*(void **)0); }
+
+/* ./m_win.c */
+
+#undef set_menu_win
+int	set_menu_win(
+		MENU	*menu, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+#undef menu_win
+WINDOW	*menu_win(
+		const MENU *menu)
+		{ return(*(WINDOW **)0); }
diff --git a/menu/llib-lmenuw b/menu/llib-lmenuw
index d21fb948..0998f9b0 100644
--- a/menu/llib-lmenuw
+++ b/menu/llib-lmenuw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002,2005 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey                    2002,2005                   *
+ *  Author: Thomas E. Dickey                    2002-2005,2010              *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 /* ./m_attribs.c */
 
-#include "menu.priv.h"
+#include 
 
 #undef set_menu_fore
 int	set_menu_fore(
@@ -352,6 +352,12 @@ int	item_count(
 
 /* ./m_new.c */
 
+#undef new_menu_sp
+MENU	*new_menu_sp(
+		SCREEN	*sp, 
+		ITEM	**items)
+		{ return(*(MENU **)0); }
+
 #undef new_menu
 MENU	*new_menu(
 		ITEM	**items)
diff --git a/mk-0th.awk b/mk-0th.awk
index fe91cca6..5a0bf458 100644
--- a/mk-0th.awk
+++ b/mk-0th.awk
@@ -1,6 +1,6 @@
-# $Id: mk-0th.awk,v 1.17 2005/01/22 16:31:40 tom Exp $
+# $Id: mk-0th.awk,v 1.18 2010/01/09 21:45:41 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2005,2010 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"), #
@@ -27,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey  1996,1997
+# Author: Thomas E. Dickey 1996-on
 #
 # Generate list of sources for a library, together with lint/lintlib rules
 #
@@ -36,9 +36,13 @@
 #	subsets (is used here to decide if wide-character code is used)
 #
 BEGIN	{
+		which = libname;
 		using = 0;
 		found = 0;
 	}
+	/^@/ {
+		which = $0;
+	}
 	!/^[@#]/ {
 		if (using == 0)
 		{
@@ -57,7 +61,11 @@ BEGIN	{
 			print  ""
 			using = 1;
 		}
-		if ( $0 != "" && $1 != "link_test" )
+		if (which ~ /port_/ )
+		{
+			# skip win32 source
+		}
+		else if ( $0 != "" && $1 != "link_test" )
 		{
 			if ( found == 0 )
 			{
diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index 88d13124..e5464e20 100644
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 1996-2009                                      *
+ *  Author: Thomas E. Dickey 1996-2009,2010                                 *
  ****************************************************************************/
 /* LINTLIBRARY */
 
@@ -219,7 +219,6 @@ int	wclrtoeol(
 
 /* ./base/lib_color.c */
 
-#include 
 #include 
 
 #undef COLOR_PAIRS
@@ -1222,11 +1221,21 @@ NCURSES_BOOL is_notimeout(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_pad
+NCURSES_BOOL is_pad(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_scrollok
 NCURSES_BOOL is_scrollok(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_subwin
+NCURSES_BOOL is_subwin(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_syncok
 NCURSES_BOOL is_syncok(
 		const WINDOW *z)
@@ -1264,6 +1273,15 @@ int	set_escdelay(
 		int	value)
 		{ return(*(int *)0); }
 
+#undef get_escdelay_sp
+int	get_escdelay_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef get_escdelay
+int	get_escdelay(void)
+		{ return(*(int *)0); }
+
 #undef _nc_wgetch
 int	_nc_wgetch(
 		WINDOW	*win, 
@@ -1621,15 +1639,6 @@ WINDOW	*_nc_makenew_sp(
 		int	flags)
 		{ return(*(WINDOW **)0); }
 
-#undef _nc_makenew
-WINDOW	*_nc_makenew(
-		int	num_lines, 
-		int	num_columns, 
-		int	begy, 
-		int	begx, 
-		int	flags)
-		{ return(*(WINDOW **)0); }
-
 #undef _nc_curscr_of
 WINDOW	*_nc_curscr_of(
 		SCREEN	*sp)
@@ -1963,6 +1972,16 @@ void	delscreen(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_setupscreen_sp
+int	_nc_setupscreen_sp(
+		SCREEN	**spp, 
+		int	slines, 
+		int	scolumns, 
+		FILE	*output, 
+		NCURSES_BOOL filtered, 
+		int	slk_format)
+		{ return(*(int *)0); }
+
 #undef _nc_setupscreen
 int	_nc_setupscreen(
 		int	slines, 
@@ -2008,6 +2027,12 @@ int	ripoffline(
 
 /* ./base/lib_slk.c */
 
+#undef _nc_format_slks
+int	_nc_format_slks(
+		SCREEN	*sp, 
+		int	cols)
+		{ return(*(int *)0); }
+
 #undef _nc_slk_initialize
 int	_nc_slk_initialize(
 		WINDOW	*stwin, 
@@ -2506,6 +2531,8 @@ void	_nc_free_and_exit(
 
 /* ./expanded.c */
 
+#include 
+
 #undef _nc_toggle_attr_on
 void	_nc_toggle_attr_on(
 		attr_t	*S, 
@@ -2755,7 +2782,32 @@ char	*const numcodes[] = {0};
 #undef strcodes
 char	*const strcodes[] = {0};
 
+/* ./comp_captab.c */
+
+#include 
+
+#undef _nc_get_table
+const struct name_table_entry *_nc_get_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct name_table_entry **)0); }
+
+#undef _nc_get_hash_table
+const HashValue *_nc_get_hash_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashValue **)0); }
+
+#undef _nc_get_alias_table
+const struct alias *_nc_get_alias_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct alias **)0); }
+
+#undef _nc_get_hash_info
+const HashData *_nc_get_hash_info(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashData **)0); }
+
 /* ./tinfo/comp_error.c */
+
 #undef _nc_suppress_warnings
 NCURSES_BOOL _nc_suppress_warnings;
 #undef _nc_curr_line
@@ -2800,6 +2852,21 @@ void	_nc_syserr_abort(
 		...)
 		{ /* void */ }
 
+/* ./tinfo/comp_hash.c */
+
+#undef _nc_find_entry
+struct name_table_entry const *_nc_find_entry(
+		const char *string, 
+		const HashValue *hash_table)
+		{ return(*(struct name_table_entry const **)0); }
+
+#undef _nc_find_type_entry
+struct name_table_entry const *_nc_find_type_entry(
+		const char *string, 
+		int	type, 
+		NCURSES_BOOL termcap)
+		{ return(*(struct name_table_entry const **)0); }
+
 /* ./tinfo/db_iterator.c */
 
 #undef _nc_tic_dir
@@ -2962,6 +3029,12 @@ int	baudrate(void)
 #undef cur_term
 TERMINAL *cur_term;
 
+#undef set_curterm_sp
+TERMINAL *set_curterm_sp(
+		SCREEN	*sp, 
+		TERMINAL *termp)
+		{ return(*(TERMINAL **)0); }
+
 #undef set_curterm
 TERMINAL *set_curterm(
 		TERMINAL *termp)
@@ -3180,12 +3253,6 @@ int	_nc_putp_flush_sp(
 		const char *value)
 		{ return(*(int *)0); }
 
-#undef _nc_putp_flush
-int	_nc_putp_flush(
-		const char *name, 
-		const char *value)
-		{ return(*(int *)0); }
-
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp, 
@@ -3315,6 +3382,12 @@ void	_nc_update_screensize(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_tinfo_cmdch
+void	_nc_tinfo_cmdch(
+		TERMINAL *termp, 
+		char	proto)
+		{ /* void */ }
+
 #undef _nc_get_locale
 char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
@@ -3336,6 +3409,10 @@ int	_nc_setupterm(
 		NCURSES_BOOL reuse)
 		{ return(*(int *)0); }
 
+#undef new_prescr
+SCREEN	*new_prescr(void)
+		{ return(*(SCREEN **)0); }
+
 #undef setupterm
 int	setupterm(
 		char	*tname, 
@@ -3477,6 +3554,12 @@ char	*tparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm
+char	*tiparm(
+		const char *string, 
+		...)
+		{ return(*(char **)0); }
+
 /* ./tinfo/lib_tputs.c */
 
 #undef PC
@@ -4041,25 +4124,6 @@ char	*_nc_infotocap(
 		int const parameterized)
 		{ return(*(char **)0); }
 
-/* ./comp_captab.c */
-
-#include 
-
-#undef _nc_get_table
-const struct name_table_entry *_nc_get_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct name_table_entry **)0); }
-
-#undef _nc_get_hash_table
-const short *_nc_get_hash_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const short **)0); }
-
-#undef _nc_get_alias_table
-const struct alias *_nc_get_alias_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct alias **)0); }
-
 /* ./tinfo/comp_expand.c */
 
 #undef _nc_tic_expand
@@ -4069,21 +4133,6 @@ char	*_nc_tic_expand(
 		int	numbers)
 		{ return(*(char **)0); }
 
-/* ./tinfo/comp_hash.c */
-
-#undef _nc_find_entry
-struct name_table_entry const *_nc_find_entry(
-		const char *string, 
-		const short *hash_table)
-		{ return(*(struct name_table_entry const **)0); }
-
-#undef _nc_find_type_entry
-struct name_table_entry const *_nc_find_type_entry(
-		const char *string, 
-		int	type, 
-		const struct name_table_entry *table)
-		{ return(*(struct name_table_entry const **)0); }
-
 /* ./tinfo/comp_parse.c */
 
 #undef _nc_check_termtype2
diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index 1c98ccdd..ae979d72 100644
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008,2009 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2008-2009,2010 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            *
@@ -219,7 +219,6 @@ int	wclrtoeol(
 
 /* ./base/lib_color.c */
 
-#include 
 #include 
 
 #undef _nc_COLOR_PAIRS
@@ -1225,11 +1224,21 @@ NCURSES_BOOL is_notimeout(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_pad
+NCURSES_BOOL is_pad(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_scrollok
 NCURSES_BOOL is_scrollok(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_subwin
+NCURSES_BOOL is_subwin(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_syncok
 NCURSES_BOOL is_syncok(
 		const WINDOW *z)
@@ -1253,15 +1262,15 @@ NCURSES_BOOL mouse_trafo(
 
 #include 
 
+#undef _nc_ESCDELAY
+int	_nc_ESCDELAY(void)
+		{ return(*(int *)0); }
+
 #undef _nc_ptr_Escdelay
 int	*_nc_ptr_Escdelay(
 		SCREEN	*sp)
 		{ return(*(int **)0); }
 
-#undef _nc_ESCDELAY
-int	_nc_ESCDELAY(void)
-		{ return(*(int *)0); }
-
 #undef set_escdelay_sp
 int	set_escdelay_sp(
 		SCREEN	*sp, 
@@ -1273,6 +1282,15 @@ int	set_escdelay(
 		int	value)
 		{ return(*(int *)0); }
 
+#undef get_escdelay_sp
+int	get_escdelay_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef get_escdelay
+int	get_escdelay(void)
+		{ return(*(int *)0); }
+
 #undef _nc_wgetch
 int	_nc_wgetch(
 		WINDOW	*win, 
@@ -1630,15 +1648,6 @@ WINDOW	*_nc_makenew_sp(
 		int	flags)
 		{ return(*(WINDOW **)0); }
 
-#undef _nc_makenew
-WINDOW	*_nc_makenew(
-		int	num_lines, 
-		int	num_columns, 
-		int	begy, 
-		int	begx, 
-		int	flags)
-		{ return(*(WINDOW **)0); }
-
 #undef _nc_curscr_of
 WINDOW	*_nc_curscr_of(
 		SCREEN	*sp)
@@ -1972,6 +1981,16 @@ void	delscreen(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_setupscreen_sp
+int	_nc_setupscreen_sp(
+		SCREEN	**spp, 
+		int	slines, 
+		int	scolumns, 
+		FILE	*output, 
+		NCURSES_BOOL filtered, 
+		int	slk_format)
+		{ return(*(int *)0); }
+
 #undef _nc_setupscreen
 int	_nc_setupscreen(
 		int	slines, 
@@ -2017,6 +2036,12 @@ int	ripoffline(
 
 /* ./base/lib_slk.c */
 
+#undef _nc_format_slks
+int	_nc_format_slks(
+		SCREEN	*sp, 
+		int	cols)
+		{ return(*(int *)0); }
+
 #undef _nc_slk_initialize
 int	_nc_slk_initialize(
 		WINDOW	*stwin, 
@@ -2515,6 +2540,8 @@ void	_nc_free_and_exit(
 
 /* ./expanded.c */
 
+#include 
+
 #undef _nc_toggle_attr_on
 void	_nc_toggle_attr_on(
 		attr_t	*S, 
@@ -2769,6 +2796,30 @@ char	*const *_nc_numcodes(void)
 char	*const *_nc_strcodes(void)
 		{ return(*(char **)0); }
 
+/* ./comp_captab.c */
+
+#include 
+
+#undef _nc_get_table
+const struct name_table_entry *_nc_get_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct name_table_entry **)0); }
+
+#undef _nc_get_hash_table
+const HashValue *_nc_get_hash_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashValue **)0); }
+
+#undef _nc_get_alias_table
+const struct alias *_nc_get_alias_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct alias **)0); }
+
+#undef _nc_get_hash_info
+const HashData *_nc_get_hash_info(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashData **)0); }
+
 /* ./tinfo/comp_error.c */
 
 #undef _nc_suppress_warnings
@@ -2815,6 +2866,21 @@ void	_nc_syserr_abort(
 		...)
 		{ /* void */ }
 
+/* ./tinfo/comp_hash.c */
+
+#undef _nc_find_entry
+struct name_table_entry const *_nc_find_entry(
+		const char *string, 
+		const HashValue *hash_table)
+		{ return(*(struct name_table_entry const **)0); }
+
+#undef _nc_find_type_entry
+struct name_table_entry const *_nc_find_type_entry(
+		const char *string, 
+		int	type, 
+		NCURSES_BOOL termcap)
+		{ return(*(struct name_table_entry const **)0); }
+
 /* ./tinfo/db_iterator.c */
 
 #undef _nc_tic_dir
@@ -2975,10 +3041,25 @@ int	baudrate(void)
 
 /* ./tinfo/lib_cur_term.c */
 
+#undef _nc_get_cur_term_sp
+TERMINAL *_nc_get_cur_term_sp(
+		SCREEN	*sp)
+		{ return(*(TERMINAL **)0); }
+
+#undef _nc_get_cur_term
+TERMINAL *_nc_get_cur_term(void)
+		{ return(*(TERMINAL **)0); }
+
 #undef _nc_cur_term
 TERMINAL *_nc_cur_term(void)
 		{ return(*(TERMINAL **)0); }
 
+#undef set_curterm_sp
+TERMINAL *set_curterm_sp(
+		SCREEN	*sp, 
+		TERMINAL *termp)
+		{ return(*(TERMINAL **)0); }
+
 #undef set_curterm
 TERMINAL *set_curterm(
 		TERMINAL *termp)
@@ -3230,12 +3311,6 @@ int	_nc_putp_flush_sp(
 		const char *value)
 		{ return(*(int *)0); }
 
-#undef _nc_putp_flush
-int	_nc_putp_flush(
-		const char *name, 
-		const char *value)
-		{ return(*(int *)0); }
-
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp, 
@@ -3387,6 +3462,12 @@ void	_nc_update_screensize(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_tinfo_cmdch
+void	_nc_tinfo_cmdch(
+		TERMINAL *termp, 
+		char	proto)
+		{ /* void */ }
+
 #undef _nc_get_locale
 char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
@@ -3408,6 +3489,10 @@ int	_nc_setupterm(
 		NCURSES_BOOL reuse)
 		{ return(*(int *)0); }
 
+#undef new_prescr
+SCREEN	*new_prescr(void)
+		{ return(*(SCREEN **)0); }
+
 #undef setupterm
 int	setupterm(
 		char	*tname, 
@@ -3549,6 +3634,12 @@ char	*tparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm
+char	*tiparm(
+		const char *string, 
+		...)
+		{ return(*(char **)0); }
+
 /* ./tinfo/lib_tputs.c */
 
 #undef PC
@@ -4149,25 +4240,6 @@ char	*_nc_infotocap(
 		int const parameterized)
 		{ return(*(char **)0); }
 
-/* ./comp_captab.c */
-
-#include 
-
-#undef _nc_get_table
-const struct name_table_entry *_nc_get_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct name_table_entry **)0); }
-
-#undef _nc_get_hash_table
-const short *_nc_get_hash_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const short **)0); }
-
-#undef _nc_get_alias_table
-const struct alias *_nc_get_alias_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct alias **)0); }
-
 /* ./tinfo/comp_expand.c */
 
 #undef _nc_tic_expand
@@ -4177,21 +4249,6 @@ char	*_nc_tic_expand(
 		int	numbers)
 		{ return(*(char **)0); }
 
-/* ./tinfo/comp_hash.c */
-
-#undef _nc_find_entry
-struct name_table_entry const *_nc_find_entry(
-		const char *string, 
-		const short *hash_table)
-		{ return(*(struct name_table_entry const **)0); }
-
-#undef _nc_find_type_entry
-struct name_table_entry const *_nc_find_type_entry(
-		const char *string, 
-		int	type, 
-		const struct name_table_entry *table)
-		{ return(*(struct name_table_entry const **)0); }
-
 /* ./tinfo/comp_parse.c */
 
 #undef _nc_check_termtype2
diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 6943790d..cc01234b 100644
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 2008                                           *
+ *  Author: Thomas E. Dickey 2009,2010                                      *
  ****************************************************************************/
 /* LINTLIBRARY */
 
@@ -256,7 +256,6 @@ int	wclrtoeol(
 
 /* ./base/lib_color.c */
 
-#include 
 #include 
 
 #undef _nc_COLOR_PAIRS
@@ -1274,11 +1273,21 @@ NCURSES_BOOL is_notimeout(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_pad
+NCURSES_BOOL is_pad(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_scrollok
 NCURSES_BOOL is_scrollok(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_subwin
+NCURSES_BOOL is_subwin(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_syncok
 NCURSES_BOOL is_syncok(
 		const WINDOW *z)
@@ -1761,15 +1770,15 @@ NCURSES_BOOL mouse_trafo(
 
 #include 
 
+#undef _nc_ESCDELAY
+int	_nc_ESCDELAY(void)
+		{ return(*(int *)0); }
+
 #undef _nc_ptr_Escdelay
 int	*_nc_ptr_Escdelay(
 		SCREEN	*sp)
 		{ return(*(int **)0); }
 
-#undef _nc_ESCDELAY
-int	_nc_ESCDELAY(void)
-		{ return(*(int *)0); }
-
 #undef set_escdelay_sp
 int	set_escdelay_sp(
 		SCREEN	*sp, 
@@ -1781,6 +1790,15 @@ int	set_escdelay(
 		int	value)
 		{ return(*(int *)0); }
 
+#undef get_escdelay_sp
+int	get_escdelay_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef get_escdelay
+int	get_escdelay(void)
+		{ return(*(int *)0); }
+
 #undef _nc_wgetch
 int	_nc_wgetch(
 		WINDOW	*win, 
@@ -2138,15 +2156,6 @@ WINDOW	*_nc_makenew_sp(
 		int	flags)
 		{ return(*(WINDOW **)0); }
 
-#undef _nc_makenew
-WINDOW	*_nc_makenew(
-		int	num_lines, 
-		int	num_columns, 
-		int	begy, 
-		int	begx, 
-		int	flags)
-		{ return(*(WINDOW **)0); }
-
 #undef _nc_curscr_of
 WINDOW	*_nc_curscr_of(
 		SCREEN	*sp)
@@ -2480,6 +2489,16 @@ void	delscreen(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_setupscreen_sp
+int	_nc_setupscreen_sp(
+		SCREEN	**spp, 
+		int	slines, 
+		int	scolumns, 
+		FILE	*output, 
+		NCURSES_BOOL filtered, 
+		int	slk_format)
+		{ return(*(int *)0); }
+
 #undef _nc_setupscreen
 int	_nc_setupscreen(
 		int	slines, 
@@ -2525,6 +2544,12 @@ int	ripoffline(
 
 /* ./base/lib_slk.c */
 
+#undef _nc_format_slks
+int	_nc_format_slks(
+		SCREEN	*sp, 
+		int	cols)
+		{ return(*(int *)0); }
+
 #undef _nc_slk_initialize
 int	_nc_slk_initialize(
 		WINDOW	*stwin, 
@@ -3146,6 +3171,12 @@ int	win_wchnstr(
 
 /* ./widechar/lib_ins_wch.c */
 
+#undef _nc_insert_wch
+int	_nc_insert_wch(
+		WINDOW	*win, 
+		const cchar_t *wch)
+		{ return(*(int *)0); }
+
 #undef wins_wch
 int	wins_wch(
 		WINDOW	*win, 
@@ -3220,6 +3251,8 @@ int	unget_wch(
 
 /* ./widechar/lib_vid_attr.c */
 
+#include 
+
 #undef vid_puts_sp
 int	vid_puts_sp(
 		SCREEN	*sp, 
@@ -3548,6 +3581,30 @@ char	*const *_nc_numcodes(void)
 char	*const *_nc_strcodes(void)
 		{ return(*(char **)0); }
 
+/* ./comp_captab.c */
+
+#include 
+
+#undef _nc_get_table
+const struct name_table_entry *_nc_get_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct name_table_entry **)0); }
+
+#undef _nc_get_hash_table
+const HashValue *_nc_get_hash_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashValue **)0); }
+
+#undef _nc_get_alias_table
+const struct alias *_nc_get_alias_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct alias **)0); }
+
+#undef _nc_get_hash_info
+const HashData *_nc_get_hash_info(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashData **)0); }
+
 /* ./tinfo/comp_error.c */
 
 #undef _nc_suppress_warnings
@@ -3594,6 +3651,21 @@ void	_nc_syserr_abort(
 		...)
 		{ /* void */ }
 
+/* ./tinfo/comp_hash.c */
+
+#undef _nc_find_entry
+struct name_table_entry const *_nc_find_entry(
+		const char *string, 
+		const HashValue *hash_table)
+		{ return(*(struct name_table_entry const **)0); }
+
+#undef _nc_find_type_entry
+struct name_table_entry const *_nc_find_type_entry(
+		const char *string, 
+		int	type, 
+		NCURSES_BOOL termcap)
+		{ return(*(struct name_table_entry const **)0); }
+
 /* ./tinfo/db_iterator.c */
 
 #undef _nc_tic_dir
@@ -3754,10 +3826,25 @@ int	baudrate(void)
 
 /* ./tinfo/lib_cur_term.c */
 
+#undef _nc_get_cur_term_sp
+TERMINAL *_nc_get_cur_term_sp(
+		SCREEN	*sp)
+		{ return(*(TERMINAL **)0); }
+
+#undef _nc_get_cur_term
+TERMINAL *_nc_get_cur_term(void)
+		{ return(*(TERMINAL **)0); }
+
 #undef _nc_cur_term
 TERMINAL *_nc_cur_term(void)
 		{ return(*(TERMINAL **)0); }
 
+#undef set_curterm_sp
+TERMINAL *set_curterm_sp(
+		SCREEN	*sp, 
+		TERMINAL *termp)
+		{ return(*(TERMINAL **)0); }
+
 #undef set_curterm
 TERMINAL *set_curterm(
 		TERMINAL *termp)
@@ -4009,12 +4096,6 @@ int	_nc_putp_flush_sp(
 		const char *value)
 		{ return(*(int *)0); }
 
-#undef _nc_putp_flush
-int	_nc_putp_flush(
-		const char *name, 
-		const char *value)
-		{ return(*(int *)0); }
-
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp, 
@@ -4166,6 +4247,12 @@ void	_nc_update_screensize(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_tinfo_cmdch
+void	_nc_tinfo_cmdch(
+		TERMINAL *termp, 
+		char	proto)
+		{ /* void */ }
+
 #undef _nc_get_locale
 char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
@@ -4187,6 +4274,10 @@ int	_nc_setupterm(
 		NCURSES_BOOL reuse)
 		{ return(*(int *)0); }
 
+#undef new_prescr
+SCREEN	*new_prescr(void)
+		{ return(*(SCREEN **)0); }
+
 #undef setupterm
 int	setupterm(
 		char	*tname, 
@@ -4328,6 +4419,12 @@ char	*tparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm
+char	*tiparm(
+		const char *string, 
+		...)
+		{ return(*(char **)0); }
+
 /* ./tinfo/lib_tputs.c */
 
 #undef PC
@@ -4961,25 +5058,6 @@ char	*_nc_infotocap(
 		int const parameterized)
 		{ return(*(char **)0); }
 
-/* ./comp_captab.c */
-
-#include 
-
-#undef _nc_get_table
-const struct name_table_entry *_nc_get_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct name_table_entry **)0); }
-
-#undef _nc_get_hash_table
-const short *_nc_get_hash_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const short **)0); }
-
-#undef _nc_get_alias_table
-const struct alias *_nc_get_alias_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct alias **)0); }
-
 /* ./tinfo/comp_expand.c */
 
 #undef _nc_tic_expand
@@ -4989,21 +5067,6 @@ char	*_nc_tic_expand(
 		int	numbers)
 		{ return(*(char **)0); }
 
-/* ./tinfo/comp_hash.c */
-
-#undef _nc_find_entry
-struct name_table_entry const *_nc_find_entry(
-		const char *string, 
-		const short *hash_table)
-		{ return(*(struct name_table_entry const **)0); }
-
-#undef _nc_find_type_entry
-struct name_table_entry const *_nc_find_type_entry(
-		const char *string, 
-		int	type, 
-		const struct name_table_entry *table)
-		{ return(*(struct name_table_entry const **)0); }
-
 /* ./tinfo/comp_parse.c */
 
 #undef _nc_check_termtype2
diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index 9cfd92bd..ffd1c1a3 100644
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 2001-2009                                      *
+ *  Author: Thomas E. Dickey 2001-2009,2010                                 *
  ****************************************************************************/
 /* LINTLIBRARY */
 
@@ -256,7 +256,6 @@ int	wclrtoeol(
 
 /* ./base/lib_color.c */
 
-#include 
 #include 
 
 #undef COLOR_PAIRS
@@ -1271,11 +1270,21 @@ NCURSES_BOOL is_notimeout(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_pad
+NCURSES_BOOL is_pad(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_scrollok
 NCURSES_BOOL is_scrollok(
 		const WINDOW *z)
 		{ return(*(NCURSES_BOOL *)0); }
 
+#undef is_subwin
+NCURSES_BOOL is_subwin(
+		const WINDOW *z)
+		{ return(*(NCURSES_BOOL *)0); }
+
 #undef is_syncok
 NCURSES_BOOL is_syncok(
 		const WINDOW *z)
@@ -1772,6 +1781,15 @@ int	set_escdelay(
 		int	value)
 		{ return(*(int *)0); }
 
+#undef get_escdelay_sp
+int	get_escdelay_sp(
+		SCREEN	*sp)
+		{ return(*(int *)0); }
+
+#undef get_escdelay
+int	get_escdelay(void)
+		{ return(*(int *)0); }
+
 #undef _nc_wgetch
 int	_nc_wgetch(
 		WINDOW	*win, 
@@ -2129,15 +2147,6 @@ WINDOW	*_nc_makenew_sp(
 		int	flags)
 		{ return(*(WINDOW **)0); }
 
-#undef _nc_makenew
-WINDOW	*_nc_makenew(
-		int	num_lines, 
-		int	num_columns, 
-		int	begy, 
-		int	begx, 
-		int	flags)
-		{ return(*(WINDOW **)0); }
-
 #undef _nc_curscr_of
 WINDOW	*_nc_curscr_of(
 		SCREEN	*sp)
@@ -2471,6 +2480,16 @@ void	delscreen(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_setupscreen_sp
+int	_nc_setupscreen_sp(
+		SCREEN	**spp, 
+		int	slines, 
+		int	scolumns, 
+		FILE	*output, 
+		NCURSES_BOOL filtered, 
+		int	slk_format)
+		{ return(*(int *)0); }
+
 #undef _nc_setupscreen
 int	_nc_setupscreen(
 		int	slines, 
@@ -2516,6 +2535,12 @@ int	ripoffline(
 
 /* ./base/lib_slk.c */
 
+#undef _nc_format_slks
+int	_nc_format_slks(
+		SCREEN	*sp, 
+		int	cols)
+		{ return(*(int *)0); }
+
 #undef _nc_slk_initialize
 int	_nc_slk_initialize(
 		WINDOW	*stwin, 
@@ -3137,6 +3162,12 @@ int	win_wchnstr(
 
 /* ./widechar/lib_ins_wch.c */
 
+#undef _nc_insert_wch
+int	_nc_insert_wch(
+		WINDOW	*win, 
+		const cchar_t *wch)
+		{ return(*(int *)0); }
+
 #undef wins_wch
 int	wins_wch(
 		WINDOW	*win, 
@@ -3211,6 +3242,8 @@ int	unget_wch(
 
 /* ./widechar/lib_vid_attr.c */
 
+#include 
+
 #undef vid_puts_sp
 int	vid_puts_sp(
 		SCREEN	*sp, 
@@ -3534,7 +3567,32 @@ char	*const numcodes[] = {0};
 #undef strcodes
 char	*const strcodes[] = {0};
 
+/* ./comp_captab.c */
+
+#include 
+
+#undef _nc_get_table
+const struct name_table_entry *_nc_get_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct name_table_entry **)0); }
+
+#undef _nc_get_hash_table
+const HashValue *_nc_get_hash_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashValue **)0); }
+
+#undef _nc_get_alias_table
+const struct alias *_nc_get_alias_table(
+		NCURSES_BOOL termcap)
+		{ return(*(const struct alias **)0); }
+
+#undef _nc_get_hash_info
+const HashData *_nc_get_hash_info(
+		NCURSES_BOOL termcap)
+		{ return(*(const HashData **)0); }
+
 /* ./tinfo/comp_error.c */
+
 #undef _nc_suppress_warnings
 NCURSES_BOOL _nc_suppress_warnings;
 #undef _nc_curr_line
@@ -3579,6 +3637,21 @@ void	_nc_syserr_abort(
 		...)
 		{ /* void */ }
 
+/* ./tinfo/comp_hash.c */
+
+#undef _nc_find_entry
+struct name_table_entry const *_nc_find_entry(
+		const char *string, 
+		const HashValue *hash_table)
+		{ return(*(struct name_table_entry const **)0); }
+
+#undef _nc_find_type_entry
+struct name_table_entry const *_nc_find_type_entry(
+		const char *string, 
+		int	type, 
+		NCURSES_BOOL termcap)
+		{ return(*(struct name_table_entry const **)0); }
+
 /* ./tinfo/db_iterator.c */
 
 #undef _nc_tic_dir
@@ -3741,6 +3814,12 @@ int	baudrate(void)
 #undef cur_term
 TERMINAL *cur_term;
 
+#undef set_curterm_sp
+TERMINAL *set_curterm_sp(
+		SCREEN	*sp, 
+		TERMINAL *termp)
+		{ return(*(TERMINAL **)0); }
+
 #undef set_curterm
 TERMINAL *set_curterm(
 		TERMINAL *termp)
@@ -3959,12 +4038,6 @@ int	_nc_putp_flush_sp(
 		const char *value)
 		{ return(*(int *)0); }
 
-#undef _nc_putp_flush
-int	_nc_putp_flush(
-		const char *name, 
-		const char *value)
-		{ return(*(int *)0); }
-
 #undef _nc_keypad
 int	_nc_keypad(
 		SCREEN	*sp, 
@@ -4094,6 +4167,12 @@ void	_nc_update_screensize(
 		SCREEN	*sp)
 		{ /* void */ }
 
+#undef _nc_tinfo_cmdch
+void	_nc_tinfo_cmdch(
+		TERMINAL *termp, 
+		char	proto)
+		{ /* void */ }
+
 #undef _nc_get_locale
 char	*_nc_get_locale(void)
 		{ return(*(char **)0); }
@@ -4115,6 +4194,10 @@ int	_nc_setupterm(
 		NCURSES_BOOL reuse)
 		{ return(*(int *)0); }
 
+#undef new_prescr
+SCREEN	*new_prescr(void)
+		{ return(*(SCREEN **)0); }
+
 #undef setupterm
 int	setupterm(
 		char	*tname, 
@@ -4256,6 +4339,12 @@ char	*tparm(
 		...)
 		{ return(*(char **)0); }
 
+#undef tiparm
+char	*tiparm(
+		const char *string, 
+		...)
+		{ return(*(char **)0); }
+
 /* ./tinfo/lib_tputs.c */
 
 #undef PC
@@ -4853,25 +4942,6 @@ char	*_nc_infotocap(
 		int const parameterized)
 		{ return(*(char **)0); }
 
-/* ./comp_captab.c */
-
-#include 
-
-#undef _nc_get_table
-const struct name_table_entry *_nc_get_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct name_table_entry **)0); }
-
-#undef _nc_get_hash_table
-const short *_nc_get_hash_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const short **)0); }
-
-#undef _nc_get_alias_table
-const struct alias *_nc_get_alias_table(
-		NCURSES_BOOL termcap)
-		{ return(*(const struct alias **)0); }
-
 /* ./tinfo/comp_expand.c */
 
 #undef _nc_tic_expand
@@ -4881,21 +4951,6 @@ char	*_nc_tic_expand(
 		int	numbers)
 		{ return(*(char **)0); }
 
-/* ./tinfo/comp_hash.c */
-
-#undef _nc_find_entry
-struct name_table_entry const *_nc_find_entry(
-		const char *string, 
-		const short *hash_table)
-		{ return(*(struct name_table_entry const **)0); }
-
-#undef _nc_find_type_entry
-struct name_table_entry const *_nc_find_type_entry(
-		const char *string, 
-		int	type, 
-		const struct name_table_entry *table)
-		{ return(*(struct name_table_entry const **)0); }
-
 /* ./tinfo/comp_parse.c */
 
 #undef _nc_check_termtype2
diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 806b21c1..d763ab9b 100644
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2010 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_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.78 2010/01/09 19:52:08 tom Exp $")
 
 /*
  *	char *
@@ -450,7 +450,7 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
 }
 
 static NCURSES_INLINE char *
-tparam_internal(const char *string, va_list ap)
+tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
 {
     char *p_is_s[NUM_PARM];
     TPARM_ARG param[NUM_PARM];
@@ -488,8 +488,10 @@ tparam_internal(const char *string, va_list ap)
 	 */
 	if (p_is_s[i] != 0) {
 	    p_is_s[i] = va_arg(ap, char *);
-	} else {
+	} else if (use_TPARM_ARG) {
 	    param[i] = va_arg(ap, TPARM_ARG);
+	} else {
+	    param[i] = (TPARM_ARG) va_arg(ap, int);
 	}
     }
 
@@ -771,7 +773,7 @@ tparm_varargs(NCURSES_CONST char *string,...)
 #ifdef TRACE
     TPS(tname) = "tparm";
 #endif /* TRACE */
-    result = tparam_internal(string, ap);
+    result = tparam_internal(TRUE, string, ap);
     va_end(ap);
     return result;
 }
@@ -792,3 +794,19 @@ tparm_proto(NCURSES_CONST char *string,
     return tparm_varargs(string, a1, a2, a3, a4, a5, a6, a7, a8, a9);
 }
 #endif /* NCURSES_TPARM_VARARGS */
+
+NCURSES_EXPORT(char *)
+tiparm(const char *string,...)
+{
+    va_list ap;
+    char *result;
+
+    _nc_tparm_err = 0;
+    va_start(ap, string);
+#ifdef TRACE
+    TPS(tname) = "tiparm";
+#endif /* TRACE */
+    result = tparam_internal(FALSE, string, ap);
+    va_end(ap);
+    return result;
+}
diff --git a/panel/llib-lpanel b/panel/llib-lpanel
index de49c234..85371ec7 100644
--- a/panel/llib-lpanel
+++ b/panel/llib-lpanel
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey        1997,2002,2005                          *
+ *  Author: Thomas E. Dickey        1997,2005,2010                          *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 /* ./panel.c */
 
-#include "panel.priv.h"
+#include 
 
 #undef _nc_retrace_panel
 PANEL	*_nc_retrace_panel(
@@ -77,6 +77,11 @@ void	_nc_Touchline(
 
 /* ./p_above.c */
 
+#undef ground_panel
+PANEL	*ground_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
 #undef panel_above
 PANEL	*panel_above(
 		const PANEL *pan)
@@ -84,6 +89,11 @@ PANEL	*panel_above(
 
 /* ./p_below.c */
 
+#undef ceiling_panel
+PANEL	*ceiling_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
 #undef panel_below
 PANEL	*panel_below(
 		const PANEL *pan)
@@ -157,6 +167,11 @@ int	top_panel(
 
 /* ./p_update.c */
 
+#undef update_panels_sp
+void	update_panels_sp(
+		SCREEN	*sp)
+		{ /* void */ }
+
 #undef update_panels
 void	update_panels(void)
 		{ /* void */ }
diff --git a/panel/llib-lpanelt b/panel/llib-lpanelt
new file mode 100644
index 00000000..8fcd42c9
--- /dev/null
+++ b/panel/llib-lpanelt
@@ -0,0 +1,197 @@
+/****************************************************************************
+ * Copyright (c) 2010 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        2010                                    *
+ ****************************************************************************/
+/* LINTLIBRARY */
+
+/* ./panel.c */
+
+#include 
+
+#undef _nc_retrace_panel
+PANEL	*_nc_retrace_panel(
+		PANEL	*pan)
+		{ return(*(PANEL **)0); }
+
+#undef _nc_my_visbuf
+const char *_nc_my_visbuf(
+		const void *ptr)
+		{ return(*(const char **)0); }
+
+#undef _nc_dPanel
+void	_nc_dPanel(
+		const char *text, 
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_dStack
+void	_nc_dStack(
+		const char *fmt, 
+		int	num, 
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_Wnoutrefresh
+void	_nc_Wnoutrefresh(
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_Touchpan
+void	_nc_Touchpan(
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_Touchline
+void	_nc_Touchline(
+		const PANEL *pan, 
+		int	start, 
+		int	count)
+		{ /* void */ }
+
+/* ./p_above.c */
+
+#undef ground_panel
+PANEL	*ground_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
+#undef panel_above
+PANEL	*panel_above(
+		const PANEL *pan)
+		{ return(*(PANEL **)0); }
+
+/* ./p_below.c */
+
+#undef ceiling_panel
+PANEL	*ceiling_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
+#undef panel_below
+PANEL	*panel_below(
+		const PANEL *pan)
+		{ return(*(PANEL **)0); }
+
+/* ./p_bottom.c */
+
+#undef bottom_panel
+int	bottom_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_delete.c */
+
+#undef del_panel
+int	del_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_hide.c */
+
+#undef hide_panel
+int	hide_panel(
+		 PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_hidden.c */
+
+#undef panel_hidden
+int	panel_hidden(
+		const PANEL *pan)
+		{ return(*(int *)0); }
+
+/* ./p_move.c */
+
+#undef move_panel
+int	move_panel(
+		PANEL	*pan, 
+		int	starty, 
+		int	startx)
+		{ return(*(int *)0); }
+
+/* ./p_new.c */
+
+#undef new_panel
+PANEL	*new_panel(
+		WINDOW	*win)
+		{ return(*(PANEL **)0); }
+
+/* ./p_replace.c */
+
+#undef replace_panel
+int	replace_panel(
+		PANEL	*pan, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+/* ./p_show.c */
+
+#undef show_panel
+int	show_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_top.c */
+
+#undef top_panel
+int	top_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_update.c */
+
+#undef update_panels_sp
+void	update_panels_sp(
+		SCREEN	*sp)
+		{ /* void */ }
+
+#undef update_panels
+void	update_panels(void)
+		{ /* void */ }
+
+/* ./p_user.c */
+
+#undef set_panel_userptr
+int	set_panel_userptr(
+		PANEL	*pan, 
+		void	*uptr)
+		{ return(*(int *)0); }
+
+#undef panel_userptr
+void	*panel_userptr(
+		const PANEL *pan)
+		{ return(*(void **)0); }
+
+/* ./p_win.c */
+
+#undef panel_window
+WINDOW	*panel_window(
+		const PANEL *pan)
+		{ return(*(WINDOW **)0); }
diff --git a/panel/llib-lpaneltw b/panel/llib-lpaneltw
new file mode 100644
index 00000000..1d3cd8d8
--- /dev/null
+++ b/panel/llib-lpaneltw
@@ -0,0 +1,197 @@
+/****************************************************************************
+ * Copyright (c) 2010 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                    2010                        *
+ ****************************************************************************/
+/* LINTLIBRARY */
+
+/* ./panel.c */
+
+#include 
+
+#undef _nc_retrace_panel
+PANEL	*_nc_retrace_panel(
+		PANEL	*pan)
+		{ return(*(PANEL **)0); }
+
+#undef _nc_my_visbuf
+const char *_nc_my_visbuf(
+		const void *ptr)
+		{ return(*(const char **)0); }
+
+#undef _nc_dPanel
+void	_nc_dPanel(
+		const char *text, 
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_dStack
+void	_nc_dStack(
+		const char *fmt, 
+		int	num, 
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_Wnoutrefresh
+void	_nc_Wnoutrefresh(
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_Touchpan
+void	_nc_Touchpan(
+		const PANEL *pan)
+		{ /* void */ }
+
+#undef _nc_Touchline
+void	_nc_Touchline(
+		const PANEL *pan, 
+		int	start, 
+		int	count)
+		{ /* void */ }
+
+/* ./p_above.c */
+
+#undef ground_panel
+PANEL	*ground_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
+#undef panel_above
+PANEL	*panel_above(
+		const PANEL *pan)
+		{ return(*(PANEL **)0); }
+
+/* ./p_below.c */
+
+#undef ceiling_panel
+PANEL	*ceiling_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
+#undef panel_below
+PANEL	*panel_below(
+		const PANEL *pan)
+		{ return(*(PANEL **)0); }
+
+/* ./p_bottom.c */
+
+#undef bottom_panel
+int	bottom_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_delete.c */
+
+#undef del_panel
+int	del_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_hide.c */
+
+#undef hide_panel
+int	hide_panel(
+		 PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_hidden.c */
+
+#undef panel_hidden
+int	panel_hidden(
+		const PANEL *pan)
+		{ return(*(int *)0); }
+
+/* ./p_move.c */
+
+#undef move_panel
+int	move_panel(
+		PANEL	*pan, 
+		int	starty, 
+		int	startx)
+		{ return(*(int *)0); }
+
+/* ./p_new.c */
+
+#undef new_panel
+PANEL	*new_panel(
+		WINDOW	*win)
+		{ return(*(PANEL **)0); }
+
+/* ./p_replace.c */
+
+#undef replace_panel
+int	replace_panel(
+		PANEL	*pan, 
+		WINDOW	*win)
+		{ return(*(int *)0); }
+
+/* ./p_show.c */
+
+#undef show_panel
+int	show_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_top.c */
+
+#undef top_panel
+int	top_panel(
+		PANEL	*pan)
+		{ return(*(int *)0); }
+
+/* ./p_update.c */
+
+#undef update_panels_sp
+void	update_panels_sp(
+		SCREEN	*sp)
+		{ /* void */ }
+
+#undef update_panels
+void	update_panels(void)
+		{ /* void */ }
+
+/* ./p_user.c */
+
+#undef set_panel_userptr
+int	set_panel_userptr(
+		PANEL	*pan, 
+		void	*uptr)
+		{ return(*(int *)0); }
+
+#undef panel_userptr
+void	*panel_userptr(
+		const PANEL *pan)
+		{ return(*(void **)0); }
+
+/* ./p_win.c */
+
+#undef panel_window
+WINDOW	*panel_window(
+		const PANEL *pan)
+		{ return(*(WINDOW **)0); }
diff --git a/panel/llib-lpanelw b/panel/llib-lpanelw
index 48bd1e0d..503b3434 100644
--- a/panel/llib-lpanelw
+++ b/panel/llib-lpanelw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002,2005 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey                    2002,2005                   *
+ *  Author: Thomas E. Dickey                    2002-2005,2010              *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 /* ./panel.c */
 
-#include "panel.priv.h"
+#include 
 
 #undef _nc_retrace_panel
 PANEL	*_nc_retrace_panel(
@@ -77,6 +77,11 @@ void	_nc_Touchline(
 
 /* ./p_above.c */
 
+#undef ground_panel
+PANEL	*ground_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
 #undef panel_above
 PANEL	*panel_above(
 		const PANEL *pan)
@@ -84,6 +89,11 @@ PANEL	*panel_above(
 
 /* ./p_below.c */
 
+#undef ceiling_panel
+PANEL	*ceiling_panel(
+		SCREEN	*sp)
+		{ return(*(PANEL **)0); }
+
 #undef panel_below
 PANEL	*panel_below(
 		const PANEL *pan)
@@ -157,6 +167,11 @@ int	top_panel(
 
 /* ./p_update.c */
 
+#undef update_panels_sp
+void	update_panels_sp(
+		SCREEN	*sp)
+		{ /* void */ }
+
 #undef update_panels
 void	update_panels(void)
 		{ /* void */ }
diff --git a/progs/tput.c b/progs/tput.c
index 149225d2..2e67cfec 100644
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -47,7 +47,7 @@
 #endif
 #include 
 
-MODULE_ID("$Id: tput.c,v 1.45 2009/12/27 16:36:12 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.46 2010/01/09 16:53:24 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 #define PUTCHAR(c)	putchar(c)
diff --git a/test/ncurses.c b/test/ncurses.c
index b4fb7fab..eff12d4b 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond  1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.353 2009/12/20 02:14:17 tom Exp $
+$Id: ncurses.c,v 1.355 2010/01/09 16:52:17 tom Exp $
 
 ***************************************************************************/
 
@@ -6595,8 +6595,8 @@ main_menu(bool top)
 	(void) fflush(stdout);	/* necessary under SVr4 curses */
 
 	/*
-	 * This used to be an 'fgets()' call.  However (on Linux, at least)
-	 * mixing stream I/O and 'read()' (used in the library) causes the
+	 * This used to be an 'fgets()' call (until 1996/10).  However with
+	 * some runtime libraries, mixing stream I/O and 'read()' causes the
 	 * input stream to be flushed when switching between the two.
 	 */
 	command = 0;
diff --git a/test/view.c b/test/view.c
index 5b52e980..e759a9b2 100644
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -50,7 +50,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.76 2009/10/24 21:26:38 tom Exp $
+ * $Id: view.c,v 1.77 2010/01/09 16:34:06 tom Exp $
  */
 
 #include 
@@ -500,12 +500,11 @@ finish(int sig)
 
 #if CAN_RESIZE
 /*
- * This uses functions that are "unsafe", but it seems to work on SunOS and
- * Linux.  Usually:  the "unsafe" refers to the functions that POSIX lists
- * which may be called from a signal handler.  Those do not include buffered
- * I/O, which is used for instance in wrefresh().  To be really portable, you
- * should use the KEY_RESIZE return (which relies on ncurses' sigwinch
- * handler).
+ * This uses functions that are "unsafe", but it seems to work on SunOS. 
+ * Usually: the "unsafe" refers to the functions that POSIX lists which may be
+ * called from a signal handler.  Those do not include buffered I/O, which is
+ * used for instance in wrefresh().  To be really portable, you should use the
+ * KEY_RESIZE return (which relies on ncurses' sigwinch handler).
  *
  * The 'wrefresh(curscr)' is needed to force the refresh to start from the top
  * of the screen -- some xterms mangle the bitmap while resizing.
@@ -518,7 +517,7 @@ adjust(int sig)
 
 	if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
 	    resize_term(size.ws_row, size.ws_col);
-	    wrefresh(curscr);	/* Linux needs this */
+	    wrefresh(curscr);
 	    show_all(sig ? "SIGWINCH" : "interrupt");
 	}
 	interrupted = FALSE;
    C nameAda nameman page
    _nc_freeall()Curses_Free_Allcurs_trace.3x
    _tracef()Trace_Putcurs_trace.3x
    assume_default_colors()Assume_Default_Colorsdefault_colors.3x
    baudrate()Baudratecurs_termattrs.3x
    beep()Beepcurs_beep.3x
    copywin()Copycurs_overlay.3x
    current_field()Currentform_page.3x
    current_item()Currentmitem_current.3x
    curs_set()Set_Cursor_Visibilitycurs_kernel.3x
    curscrCurrent_Windowcurs_initscr.3x
    curses_version()Curses_Versioncurs_extend.3x
    curs_set()Set_Cursor_Visibilitycurs_kernel.3x
    data_ahead()Data_Aheadform_data.3x
    data_behind()Data_Behindform_data.3x
    define_key()Define_Keydefine_key.3x
    def_prog_mode()Save_Curses_Modecurs_kernel.3x
    delay_output()Delay_Outputcurs_util.3x
    define_key()Define_Keydefine_key.3x
    del_panel()Deletepanel.3x
    delay_output()Delay_Outputcurs_util.3x
    delwin()Deletecurs_window.3x
    derwin()Derived_Windowcurs_window.3x
    doupdate()Update_Screencurs_refresh.3x
    field_info()Infoform_field_info.3x
    field_init()Get_Field_Init_Hookform_hook.3x
    field_just()Get_Justificationform_field_just.3x
    field_opts_on()Switch_Optionsform_field_opts.3x
    field_opts()Get_Optionsform_field_opts.3x
    field_opts()Get_Optionsform_field_opts.3x
    field_opts_on()Switch_Optionsform_field_opts.3x
    field_pad()Pad_Characterform_field_attributes.3x
    field_status()Changedform_field_buffer.3x
    field_term()Get_Field_Term_Hookform_hook.3x
    form_driver()Driverform_driver.3x
    form_fields()Fieldsform_field.3x
    form_init()Get_Form_Init_Hookform_hook.3x
    form_opts_on()Switch_Optionsform_opts.3x
    form_opts()Get_Optionsform_opts.3x
    form_opts()Get_Optionsform_opts.3x
    form_opts_on()Switch_Optionsform_opts.3x
    form_page()Pageform_page.3x
    form_sub()Get_Sub_Windowform_win.3x
    form_term()Get_Form_Term_Hookform_hook.3x
    initscr()Init_Screencurs_initscr.3x
    initscr()Init_Windowscurs_initscr.3x
    intrflush()Set_Flush_On_Interrupt_Modecurs_inopts.3x
    isendwin()Is_End_Windowcurs_initscr.3x
    is_linetouched()Is_Touchedcurs_touch.3x
    is_wintouched()Is_Touchedcurs_touch.3x
    isendwin()Is_End_Windowcurs_initscr.3x
    item_count()Item_Countmenu_items.3x
    item_description();Descriptionmitem_name.3x
    item_index()Get_Indexmitem_current.3x
    item_init()Get_Item_Init_Hookmenu_hook.3x
    item_name()Namemitem_name.3x
    item_opts_on()Switch_Optionsmitem_opts.3x
    item_opts()Get_Optionsmitem_opts.3x
    item_opts()Get_Optionsmitem_opts.3x
    item_opts_on()Switch_Optionsmitem_opts.3x
    item_term()Get_Item_Term_Hookmenu_hook.3x
    item_userptrGet_User_Datamitem_userptr.3x
    item_userptrGet_User_Datamitem_userptr.3x
    menu_init()Get_Menu_Init_Hookmenu_hook.3x
    menu_items()Itemsmenu_items.3x
    menu_mark()Markmenu_mark.3x
    menu_opts_on()Switch_Optionsmenu_opts.3x
    menu_opts()Get_Optionsmenu_opts.3x
    menu_opts()Get_Optionsmenu_opts.3x
    menu_opts_on()Switch_Optionsmenu_opts.3x
    menu_pad()Pad_Charactermenu_attributes.3x
    menu_pattern()Patternmenu_pattern.3x
    menu_requestname.3xmenu_driver.3x
    move_field()Moveform_field.3x
    move_panel()Movepanel.3x
    mvderwin()Move_Derived_Windowcurs_window.3x
    mvwaddchnstr()Addcurs_addchstr.3x
    mvwaddch()Addcurs_addch.3x
    mvwaddchnstr()Addcurs_addchstr.3x
    mvwaddnstr()Addcurs_addstr.3x
    mvwchgat()Change_Attributescurs_attr.3x
    mvwdelch()Delete_Charactercurs_delch.3x
    mvwgetnstr()Getcurs_getstr.3x
    mvwinchnstr()Peekcurs_inchstr.3x
    mvwin()Move_Windowcurs_window.3x
    mvwinch()Peekcurs_inch.3x
    mvwinchnstr()Peekcurs_inchstr.3x
    mvwinnstr()Peekcurs_instr.3x
    mvwinsch()Insertcurs_insch.3x
    mvwinsnstr()Insertcurs_insstr.3x
    mvwin()Move_Windowcurs_window.3x
    napms()Nap_Milli_Secondscurs_kernel.3x
    _nc_freeall()Curses_Free_Allcurs_trace.3x
    new_field()Createform_field_new.3x
    new_field()New_Fieldform_field_new.3x
    new_form()Createform_new.3x
    new_item()Createmitem_new.3x
    new_item()New_Itemmitem_new.3x
    new_menu()Createmenu_new.3x
    newpad()New_Padcurs_pad.3x
    new_page()Is_New_Pageform_new_page.3x
    new_panel()Createpanel.3x
    new_panel()New_Panelpanel.3x
    newpad()New_Padcurs_pad.3x
    newwin()Createcurs_window.3x
    nl()Set_NL_Modecurs_outopts.3x
    nodelay()Set_NoDelay_Modecurs_inopts.3x
    scale_menu()Scalemenu_win.3x
    scr_dump()Screen_Dump_To_Filecurs_scr_dump.3x
    scr_init()Screen_Init_From_Filecurs_scr_dump.3x
    scrollok()Allow_Scrollingcurs_outopts.3x
    scr_restore()Screen_Restore_From_Filecurs_scr_dump.3x
    scr_set()Screen_Set_Filecurs_scr_dump.3x
    scrollok()Allow_Scrollingcurs_outopts.3x
    set_current_field()Set_Currentform_page.3x
    set_current_item()Set_Currentmitem_current.3x
    set_field_back()Set_Backgroundform_field_attributes.3x
    set_panel_userptrSet_User_Datapanel.3x
    set_top_row()Set_Top_Rowmitem_current.3x
    show_panel()Showpanel.3x
    slk_attron()Switch_Soft_Label_Key_Attributescurs_slk.3x
    slk_attrset()Set_Soft_Label_Key_Attributescurs_slk.3x
    slk_attr()Get_Soft_Label_Key_Attributescurs_slk.3x
    slk_attr()Get_Soft_Label_Key_Attributescurs_slk.3x
    slk_attron()Switch_Soft_Label_Key_Attributescurs_slk.3x
    slk_attrset()Set_Soft_Label_Key_Attributescurs_slk.3x
    slk_clear()Clear_Soft_Label_Keyscurs_slk.3x
    slk_color()Set_Soft_Label_Key_Colorcurs_slk.3x
    slk_init()Init_Soft_Label_Keyscurs_slk.3x
    top_row()Top_Rowmitem_current.3x
    touchline()Touchcurs_touch.3x
    touchwin()Touchcurs_touch.3x
    _tracef()Trace_Putcurs_trace.3x
    trace()Trace_oncurs_trace.3x
    unctrl()Un_Controlcurs_util.3x
    unctrl()Un_Controlcurs_util.3x
    update_panels()Update_Panelspanel.3x
    use_default_colors()Use_Default_Colorsdefault_colors.3x
    use_extended_names()Use_Extended_Namescurs_extend.3x
    waddchnstr()Addcurs_addchstr.3x
    waddch()Addcurs_addch.3x
    waddchnstr()Addcurs_addchstr.3x
    waddnstr()Addcurs_addstr.3x
    wattr_get()Get_Character_Attributescurs_attr.3x
    wattr_get()Get_Character_Attributecurs_attr.3x
    wattron()Switch_Character_Attributecurs_attr.3x
    wattrset()Set_Character_Attributescurs_attr.3x
    wbkgd()Change_Backgroundcurs_bkgd.3x
    wbkgdget()Get_Backgroundcurs_bkgd.3x
    wbkgdset()Set_Backgroundcurs_bkgd.3x
    wbkgd()Change_Backgroundcurs_bkgd.3x
    wborder()Bordercurs_border.3x
    wchgat()Change_Attributescurs_attr.3x
    wclear()Clearcurs_clear.3x
    wgetch()Get_Keystrokecurs_getch.3x
    wgetnstr()Getcurs_getstr.3x
    whline()Horizontal_Linecurs_border.3x
    winchnstr()Peekcurs_inchstr.3x
    winch()Peekcurs_inch.3x
    winchnstr()Peekcurs_inchstr.3x
    winnstr()Peekcurs_instr.3x
    winsch()Insertcurs_insch.3x
    winsdelln()Insert_Delete_Linescurs_deleteln.3x