diff options
95 files changed, 4239 insertions, 2989 deletions
diff --git a/contrib/dialog/CHANGES b/contrib/dialog/CHANGES index b839088..ea89632 100644 --- a/contrib/dialog/CHANGES +++ b/contrib/dialog/CHANGES @@ -1,9 +1,172 @@ --- $Id: CHANGES,v 1.360 2011/07/07 23:35:10 tom Exp $ +-- $Id: CHANGES,v 1.419 2012/07/06 18:18:48 tom Exp $ -- Thomas E. Dickey <dickey@invisible-island.net> This version of dialog was originally from a Debian snapshot. I've done this to it: +2012/07/06 + + modify samples/setup-tempfile to work with Tru64's shell. + + modify inputmenu sample scripts to make them more portable: + + use "id" rather than "$GROUPS", use sed to work with Solaris. + + use sed to split-up the rename results to work with HPUX. + + fix regression in msgbox (ArchLinux #30574) + +2012/07/03 + + modify prgbox widget to work with --extra-button, etc. + + add case values to several widgets to allow for mouse-clicks with + "--extra-button" and "--help-button" additions. + + correct timebox widget's exit code for "--extra-button" when handing + the "enter" key. + + modify msgbox widget to honor "--extra-button". + + corrected processing of "--trace" option, which did not update the + index into command-line to point past its value. + + add a check in dialog program for valid characters used in option, + e.g., to generate an error if a script attempts to add option value + using "=" rather than with whitespace. + + add new command-line option --default-button and library function + dlg_default_button() to retrieve the value set by the option + to provide a way to set the default button directly rather than + by combining --nook, etc. (patch by Zoltan Kelemen). + + amend include of unctrl.h to apply only to the case where curses.h + is included, to avoid conflict of ncurses' unctrl.h with a system + implementation (report by Martin Roedlach) + + add limit-check to dlg_toupper() in non-wide curses mode to work + when non-character values such as arrow-key codes are passed to + it (patch by Zoltan Kelemen). + + override timeout value, e.g., as set via --timeout command-line + option in pause widget because that interferes with pause's behavior + (report by Jan Spitalnik). + + modify samples/inputmenu* to allow ":" in renamed text (report by + Andreas Stoewing). + + modify double-quoting to make it more consistent, i.e., checklist + output is quoted only when needed. This fixes the case where + single-quotes were used whether or not needed, but also modifies + older checklist behavior for double-quoting which always added those + (Debian #663664). + + correct exit-code used in inputmenu for "rename" button (Debian + #673041, forwarded from Ubuntu #333909, patch by Lebedev Vadim). + + update el.po and hr.po from + http://translationproject.org/latest/dialog/ + + use checkbashisms to clean up sample scripts. + +2012/02/15 + + modify menubox.c to use the same improvement as in checklist.c + + improve auto width computation for checklist widget by using + dlg_calc_list_width as in the non-auto case (Edho Arief). + + eliminate some bashisms in the sample scripts (Pedro Giffuni). + + makefile fixes from FreeBSD ports (Li-Wen Hsu): + + make --with-package option of configure script work. + + get LIBTOOL_VERSION from configure script, needed by + ${LIBTOOL_VERSION} in LIBTOOL_CREATE (LIB_CREATE in configure and + aclocal.m4) + + update cs.po and sr.po from + http://translationproject.org/latest/dialog/ + + updated configure script macros, improving CF_XOPEN_SOURCE among + other fixes. + +2011/10/20 + + fix --analyze warnings for clang versions 2.8, 2.9. + + add configure check for lint program. + + add check in dlg_getc() in case its window is freed as a side effect + of removing callbacks. + + fix logic in freeing subwindows (report by xDog Walker). + + fix a regression in logic distinguishing between inputmenu and menu + widgets (report by xDog Walker). + + minor fixes to library manpage. + +2011/10/18 + + modify header-sh.in to work around limit on sed script length on + HPUX. + + add a special case of parameter parsing for "--trace" to the + initialization done before calling init_dialog(), to allow users to + capture the initial state of the parameter list before any options + are processed and removed. This is only done if "--trace" is the + first option, otherwise it is handled in the common options as before + (report by xDog Walker). + + modify samples/testdata-8bit, discarding $1 from the parameter list + if it was used, so that the source'ing scripts can consistently use + "$@" to insert parameters before the widget, e.g., as an alternative + to using $DIALOGOPTS (report by xDog Walker). + + modify treatment of function pointers in menubox.c, make + dlg_renamed_menutext() and dlg_dummy_menutext() visible to library + users (request by xDog Walker). + + add dlg_count_real_columns(), use to modify centering for "--hline" + text to account for "\Z"s (report by xDog Walker). + + improve check in dlg_draw_arrows2() for conflict between the window + title and up-arrow marker to take into account that the given window + may not be the top-level window of the widget. + + change width of page up/down mouse areas in fselect panes to use the + full width of the panes rather than only the portion from the left + margin to the up/down arrow. + + add/use dlg_draw_box2() and dlg_draw_bottom_box2() to use the + secondary borders. + + modify rc-file read/write to accept/generate color values that refer + to previously-processed items in the color table. This reduces the + number of distinct colors that must be specified to set up a color + scheme. + + add color table entries for secondary borders, i.e., the ones that + are normally drawn with the dialog's text-colors (Debian #641168). + + modify fselect.c to scan the current directory if the input field + happens to be empty (Debian #640905). + + repeated the discussion of environment variables that can override + the exit-status values in the manpage's return-codes section + (Debian #642105). + + add an example to the manpage showing how to override the form + widget's keys used for field/button traversal (Debian #642108). + + modify call to dlg_register_window() in formbox.c so that the editing + bindings are attached to the form sub-window rather than the + top-level dialog window. Also change the name by which the editing + bindings are bound for editbox.c, fselect.c and inputbox.c, so that + the editing and navigation bindings can be different. + + correct logic in dlg_lookup_key() so that it matches the widget name + before using a binding from .dialogrc, allowing the inner/outer + windows of form and other editing widgets to have different bindings. + + modify dlg_register_window() to call dlg_dump_window_keys() after + its updates, via the --trace output, to supplement the manpage + description of key bindings (Debian #642108). + + add DLGK_FORM_PREV and DLGK_FORM_NEXT key-bindings to form.c, to + allow binding a single key to traverse both form-fields and buttons + (Debian #642108). + + modify dlg_parse_rc() to check for error return from + dlg_parse_bindkey(). + + add function dlg_dump_window_keys(), to help with debugging widgets. + + add CR, LF, TAB, FF and ESC to table of curses names to help make + key bindings more readable. + + update table of dialog key-names so that helpfile and trace are + dumped properly. + + correct dlg_dump_keys(), which was showing only the first item in + the matched binding table. + + save/restore window current position in dlg_update_mixedgauge(). + + pass return-code from pause_for_ok() from dlg_progressbox() when + pauseopt is set, rather than only DLG_OK. + + call setlocale() in init_dialog() rather than relying on on-demand + use within inputstr.c, since there are paths in textbox widget which + do not exercise the latter (report by xDog Walker). + + fix some places where checks for "\Z" were done without also checking + dialog_vars.colors (report by Moray Henderson). + + correct logic for DIALOGOPTS parsing so that the parse happens only + once unless memory leak checking is enabled (report by xDog Walker). + + remove an incorrect free() call in dlg_free_gauge() (report by xDog + Walker). + + modify dlg_trace_win() to log wide-characters (report by xDog Walker). + + make traces shorter by skipping repeated ERR's, but showing the + number skipped (report by xDog Walker). + + improve description in manpage to distinguish program box and + progress box from tailboxes (adapted from email by xDog Walker). + + modify dlg_trace_win() so that it looks for the topmost window in a + dialog. Because subwindows share space with the top window, tracing + the latter shows the whole widget (report by xDog Walker). + + expand tracing so that each window is traced before soliciting input, + making the ^T feature to print a window on demand partly redundant + (suggested by xDog Walker). + + cosmetic change in dialog.h to avoid "*/*" strings from comments next + to "*" (report by xDog Walker). + + ensure result from dlg_align_columns() has trailing null on each + string. Analysis was hindered by libc6's continuance of libc5's + early-1990s misfeature of clearing the result from malloc, noting + that libc6's documentation incorrectly claims that it does not do + this (report by xDog Walker). + 2011/07/07 + modify util.c to work better with old versions of ncurses: + suppress use of wchgat() before fix in 20060715 which is needed @@ -87,7 +250,7 @@ to it: + CF_XOPEN_SOURCE, workaround for cygwin to get ncurses' configure script to define _XOPEN_SOURCE_EXTENDED (cygwin's features.h doesn't do anything, so it needs a crutch). - + updated config.guess, config.sub + + update config.guess, config.sub 2011/03/02 + add --prgbox and --programbox (adapted from patch by David Boyd). @@ -155,7 +318,7 @@ to it: CF_ADD_LIBDIR for the curses-directory here, from CF_NCURSES_CPPFLAGS and CF_NCURSES_LDFLAGS, so it will work even with the default checking, e.g., no --with-ncurses, etc. - + updated config.guess, config.sub + + update config.guess, config.sub 2010/04/28 + several improvements to configure script: @@ -250,7 +413,7 @@ to it: libutf8 and libiconv. + update da.po, ru.po from http://translationproject.org/latest/dialog/ - + updated config.guess, config.sub + + update config.guess, config.sub 2008/08/19 + amend changes to quoting; by default, the checklist widget quotes its @@ -333,7 +496,7 @@ to it: ESC to be returned, quitting dialog (report by Reiner Huober). + add extern "C" declarations to dlg_keys.h so the corresponding function declarations are exported to C++ as C symbols. - + updated config.guess, config.sub + + update config.guess, config.sub 2007/06/04 + fix a memory leak in editbox.c @@ -436,7 +599,7 @@ to it: CF_CURSES_LIBS, CF_INCLUDE_DIRS, CF_LARGEFILE, CF_MAKEFLAGS, CF_PATH_SYNTAX, CF_SUBDIR_PATH, CF_SUBST, CF_WITH_DBMALLOC, CF_WITH_DMALLOC, CF_WITH_LIBTOOL and CF_XOPEN_SOURCE. - + updated config.guess, config.sub + + update config.guess, config.sub > adapted fixes from SuSE package (Werner Fink): + add some limit-checks in dlg_draw_shadow(). + make shadows resizable, using new dlg_move_window() in msgbox.c diff --git a/contrib/dialog/VERSION b/contrib/dialog/VERSION index 0462455..8c3a188 100644 --- a/contrib/dialog/VERSION +++ b/contrib/dialog/VERSION @@ -1 +1 @@ -10:0:0 1.1 20110707 +10:4:0 1.1 20120706 diff --git a/contrib/dialog/aclocal.m4 b/contrib/dialog/aclocal.m4 index 159b12f..0c50c22 100644 --- a/contrib/dialog/aclocal.m4 +++ b/contrib/dialog/aclocal.m4 @@ -1,7 +1,7 @@ dnl macros used for DIALOG configure script -dnl $Id: aclocal.m4,v 1.82 2011/06/28 22:48:31 tom Exp $ +dnl $Id: aclocal.m4,v 1.87 2012/02/16 02:11:26 tom Exp $ dnl --------------------------------------------------------------------------- -dnl Copyright 1999-2010,2011 -- Thomas E. Dickey +dnl Copyright 1999-2011,2012 -- Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -592,6 +592,31 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 +dnl ------------------ +dnl Conditionally generate script according to whether we're using a given autoconf. +dnl +dnl $1 = version to compare against +dnl $2 = code to use if AC_ACVERSION is at least as high as $1. +dnl $3 = code to use if AC_ACVERSION is older than $1. +define(CF_ACVERSION_CHECK, +[ +ifdef([m4_version_compare], +[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], +[CF_ACVERSION_COMPARE( +AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), +AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl +dnl --------------------------------------------------------------------------- +dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 +dnl -------------------- +dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, +dnl MAJOR2, MINOR2, TERNARY2, +dnl PRINTABLE2, not FOUND, FOUND) +define(CF_ACVERSION_COMPARE, +[ifelse(builtin([eval], [$2 < $5]), 1, +[ifelse([$8], , ,[$8])], +[ifelse([$9], , ,[$9])])])dnl +dnl --------------------------------------------------------------------------- dnl CF_AC_PREREQ version: 2 updated: 1997/09/06 13:24:56 dnl ------------ dnl Conditionally generate script according to whether we're using the release @@ -1227,7 +1252,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08 +dnl CF_CURSES_LIBS version: 35 updated: 2011/08/09 21:06:37 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1307,7 +1332,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in $cf_check_list termcap termlib unknown + for cf_term_lib in $cf_check_list otermcap termcap termlib unknown do AC_CHECK_LIB($cf_term_lib,tgoto,[break]) done @@ -1533,6 +1558,30 @@ fi test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CURSES_WGETPARENT version: 2 updated: 2011/10/17 20:12:04 +dnl -------------------- +dnl Check for curses support for directly determining the parent of a given +dnl window. Some implementations make this difficult, so we provide for +dnl defining an application-specific function that gives this functionality. +dnl +dnl $1 = name of function to use if the feature is missing +AC_DEFUN([CF_CURSES_WGETPARENT],[ +CF_CURSES_FUNCS(wgetparent) +if test "x$cf_cv_func_wgetparent" != xyes +then + AC_MSG_CHECKING(if WINDOW has _parent member) + AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>], + [WINDOW *p = stdscr->_parent], + [cf_window__parent=yes], + [cf_window__parent=no]) + AC_MSG_RESULT($cf_window__parent) + if test "$cf_window__parent" = yes + then + AC_DEFINE(HAVE_WINDOW__PARENT) + fi +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 dnl ---------- dnl "dirname" is not portable, so we fake it with a shell script. @@ -2337,7 +2386,7 @@ ifdef([AC_FUNC_FSEEKO],[ ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LD_RPATH_OPT version: 4 updated: 2011/06/04 20:09:13 +dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41 dnl --------------- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -2361,7 +2410,7 @@ linux*|gnu*|k*bsd*-gnu) #(vi openbsd[[2-9]].*|mirbsd*) #(vi LD_RPATH_OPT="-Wl,-rpath," ;; -freebsd*) #(vi +dragonfly*|freebsd*) #(vi LD_RPATH_OPT="-rpath " ;; netbsd*) #(vi @@ -2420,11 +2469,11 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16 +dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 dnl ------------- dnl Compute the library-prefix for the given host system dnl $1 = variable to set -AC_DEFUN([CF_LIB_PREFIX], +define([CF_LIB_PREFIX], [ case $cf_cv_system_name in #(vi OS/2*|os2*) #(vi @@ -2645,7 +2694,7 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30 +dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05 dnl ----------------- dnl Tie together the configure-script macros for ncurses. dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. @@ -2657,7 +2706,10 @@ AC_DEFUN([CF_NCURSES_CONFIG], cf_ncuconfig_root=ifelse($1,,ncurses,$1) echo "Looking for ${cf_ncuconfig_root}-config" -AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) + +CF_ACVERSION_CHECK(2.52, + [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], + [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) if test "$NCURSES_CONFIG" != none ; then @@ -3171,6 +3223,14 @@ AC_SUBST(PROG_EXT) test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14 +dnl ------------ +AC_DEFUN([CF_PROG_LINT], +[ +AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint) +AC_SUBST(LINT_OPTS) +])dnl +dnl --------------------------------------------------------------------------- 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 @@ -3418,6 +3478,45 @@ ncursesw/term.h) esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 +dnl ------------------- +dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we +dnl can define it successfully. +AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ +AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ + AC_TRY_COMPILE([ +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +],[ +#ifndef _XOPEN_SOURCE +make an error +#endif], + [cf_cv_xopen_source=no], + [cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + AC_TRY_COMPILE([ +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +],[ +#ifdef _XOPEN_SOURCE +make an error +#endif], + [cf_cv_xopen_source=no], + [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) + CPPFLAGS="$cf_save" + ]) +]) + +if test "$cf_cv_xopen_source" != no ; then + CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) + CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + CF_ADD_CFLAGS($cf_temp_xopen_source) +fi +]) +dnl --------------------------------------------------------------------------- dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44 dnl ------------- dnl Check to see if the BSD-style union wait is declared. Some platforms may @@ -3680,7 +3779,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIBTOOL version: 27 updated: 2011/06/28 18:45:38 +dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32 dnl --------------- dnl Provide a configure option to incorporate libtool. Define several useful dnl symbols for the makefile rules. @@ -3781,7 +3880,7 @@ ifdef([AC_PROG_LIBTOOL],[ # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[[456]]) #(vi + cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi LT_UNDEF=-no-undefined ;; esac @@ -3950,7 +4049,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 +dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 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, @@ -3966,7 +4065,7 @@ cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) cf_xopen_source= case $host_os in #(vi -aix[[456]]*) #(vi +aix[[4-7]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; cygwin) #(vi @@ -3977,6 +4076,7 @@ darwin[[0-8]].*) #(vi ;; darwin*) #(vi cf_xopen_source="-D_DARWIN_C_SOURCE" + cf_XOPEN_SOURCE= ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -3994,15 +4094,23 @@ hpux*) #(vi ;; irix[[56]].*) #(vi cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi CF_GNU_SOURCE ;; mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types + cf_XOPEN_SOURCE= + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + ;; +openbsd[[4-9]]*) #(vi + # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=600 ;; openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw @@ -4016,36 +4124,11 @@ nto-qnx*) #(vi sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.1[[0-9]]) #(vi - cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -solaris2.[[1-9]]) #(vi +solaris2.*) #(vi cf_xopen_source="-D__EXTENSIONS__" ;; *) - AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([#include <sys/types.h>],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - AC_TRY_COMPILE([#include <sys/types.h>],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" - ]) -]) - if test "$cf_cv_xopen_source" != no ; then - CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) - CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) - cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - CF_ADD_CFLAGS($cf_temp_xopen_source) - fi + CF_TRY_XOPEN_SOURCE CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac @@ -4053,6 +4136,35 @@ esac if test -n "$cf_xopen_source" ; then CF_ADD_CFLAGS($cf_xopen_source) fi + +dnl In anything but the default case, we may have system-specific setting +dnl which is still not guaranteed to provide all of the entrypoints that +dnl _XOPEN_SOURCE would yield. +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then + AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) + AC_TRY_COMPILE([#include <stdlib.h>],[ +#ifndef _XOPEN_SOURCE +make an error +#endif], + [cf_XOPEN_SOURCE_set=yes], + [cf_XOPEN_SOURCE_set=no]) + AC_MSG_RESULT($cf_XOPEN_SOURCE_set) + if test $cf_XOPEN_SOURCE_set = yes + then + AC_TRY_COMPILE([#include <stdlib.h>],[ +#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE +make an error +#endif], + [cf_XOPEN_SOURCE_set_ok=yes], + [cf_XOPEN_SOURCE_set_ok=no]) + if test $cf_XOPEN_SOURCE_set_ok = no + then + AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) + fi + else + CF_TRY_XOPEN_SOURCE + fi +fi ]) dnl --------------------------------------------------------------------------- dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49 diff --git a/contrib/dialog/arrows.c b/contrib/dialog/arrows.c index 6a25fd9..ff706ad 100644 --- a/contrib/dialog/arrows.c +++ b/contrib/dialog/arrows.c @@ -1,5 +1,5 @@ /* - * $Id: arrows.c,v 1.36 2011/06/27 09:13:56 tom Exp $ + * $Id: arrows.c,v 1.41 2011/10/20 23:37:17 tom Exp $ * * arrows.c -- draw arrows to indicate end-of-range for lists * @@ -79,9 +79,9 @@ dlg_draw_helpline(WINDOW *win, bool decorations) const int *cols = dlg_index_columns(dialog_vars.help_line); int other = decorations ? (ON_LEFT + ON_RIGHT) : 0; int avail = (getmaxx(win) - other - 2); - int limit = dlg_limit_columns(dialog_vars.help_line, avail, 0); + int limit = dlg_count_real_columns(dialog_vars.help_line) + 2; - if (limit > 0) { + if (limit < avail) { getyx(win, cur_y, cur_x); other = decorations ? ON_LEFT : 0; (void) wmove(win, bottom, other + (avail - limit) / 2); @@ -107,13 +107,14 @@ dlg_draw_arrows2(WINDOW *win, int cur_x, cur_y; int limit_x = getmaxx(win); bool draw_top = TRUE; + bool is_toplevel = (wgetparent(win) == stdscr); getyx(win, cur_y, cur_x); /* * If we're drawing a centered title, do not overwrite with the arrows. */ - if (dialog_vars.title) { + if (dialog_vars.title && is_toplevel && (top - getbegy(win)) < MARGIN) { int have = (limit_x - dlg_count_columns(dialog_vars.title)) / 2; int need = x + 5; if (need > have) @@ -123,11 +124,11 @@ dlg_draw_arrows2(WINDOW *win, if (draw_top) { (void) wmove(win, top, x); if (top_arrow) { - wattrset(win, merge_colors(uarrow_attr, attr)); + (void) wattrset(win, merge_colors(uarrow_attr, attr)); (void) add_acs(win, ACS_UARROW); (void) waddstr(win, "(-)"); } else { - wattrset(win, attr); + (void) wattrset(win, attr); (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT); } } @@ -135,11 +136,11 @@ dlg_draw_arrows2(WINDOW *win, (void) wmove(win, bottom, x); if (bottom_arrow) { - wattrset(win, merge_colors(darrow_attr, attr)); + (void) wattrset(win, merge_colors(darrow_attr, attr)); (void) add_acs(win, ACS_DARROW); (void) waddstr(win, "(+)"); } else { - wattrset(win, borderattr); + (void) wattrset(win, borderattr); (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT); } mouse_mkbutton(bottom, x - 1, 6, KEY_NPAGE); @@ -147,7 +148,7 @@ dlg_draw_arrows2(WINDOW *win, (void) wmove(win, cur_y, cur_x); wrefresh(win); - wattrset(win, save); + (void) wattrset(win, save); } void @@ -166,14 +167,13 @@ dlg_draw_scrollbar(WINDOW *win, char buffer[80]; int percent; int len; - int oldy, oldx, maxy, maxx; + int oldy, oldx; chtype save = dlg_get_attrs(win); int top_arrow = (first_data != 0); int bottom_arrow = (next_data < total_data); getyx(win, oldy, oldx); - getmaxyx(win, maxy, maxx); dlg_draw_helpline(win, TRUE); if (bottom_arrow || top_arrow || dialog_state.use_scrollbar) { @@ -187,12 +187,12 @@ dlg_draw_scrollbar(WINDOW *win, else if (percent > 100) percent = 100; - wattrset(win, position_indicator_attr); + (void) wattrset(win, position_indicator_attr); (void) sprintf(buffer, "%d%%", percent); (void) wmove(win, bottom, right - 7); (void) waddstr(win, buffer); if ((len = dlg_count_columns(buffer)) < 4) { - wattrset(win, border_attr); + (void) wattrset(win, border_attr); whline(win, dlg_boxchar(ACS_HLINE), 4 - len); } } @@ -212,7 +212,7 @@ dlg_draw_scrollbar(WINDOW *win, if (bar_high < all_high) { wmove(win, top + 1, right); - wattrset(win, save); + (void) wattrset(win, save); wvline(win, ACS_VLINE | A_REVERSE, all_high); bar_y = BARSIZE(this_data); @@ -221,7 +221,7 @@ dlg_draw_scrollbar(WINDOW *win, wmove(win, top + 1 + bar_y, right); - wattrset(win, position_indicator_attr); + (void) wattrset(win, position_indicator_attr); wattron(win, A_REVERSE); wvline(win, ACS_BLOCK, bar_high); } @@ -236,7 +236,7 @@ dlg_draw_scrollbar(WINDOW *win, attr, borderattr); - wattrset(win, save); + (void) wattrset(win, save); wmove(win, oldy, oldx); } @@ -255,6 +255,6 @@ dlg_draw_arrows(WINDOW *win, x, top, bottom, - menubox_attr, + menubox_border2_attr, menubox_border_attr); } diff --git a/contrib/dialog/buttons.c b/contrib/dialog/buttons.c index 0241060..1799851 100644 --- a/contrib/dialog/buttons.c +++ b/contrib/dialog/buttons.c @@ -1,9 +1,9 @@ /* - * $Id: buttons.c,v 1.86 2011/06/28 10:46:46 tom Exp $ + * $Id: buttons.c,v 1.90 2012/07/01 20:42:05 tom Exp $ * * buttons.c -- draw buttons, e.g., OK/Cancel * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -104,11 +104,11 @@ print_button(WINDOW *win, char *label, int y, int x, int selected) : button_label_inactive_attr); (void) wmove(win, y, x); - wattrset(win, selected - ? button_active_attr - : button_inactive_attr); + (void) wattrset(win, selected + ? button_active_attr + : button_inactive_attr); (void) waddstr(win, "<"); - wattrset(win, label_attr); + (void) wattrset(win, label_attr); for (i = 0; i < limit; ++i) { int first = indx[i]; int last = indx[i + 1]; @@ -120,14 +120,14 @@ print_button(WINDOW *win, char *label, int y, int x, int selected) const char *temp = (label + first); int cmp = string_to_char(&temp); if (dlg_isupper(cmp)) { - wattrset(win, key_attr); + (void) wattrset(win, key_attr); state = 1; } break; } #endif if (dlg_isupper(UCH(label[first]))) { - wattrset(win, key_attr); + (void) wattrset(win, key_attr); state = 1; } break; @@ -138,9 +138,9 @@ print_button(WINDOW *win, char *label, int y, int x, int selected) } waddnstr(win, label + first, last - first); } - wattrset(win, selected - ? button_active_attr - : button_inactive_attr); + (void) wattrset(win, selected + ? button_active_attr + : button_inactive_attr); (void) waddstr(win, ">"); (void) wmove(win, y, x + ((int) strspn(label, " ")) + 1); } @@ -310,7 +310,7 @@ dlg_draw_buttons(WINDOW *win, (void) wmove(win, final_y, final_x); wrefresh(win); free(buffer); - wattrset(win, save); + (void) wattrset(win, save); } /* @@ -488,10 +488,12 @@ dlg_exit_buttoncode(int button) const char ** dlg_ok_label(void) { - static const char *labels[3]; + static const char *labels[4]; int n = 0; labels[n++] = my_ok_label(); + if (dialog_vars.extra_button) + labels[n++] = my_extra_label(); if (dialog_vars.help_button) labels[n++] = my_help_label(); labels[n] = 0; @@ -537,6 +539,7 @@ dlg_ok_buttoncode(int button) } else if (dialog_vars.help_button && (button == n)) { result = DLG_EXIT_HELP; } + dlg_trace_msg("# dlg_ok_buttoncode(%d) = %d\n", button, result); return result; } @@ -575,7 +578,7 @@ dlg_prev_ok_buttonindex(int current, int extra) /* * Find the button-index for the "OK" or "Cancel" button, according to * whether --defaultno is given. If --nocancel was given, we always return - * the index for "OK". + * the index for the first button (usually "OK" unless --nook was used). */ int dlg_defaultno_button(void) @@ -586,6 +589,30 @@ dlg_defaultno_button(void) while (dlg_ok_buttoncode(result) != DLG_EXIT_CANCEL) ++result; } + dlg_trace_msg("# dlg_defaultno_button() = %d\n", result); + return result; +} + +/* + * Find the button-index for a button named with --default-button. If the + * option was not specified, or if the selected button does not exist, return + * the index of the first button (usually "OK" unless --nook was used). + */ +int +dlg_default_button(void) +{ + int i, n; + int result = 0; + + if (dialog_vars.default_button >= 0) { + for (i = 0; (n = dlg_ok_buttoncode(i)) >= 0; i++) { + if (n == dialog_vars.default_button) { + result = i; + break; + } + } + } + dlg_trace_msg("# dlg_default_button() = %d\n", result); return result; } diff --git a/contrib/dialog/calendar.c b/contrib/dialog/calendar.c index 45a40ab..dab4617 100644 --- a/contrib/dialog/calendar.c +++ b/contrib/dialog/calendar.c @@ -1,9 +1,9 @@ /* - * $Id: calendar.c,v 1.62 2011/06/29 09:47:06 tom Exp $ + * $Id: calendar.c,v 1.66 2012/07/01 18:13:07 Zoltan.Kelemen Exp $ * * calendar.c -- implements the calendar box * - * Copyright 2001-2010,2011 Thomas E. Dickey + * Copyright 2001-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -225,12 +225,14 @@ draw_day(BOX * data, struct tm *current) int prev = days_in_month(current, -1); werase(data->window); - dlg_draw_box(data->parent, - data->y - MARGIN, data->x - MARGIN, - data->height + (2 * MARGIN), data->width + (2 * MARGIN), - menubox_border_attr, menubox_attr); /* border of daybox */ - - wattrset(data->window, menubox_attr); /* daynames headline */ + dlg_draw_box2(data->parent, + data->y - MARGIN, data->x - MARGIN, + data->height + (2 * MARGIN), data->width + (2 * MARGIN), + menubox_attr, + menubox_border_attr, + menubox_border2_attr); + + (void) wattrset(data->window, menubox_attr); /* daynames headline */ for (x = 0; x < 7; x++) { mvwprintw(data->window, 0, (x + 1) * cell_wide, "%*.*s ", @@ -246,7 +248,7 @@ draw_day(BOX * data, struct tm *current) week = (current->tm_yday + 6 + mday - current->tm_mday) / 7; for (y = 1; mday < last; y++) { - wattrset(data->window, menubox_attr); /* weeknumbers headline */ + (void) wattrset(data->window, menubox_attr); /* weeknumbers headline */ mvwprintw(data->window, y, 0, "%*d ", @@ -257,9 +259,9 @@ draw_day(BOX * data, struct tm *current) ++mday; if (wmove(data->window, y, this_x) == ERR) continue; - wattrset(data->window, item_attr); /* not selected days */ + (void) wattrset(data->window, item_attr); /* not selected days */ if (mday == day) { - wattrset(data->window, item_selected_attr); /* selected day */ + (void) wattrset(data->window, item_selected_attr); /* selected day */ save_y = y; save_x = this_x; } @@ -294,13 +296,15 @@ draw_month(BOX * data, struct tm *current) month = current->tm_mon + 1; - wattrset(data->parent, dialog_attr); /* Headline "Month" */ + (void) wattrset(data->parent, dialog_attr); /* Headline "Month" */ (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Month")); - dlg_draw_box(data->parent, - data->y - 1, data->x - 1, - data->height + 2, data->width + 2, - menubox_border_attr, menubox_attr); /* borders of monthbox */ - wattrset(data->window, item_attr); /* color the month selection */ + dlg_draw_box2(data->parent, + data->y - 1, data->x - 1, + data->height + 2, data->width + 2, + menubox_attr, + menubox_border_attr, + menubox_border2_attr); + (void) wattrset(data->window, item_attr); /* color the month selection */ mvwprintw(data->window, 0, 0, "%s", nameOfMonth(month - 1)); wmove(data->window, 0, 0); return 0; @@ -314,13 +318,15 @@ draw_year(BOX * data, struct tm *current) { int year = current->tm_year + 1900; - wattrset(data->parent, dialog_attr); /* Headline "Year" */ + (void) wattrset(data->parent, dialog_attr); /* Headline "Year" */ (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Year")); - dlg_draw_box(data->parent, - data->y - 1, data->x - 1, - data->height + 2, data->width + 2, - menubox_border_attr, menubox_attr); /* borders of yearbox */ - wattrset(data->window, item_attr); /* color the year selection */ + dlg_draw_box2(data->parent, + data->y - 1, data->x - 1, + data->height + 2, data->width + 2, + menubox_attr, + menubox_border_attr, + menubox_border2_attr); + (void) wattrset(data->window, item_attr); /* color the year selection */ mvwprintw(data->window, 0, 0, "%4d", year); wmove(data->window, 0, 0); return 0; @@ -430,7 +436,7 @@ dialog_calendar(const char *title, WINDOW *dialog; time_t now_time = time((time_t *) 0); struct tm current; - int state = dlg_defaultno_button(); + int state = dlg_default_button(); const char **buttons = dlg_ok_labels(); char *prompt = dlg_strclone(subtitle); int mincols = MIN_WIDE; @@ -491,11 +497,11 @@ dialog_calendar(const char *title, dlg_register_buttons(dialog, "calendar", buttons); /* mainbox */ - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); - wattrset(dialog, dialog_attr); /* text mainbox */ + (void) wattrset(dialog, dialog_attr); /* text mainbox */ dlg_print_autowrap(dialog, prompt, height, width); /* compute positions of day, month and year boxes */ @@ -539,6 +545,7 @@ dialog_calendar(const char *title, return CleanupResult(DLG_EXIT_ERROR, dialog, prompt, &save_vars); } + dlg_trace_win(dialog); while (result == DLG_EXIT_UNKNOWN) { BOX *obj = (state == sDAY ? &dy_box : (state == sMONTH ? &mn_box : diff --git a/contrib/dialog/checklist.c b/contrib/dialog/checklist.c index 4b73ceb..3904e90 100644 --- a/contrib/dialog/checklist.c +++ b/contrib/dialog/checklist.c @@ -1,9 +1,9 @@ /* - * $Id: checklist.c,v 1.127 2011/06/29 23:04:09 tom Exp $ + * $Id: checklist.c,v 1.135 2012/07/01 16:30:04 Zoltan.Kelemen Exp $ * * checklist.c -- implements the checklist box * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -58,7 +58,7 @@ print_arrows(WINDOW *win, box_x + list_width, box_y, box_y + list_height + 1, - menubox_attr, + menubox_border2_attr, menubox_border_attr); } @@ -81,30 +81,30 @@ print_item(WINDOW *win, int limit; /* Clear 'residue' of last item */ - wattrset(win, menubox_attr); + (void) wattrset(win, menubox_attr); (void) wmove(win, choice, 0); for (i = 0; i < list_width; i++) (void) waddch(win, ' '); (void) wmove(win, choice, check_x); - wattrset(win, selected ? check_selected_attr : check_attr); + (void) wattrset(win, selected ? check_selected_attr : check_attr); (void) wprintw(win, (checkflag == FLAG_CHECK) ? "[%c]" : "(%c)", states[item->state]); - wattrset(win, menubox_attr); + (void) wattrset(win, menubox_attr); (void) waddch(win, ' '); if (strlen(item->name) != 0) { indx = dlg_index_wchars(item->name); - wattrset(win, selected ? tag_key_selected_attr : tag_key_attr); + (void) wattrset(win, selected ? tag_key_selected_attr : tag_key_attr); (void) waddnstr(win, item->name, indx[1]); if ((int) strlen(item->name) > indx[1]) { limit = dlg_limit_columns(item->name, (item_x - check_x - 6), 1); if (limit > 1) { - wattrset(win, selected ? tag_selected_attr : tag_attr); + (void) wattrset(win, selected ? tag_selected_attr : tag_attr); (void) waddnstr(win, item->name + indx[1], indx[limit] - indx[1]); @@ -118,7 +118,7 @@ print_item(WINDOW *win, if (limit > 0) { (void) wmove(win, choice, item_x); - wattrset(win, selected ? item_selected_attr : item_attr); + (void) wattrset(win, selected ? item_selected_attr : item_attr); dlg_print_text(win, item->text, cols[limit], &attr); } } @@ -126,7 +126,7 @@ print_item(WINDOW *win, if (selected) { dlg_item_help(item->help); } - wattrset(win, save); + (void) wattrset(win, save); } /* @@ -178,7 +178,7 @@ dlg_checklist(const char *title, #endif int i, j, key2, found, x, y, cur_x, cur_y, box_x, box_y; int key = 0, fkey; - int button = dialog_state.visit_items ? -1 : dlg_defaultno_button(); + int button = dialog_state.visit_items ? -1 : dlg_default_button(); int choice = dlg_default_listitem(items); int scrollamt = 0; int max_choice; @@ -190,6 +190,7 @@ dlg_checklist(const char *title, WINDOW *dialog, *list; char *prompt = dlg_strclone(cprompt); const char **buttons = dlg_ok_labels(); + const char *widget_name; dlg_does_output(); dlg_tab_correct_str(prompt); @@ -211,19 +212,23 @@ dlg_checklist(const char *title, } } } + widget_name = "radiolist"; + } else { + widget_name = "checklist"; } #ifdef KEY_RESIZE retry: #endif use_height = list_height; + use_width = dlg_calc_list_width(item_no, items) + 10; + use_width = MAX(26, use_width); if (use_height == 0) { - use_width = dlg_calc_list_width(item_no, items) + 10; /* calculate height without items (4) */ - dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MAX(26, use_width)); + dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, use_width); dlg_calc_listh(&height, &use_height, item_no); } else { - dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, 26); + dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, use_width); } dlg_button_layout(buttons, &width); dlg_print_size(height, width); @@ -240,16 +245,16 @@ dlg_checklist(const char *title, y = dlg_box_y_ordinate(height); dialog = dlg_new_window(height, width, y, x); - dlg_register_window(dialog, "checklist", binding); - dlg_register_buttons(dialog, "checklist", buttons); + dlg_register_window(dialog, widget_name, binding); + dlg_register_buttons(dialog, widget_name, buttons); dlg_mouse_setbase(x, y); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_print_autowrap(dialog, prompt, height, width); list_width = width - 6; @@ -276,7 +281,7 @@ dlg_checklist(const char *title, dlg_draw_box(dialog, box_y, box_x, use_height + 2 * MARGIN, list_width + 2 * MARGIN, - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); text_width = 0; name_width = 0; @@ -328,6 +333,7 @@ dlg_checklist(const char *title, dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width); + dlg_trace_win(dialog); while (result == DLG_EXIT_UNKNOWN) { if (button < 0) /* --visit-items */ wmove(dialog, box_y + choice + 1, box_x + check_x + 2); @@ -720,7 +726,10 @@ dialog_checklist(const char *title, } else { if (dlg_need_separator()) dlg_add_separator(); - dlg_add_string(listitems[i].name); + if (flag == FLAG_CHECK) + dlg_add_quoted(listitems[i].name); + else + dlg_add_string(listitems[i].name); } } } diff --git a/contrib/dialog/columns.c b/contrib/dialog/columns.c index 8e5620c..d03761f 100644 --- a/contrib/dialog/columns.c +++ b/contrib/dialog/columns.c @@ -1,5 +1,5 @@ /* - * $Id: columns.c,v 1.8 2011/06/28 09:26:23 tom Exp $ + * $Id: columns.c,v 1.10 2011/10/20 20:53:55 tom Exp $ * * columns.c -- implements column-alignment * @@ -45,7 +45,7 @@ next_row(char **target, int per_row) { char *result = (char *) target; result += per_row; - return (char **) result; + return (char **) (void *) result; } static char * @@ -148,6 +148,7 @@ dlg_align_columns(char **target, int per_row, int num_rows) memcpy(text + offset, *value + offsets[n], (size_t) widths[n]); offset += maxwidth[n] + 1; } + text[realwidth] = 0; *value = text; } diff --git a/contrib/dialog/configure b/contrib/dialog/configure index 44eaeb4..416f055 100755 --- a/contrib/dialog/configure +++ b/contrib/dialog/configure @@ -2166,10 +2166,47 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +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:2173: 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 +else + if test -n "$LINT"; then + ac_cv_prog_LINT="$LINT" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LINT="$ac_prog" +echo "$as_me:2188: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +LINT=$ac_cv_prog_LINT +if test -n "$LINT"; then + echo "$as_me:2196: result: $LINT" >&5 +echo "${ECHO_T}$LINT" >&6 +else + echo "$as_me:2199: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LINT" && break +done + 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:2172: checking for $ac_word" >&5 +echo "$as_me:2209: 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 @@ -2184,7 +2221,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:2187: found $ac_dir/$ac_word" >&5 +echo "$as_me:2224: found $ac_dir/$ac_word" >&5 break done @@ -2192,10 +2229,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:2195: result: $AR" >&5 + echo "$as_me:2232: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:2198: result: no" >&5 + echo "$as_me:2235: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2204,7 +2241,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:2207: checking for $ac_word" >&5 +echo "$as_me:2244: 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 @@ -2219,7 +2256,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:2222: found $ac_dir/$ac_word" >&5 +echo "$as_me:2259: found $ac_dir/$ac_word" >&5 break done @@ -2228,10 +2265,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:2231: result: $ac_ct_AR" >&5 + echo "$as_me:2268: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:2234: result: no" >&5 + echo "$as_me:2271: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2240,12 +2277,12 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:2243: checking for POSIXized ISC" >&5 +echo "$as_me:2280: checking for POSIXized ISC" >&5 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then - echo "$as_me:2248: result: yes" >&5 + echo "$as_me:2285: result: yes" >&5 echo "${ECHO_T}yes" >&6 ISC=yes # If later tests want to check for ISC. @@ -2259,12 +2296,12 @@ EOF CC="$CC -Xp" fi else - echo "$as_me:2262: result: no" >&5 + echo "$as_me:2299: result: no" >&5 echo "${ECHO_T}no" >&6 ISC= fi -echo "$as_me:2267: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2304: 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 @@ -2272,7 +2309,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2275 "configure" +#line 2312 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2321,16 +2358,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:2324: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2361: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2327: \$? = $ac_status" >&5 + echo "$as_me:2364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2330: \"$ac_try\"") >&5 + { (eval echo "$as_me:2367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2333: \$? = $ac_status" >&5 + echo "$as_me:2370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2347,21 +2384,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2350: result: none needed" >&5 + echo "$as_me:2387: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2353: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2390: 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:2358: checking for an ANSI C-conforming const" >&5 +echo "$as_me:2395: 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 2364 "configure" +#line 2401 "configure" #include "confdefs.h" int @@ -2419,16 +2456,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2422: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2459: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2425: \$? = $ac_status" >&5 + echo "$as_me:2462: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2428: \"$ac_try\"") >&5 + { (eval echo "$as_me:2465: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2431: \$? = $ac_status" >&5 + echo "$as_me:2468: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -2438,7 +2475,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2441: result: $ac_cv_c_const" >&5 +echo "$as_me:2478: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -2448,7 +2485,7 @@ EOF fi -echo "$as_me:2451: checking for makeflags variable" >&5 +echo "$as_me:2488: 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 @@ -2482,10 +2519,10 @@ CF_EOF rm -f cf_makeflags.tmp fi -echo "$as_me:2485: result: $cf_cv_makeflags" >&5 +echo "$as_me:2522: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 -echo "$as_me:2488: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2525: 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 @@ -2512,7 +2549,7 @@ else fi fi -echo "$as_me:2515: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2552: 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 @@ -2522,7 +2559,7 @@ for ac_prog in exctags ctags 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:2525: checking for $ac_word" >&5 +echo "$as_me:2562: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2537,7 +2574,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_CTAGS="$ac_prog" -echo "$as_me:2540: found $ac_dir/$ac_word" >&5 +echo "$as_me:2577: found $ac_dir/$ac_word" >&5 break done @@ -2545,10 +2582,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2548: result: $CTAGS" >&5 + echo "$as_me:2585: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2551: result: no" >&5 + echo "$as_me:2588: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2559,7 +2596,7 @@ for ac_prog in exetags etags 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:2562: checking for $ac_word" >&5 +echo "$as_me:2599: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2574,7 +2611,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_ETAGS="$ac_prog" -echo "$as_me:2577: found $ac_dir/$ac_word" >&5 +echo "$as_me:2614: found $ac_dir/$ac_word" >&5 break done @@ -2582,10 +2619,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2585: result: $ETAGS" >&5 + echo "$as_me:2622: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2588: result: no" >&5 + echo "$as_me:2625: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2594,7 +2631,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:2597: checking for $ac_word" >&5 +echo "$as_me:2634: 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 @@ -2609,7 +2646,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:2612: found $ac_dir/$ac_word" >&5 +echo "$as_me:2649: found $ac_dir/$ac_word" >&5 break done @@ -2618,17 +2655,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2621: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2658: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2624: result: no" >&5 + echo "$as_me:2661: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:2631: checking for $ac_word" >&5 +echo "$as_me:2668: 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 @@ -2643,7 +2680,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:2646: found $ac_dir/$ac_word" >&5 +echo "$as_me:2683: found $ac_dir/$ac_word" >&5 break done @@ -2652,10 +2689,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2655: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2692: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2658: result: no" >&5 + echo "$as_me:2695: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2675,7 +2712,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:2678: checking if you want to see long compiling messages" >&5 +echo "$as_me:2715: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -2709,16 +2746,16 @@ else ECHO_CC='' fi; -echo "$as_me:2712: result: $enableval" >&5 +echo "$as_me:2749: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2717: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:2754: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2721: checking build system type" >&5 +echo "$as_me:2758: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2727,16 +2764,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2730: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:2767: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:2734: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:2771: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:2739: result: $ac_cv_build" >&5 +echo "$as_me:2776: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -2744,7 +2781,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:2747: checking host system type" >&5 + echo "$as_me:2784: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2753,12 +2790,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:2756: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:2793: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:2761: result: $ac_cv_host" >&5 +echo "$as_me:2798: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -2783,13 +2820,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:2786: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:2823: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:2790: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:2827: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:2792: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:2829: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -2829,7 +2866,7 @@ cf_POSIX_C_SOURCE=199506L cf_xopen_source= case $host_os in #(vi -aix[456]*) #(vi +aix[4-7]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; cygwin) #(vi @@ -2840,6 +2877,7 @@ darwin[0-8].*) #(vi ;; darwin*) #(vi cf_xopen_source="-D_DARWIN_C_SOURCE" + cf_XOPEN_SOURCE= ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -2857,17 +2895,18 @@ hpux*) #(vi ;; irix[56].*) #(vi cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:2863: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2902: 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 2870 "configure" +#line 2909 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2882,16 +2921,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2924: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2888: \$? = $ac_status" >&5 + echo "$as_me:2927: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2891: \"$ac_try\"") >&5 + { (eval echo "$as_me:2930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2894: \$? = $ac_status" >&5 + echo "$as_me:2933: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2900,7 +2939,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2903 "configure" +#line 2942 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2915,16 +2954,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2918: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2957: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2921: \$? = $ac_status" >&5 + echo "$as_me:2960: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2924: \"$ac_try\"") >&5 + { (eval echo "$as_me:2963: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2927: \$? = $ac_status" >&5 + echo "$as_me:2966: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2939,16 +2978,260 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2942: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2981: 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" ;; mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types + cf_XOPEN_SOURCE= + +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" + +cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +echo "$as_me:3003: 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}:3009: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 3012 "configure" +#include "confdefs.h" +#include <sys/types.h> +int +main () +{ + +#ifndef _POSIX_C_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3027: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3030: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3033: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3036: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_want_posix_source=no + case .$cf_POSIX_C_SOURCE in #(vi + .[12]??*) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + ;; + .2) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + cf_want_posix_source=yes + ;; + .*) + cf_want_posix_source=yes + ;; + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +#line 3057 "configure" +#include "confdefs.h" +#include <sys/types.h> +int +main () +{ + +#ifdef _POSIX_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3072: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3075: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3078: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3081: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" +fi +rm -f conftest.$ac_objext conftest.$ac_ext + fi + +echo "${as_me:-configure}:3092: 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}:3097: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 3100 "configure" +#include "confdefs.h" +#include <sys/types.h> +int +main () +{ + +#ifndef _POSIX_C_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3115: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3118: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3121: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3124: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3140: 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" + +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 + ;; netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + ;; +openbsd[4-9]*) #(vi + # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=600 ;; openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw @@ -2962,23 +3245,25 @@ nto-qnx*) #(vi sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.1[0-9]) #(vi - cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -solaris2.[1-9]) #(vi +solaris2.*) #(vi cf_xopen_source="-D__EXTENSIONS__" ;; *) - echo "$as_me:2972: checking if we should define _XOPEN_SOURCE" >&5 + +echo "$as_me:3253: 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 2979 "configure" +#line 3260 "configure" #include "confdefs.h" + +#include <stdlib.h> +#include <string.h> #include <sys/types.h> + int main () { @@ -2991,16 +3276,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3279: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2997: \$? = $ac_status" >&5 + echo "$as_me:3282: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3000: \"$ac_try\"") >&5 + { (eval echo "$as_me:3285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3003: \$? = $ac_status" >&5 + echo "$as_me:3288: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3009,9 +3294,13 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3012 "configure" +#line 3297 "configure" #include "confdefs.h" + +#include <stdlib.h> +#include <string.h> #include <sys/types.h> + int main () { @@ -3024,16 +3313,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3027: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3316: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3030: \$? = $ac_status" >&5 + echo "$as_me:3319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3033: \"$ac_try\"") >&5 + { (eval echo "$as_me:3322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3036: \$? = $ac_status" >&5 + echo "$as_me:3325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3048,9 +3337,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3051: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3340: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 - if test "$cf_cv_xopen_source" != no ; then + +if test "$cf_cv_xopen_source" != no ; then CFLAGS=`echo "$CFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ @@ -3060,7 +3350,7 @@ 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_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" cf_fix_cppflags=no cf_new_cflags= @@ -3140,7 +3430,7 @@ if test -n "$cf_new_extra_cppflags" ; then EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - fi +fi cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -3155,16 +3445,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3158: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3448: 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}:3164: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3454: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3167 "configure" +#line 3457 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3179,16 +3469,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3185: \$? = $ac_status" >&5 + echo "$as_me:3475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3188: \"$ac_try\"") >&5 + { (eval echo "$as_me:3478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3191: \$? = $ac_status" >&5 + echo "$as_me:3481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3209,7 +3499,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3212 "configure" +#line 3502 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3224,16 +3514,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3227: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3230: \$? = $ac_status" >&5 + echo "$as_me:3520: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3233: \"$ac_try\"") >&5 + { (eval echo "$as_me:3523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3236: \$? = $ac_status" >&5 + echo "$as_me:3526: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3244,15 +3534,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3537: 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}:3252: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3542: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3255 "configure" +#line 3545 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3267,16 +3557,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3270: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3560: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3273: \$? = $ac_status" >&5 + echo "$as_me:3563: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3276: \"$ac_try\"") >&5 + { (eval echo "$as_me:3566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3279: \$? = $ac_status" >&5 + echo "$as_me:3569: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3292,7 +3582,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3295: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3585: 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 @@ -3464,6 +3754,273 @@ fi fi +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then + echo "$as_me:3758: checking if _XOPEN_SOURCE really is set" >&5 +echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 3761 "configure" +#include "confdefs.h" +#include <stdlib.h> +int +main () +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3776: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3779: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3785: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_XOPEN_SOURCE_set=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:3794: result: $cf_XOPEN_SOURCE_set" >&5 +echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test $cf_XOPEN_SOURCE_set = yes + then + cat >conftest.$ac_ext <<_ACEOF +#line 3799 "configure" +#include "confdefs.h" +#include <stdlib.h> +int +main () +{ + +#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3814: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3817: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3820: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3823: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set_ok=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_XOPEN_SOURCE_set_ok=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + if test $cf_XOPEN_SOURCE_set_ok = no + then + { echo "$as_me:3834: WARNING: _XOPEN_SOURCE is lower than requested" >&5 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +echo "$as_me:3839: 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 3846 "configure" +#include "confdefs.h" + +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +int +main () +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3865: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3868: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3871: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3874: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +#line 3883 "configure" +#include "confdefs.h" + +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +int +main () +{ + +#ifdef _XOPEN_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3902: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3905: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3908: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3911: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xopen_source=$cf_XOPEN_SOURCE +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$cf_save" + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3926: result: $cf_cv_xopen_source" >&5 +echo "${ECHO_T}$cf_cv_xopen_source" >&6 + +if test "$cf_cv_xopen_source" != no ; then + +CFLAGS=`echo "$CFLAGS" | \ + 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/=.*//'` + +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 + + fi +fi + # Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then enableval="$enable_largefile" @@ -3471,7 +4028,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:3474: checking for special C compiler options needed for large files" >&5 + echo "$as_me:4031: 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 @@ -3483,7 +4040,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 3486 "configure" +#line 4043 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -3503,16 +4060,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3506: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3509: \$? = $ac_status" >&5 + echo "$as_me:4066: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3512: \"$ac_try\"") >&5 + { (eval echo "$as_me:4069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3515: \$? = $ac_status" >&5 + echo "$as_me:4072: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3522,16 +4079,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:3525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4082: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3528: \$? = $ac_status" >&5 + echo "$as_me:4085: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3531: \"$ac_try\"") >&5 + { (eval echo "$as_me:4088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3534: \$? = $ac_status" >&5 + echo "$as_me:4091: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -3545,13 +4102,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:3548: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:4105: 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:3554: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:4111: 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 @@ -3559,7 +4116,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 3562 "configure" +#line 4119 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -3579,16 +4136,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3582: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4139: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3585: \$? = $ac_status" >&5 + echo "$as_me:4142: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3588: \"$ac_try\"") >&5 + { (eval echo "$as_me:4145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3591: \$? = $ac_status" >&5 + echo "$as_me:4148: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3597,7 +4154,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3600 "configure" +#line 4157 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include <sys/types.h> @@ -3618,16 +4175,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3621: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4178: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3624: \$? = $ac_status" >&5 + echo "$as_me:4181: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3627: \"$ac_try\"") >&5 + { (eval echo "$as_me:4184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3630: \$? = $ac_status" >&5 + echo "$as_me:4187: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -3638,7 +4195,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:3641: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:4198: 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 @@ -3648,7 +4205,7 @@ EOF fi rm -rf conftest* - echo "$as_me:3651: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:4208: 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 @@ -3656,7 +4213,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 3659 "configure" +#line 4216 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -3676,16 +4233,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3679: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4236: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3682: \$? = $ac_status" >&5 + echo "$as_me:4239: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3685: \"$ac_try\"") >&5 + { (eval echo "$as_me:4242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3688: \$? = $ac_status" >&5 + echo "$as_me:4245: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3694,7 +4251,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3697 "configure" +#line 4254 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include <sys/types.h> @@ -3715,16 +4272,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3718: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3721: \$? = $ac_status" >&5 + echo "$as_me:4278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3724: \"$ac_try\"") >&5 + { (eval echo "$as_me:4281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3727: \$? = $ac_status" >&5 + echo "$as_me:4284: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -3735,7 +4292,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:3738: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:4295: 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 @@ -3748,7 +4305,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:3751: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:4308: 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 @@ -3756,7 +4313,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 3759 "configure" +#line 4316 "configure" #include "confdefs.h" #include <stdio.h> int @@ -3768,16 +4325,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3771: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3774: \$? = $ac_status" >&5 + echo "$as_me:4331: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3777: \"$ac_try\"") >&5 + { (eval echo "$as_me:4334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3780: \$? = $ac_status" >&5 + echo "$as_me:4337: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3786,7 +4343,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3789 "configure" +#line 4346 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include <stdio.h> @@ -3799,16 +4356,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3802: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4359: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3805: \$? = $ac_status" >&5 + echo "$as_me:4362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3808: \"$ac_try\"") >&5 + { (eval echo "$as_me:4365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3811: \$? = $ac_status" >&5 + echo "$as_me:4368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -3819,7 +4376,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:3822: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:4379: 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 @@ -3833,13 +4390,13 @@ rm -rf 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:3836: checking for fseeko" >&5 +echo "$as_me:4393: 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 3842 "configure" +#line 4399 "configure" #include "confdefs.h" #include <stdio.h> int @@ -3851,16 +4408,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3854: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4411: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3857: \$? = $ac_status" >&5 + echo "$as_me:4414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3860: \"$ac_try\"") >&5 + { (eval echo "$as_me:4417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3863: \$? = $ac_status" >&5 + echo "$as_me:4420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -3870,7 +4427,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3873: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:4430: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -3891,14 +4448,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:3894: checking whether to use struct dirent64" >&5 + echo "$as_me:4451: 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 3901 "configure" +#line 4458 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3919,16 +4476,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3922: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4479: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3925: \$? = $ac_status" >&5 + echo "$as_me:4482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3928: \"$ac_try\"") >&5 + { (eval echo "$as_me:4485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3931: \$? = $ac_status" >&5 + echo "$as_me:4488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -3939,7 +4496,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3942: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:4499: 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 @@ -3949,17 +4506,17 @@ EOF GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:3952: checking version of $CC" >&5 + echo "$as_me:4509: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:3956: result: $GCC_VERSION" >&5 + echo "$as_me:4513: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:3962: checking if you want to check for gcc warnings" >&5 +echo "$as_me:4519: checking if you want to check for gcc warnings" >&5 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6 # Check whether --with-warnings or --without-warnings was given. @@ -3969,7 +4526,7 @@ if test "${with_warnings+set}" = set; then else cf_opt_with_warnings=no fi; -echo "$as_me:3972: result: $cf_opt_with_warnings" >&5 +echo "$as_me:4529: result: $cf_opt_with_warnings" >&5 echo "${ECHO_T}$cf_opt_with_warnings" >&6 if test "$cf_opt_with_warnings" != no ; then @@ -3991,10 +4548,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:3994: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:4551: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <<EOF -#line 3997 "${as_me:-configure}" +#line 4554 "${as_me:-configure}" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -4043,12 +4600,12 @@ EOF ;; esac - if { (eval echo "$as_me:4046: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4049: \$? = $ac_status" >&5 + echo "$as_me:4606: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4051: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:4608: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -4088,12 +4645,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:4091: checking if this is really Intel C compiler" >&5 + echo "$as_me:4648: 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 4096 "configure" +#line 4653 "configure" #include "confdefs.h" int @@ -4110,16 +4667,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4113: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4670: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4116: \$? = $ac_status" >&5 + echo "$as_me:4673: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4119: \"$ac_try\"") >&5 + { (eval echo "$as_me:4676: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4122: \$? = $ac_status" >&5 + echo "$as_me:4679: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -4130,14 +4687,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:4133: result: $INTEL_COMPILER" >&5 + echo "$as_me:4690: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <<EOF -#line 4140 "${as_me:-configure}" +#line 4697 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF @@ -4154,7 +4711,7 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:4157: checking for $CC warning options..." >&5 + { echo "$as_me:4714: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -4170,12 +4727,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:4173: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4176: \$? = $ac_status" >&5 + echo "$as_me:4733: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4178: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:4735: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -4184,7 +4741,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:4187: checking for $CC warning options..." >&5 + { echo "$as_me:4744: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -4204,12 +4761,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:4207: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4764: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4210: \$? = $ac_status" >&5 + echo "$as_me:4767: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4212: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:4769: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -4220,7 +4777,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}:4223: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4780: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -4245,7 +4802,7 @@ else fi; if test -f $srcdir/VERSION ; then - echo "$as_me:4248: checking for package version" >&5 + echo "$as_me:4805: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... @@ -4257,39 +4814,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6 VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:4260: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:4817: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:4265: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:4822: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:4269: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:4826: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:4272: checking for package patch date" >&5 + echo "$as_me:4829: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in .) - { { echo "$as_me:4277: error: missing patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:4834: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; .[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; *) - { { echo "$as_me:4284: error: illegal patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:4841: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:4289: result: $VERSION_PATCH" >&5 + echo "$as_me:4846: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:4292: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:4849: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi @@ -4297,19 +4854,19 @@ fi # show the actual data that we have for versions: test -n "$verbose" && echo " VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:4300: testing VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:4857: testing VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:4304: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:4861: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:4308: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:4865: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:4312: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:4869: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 cf_PACKAGE=dialog PACKAGE=$PACKAGE @@ -4336,13 +4893,13 @@ else fi; EXTRAOBJS="" -echo "$as_me:4339: checking for ANSI C header files" >&5 +echo "$as_me:4896: 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 4345 "configure" +#line 4902 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4350,13 +4907,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:4353: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4910: \"$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:4359: \$? = $ac_status" >&5 + echo "$as_me:4916: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4378,7 +4935,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 4381 "configure" +#line 4938 "configure" #include "confdefs.h" #include <string.h> @@ -4396,7 +4953,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 4399 "configure" +#line 4956 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4417,7 +4974,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 4420 "configure" +#line 4977 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -4443,15 +5000,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4446: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5003: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4449: \$? = $ac_status" >&5 + echo "$as_me:5006: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4451: \"$ac_try\"") >&5 + { (eval echo "$as_me:5008: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4454: \$? = $ac_status" >&5 + echo "$as_me:5011: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4464,7 +5021,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:4467: result: $ac_cv_header_stdc" >&5 +echo "$as_me:5024: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4474,7 +5031,7 @@ EOF fi -echo "$as_me:4477: checking for inline" >&5 +echo "$as_me:5034: 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 @@ -4482,7 +5039,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 4485 "configure" +#line 5042 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -4491,16 +5048,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4497: \$? = $ac_status" >&5 + echo "$as_me:5054: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4500: \"$ac_try\"") >&5 + { (eval echo "$as_me:5057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4503: \$? = $ac_status" >&5 + echo "$as_me:5060: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -4511,7 +5068,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4514: result: $ac_cv_c_inline" >&5 +echo "$as_me:5071: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -4532,28 +5089,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:4535: checking for $ac_header" >&5 +echo "$as_me:5092: 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 4541 "configure" +#line 5098 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4547: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5104: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4550: \$? = $ac_status" >&5 + echo "$as_me:5107: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4553: \"$ac_try\"") >&5 + { (eval echo "$as_me:5110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4556: \$? = $ac_status" >&5 + echo "$as_me:5113: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4563,7 +5120,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4566: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5123: 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 <<EOF @@ -4573,13 +5130,13 @@ EOF fi done -echo "$as_me:4576: checking for off_t" >&5 +echo "$as_me:5133: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4582 "configure" +#line 5139 "configure" #include "confdefs.h" $ac_includes_default int @@ -4594,16 +5151,16 @@ if (sizeof (off_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4597: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5154: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4600: \$? = $ac_status" >&5 + echo "$as_me:5157: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4603: \"$ac_try\"") >&5 + { (eval echo "$as_me:5160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4606: \$? = $ac_status" >&5 + echo "$as_me:5163: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else @@ -4613,7 +5170,7 @@ ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4616: result: $ac_cv_type_off_t" >&5 +echo "$as_me:5173: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : @@ -4625,13 +5182,13 @@ EOF fi -echo "$as_me:4628: checking for size_t" >&5 +echo "$as_me:5185: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4634 "configure" +#line 5191 "configure" #include "confdefs.h" $ac_includes_default int @@ -4646,16 +5203,16 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4649: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4652: \$? = $ac_status" >&5 + echo "$as_me:5209: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4655: \"$ac_try\"") >&5 + { (eval echo "$as_me:5212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4658: \$? = $ac_status" >&5 + echo "$as_me:5215: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -4665,7 +5222,7 @@ ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4668: result: $ac_cv_type_size_t" >&5 +echo "$as_me:5225: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : @@ -4679,13 +5236,13 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:4682: checking for working alloca.h" >&5 +echo "$as_me:5239: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4688 "configure" +#line 5245 "configure" #include "confdefs.h" #include <alloca.h> int @@ -4697,16 +5254,16 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4700: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5257: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4703: \$? = $ac_status" >&5 + echo "$as_me:5260: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4706: \"$ac_try\"") >&5 + { (eval echo "$as_me:5263: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4709: \$? = $ac_status" >&5 + echo "$as_me:5266: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else @@ -4716,7 +5273,7 @@ ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4719: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:5276: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then @@ -4726,13 +5283,13 @@ EOF fi -echo "$as_me:4729: checking for alloca" >&5 +echo "$as_me:5286: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4735 "configure" +#line 5292 "configure" #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca @@ -4764,16 +5321,16 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4767: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5324: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4770: \$? = $ac_status" >&5 + echo "$as_me:5327: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4773: \"$ac_try\"") >&5 + { (eval echo "$as_me:5330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4776: \$? = $ac_status" >&5 + echo "$as_me:5333: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else @@ -4783,7 +5340,7 @@ ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4786: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:5343: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then @@ -4804,13 +5361,13 @@ cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF -echo "$as_me:4807: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:5364: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4813 "configure" +#line 5370 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -4828,18 +5385,18 @@ fi rm -rf conftest* fi -echo "$as_me:4831: result: $ac_cv_os_cray" >&5 +echo "$as_me:5388: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4836: checking for $ac_func" >&5 +echo "$as_me:5393: 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 4842 "configure" +#line 5399 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4870,16 +5427,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4873: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5430: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4876: \$? = $ac_status" >&5 + echo "$as_me:5433: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4879: \"$ac_try\"") >&5 + { (eval echo "$as_me:5436: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4882: \$? = $ac_status" >&5 + echo "$as_me:5439: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4889,7 +5446,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4892: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5449: 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 @@ -4903,7 +5460,7 @@ fi done fi -echo "$as_me:4906: checking stack direction for C alloca" >&5 +echo "$as_me:5463: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4912,7 +5469,7 @@ else ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF -#line 4915 "configure" +#line 5472 "configure" #include "confdefs.h" int find_stack_direction () @@ -4935,15 +5492,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4938: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4941: \$? = $ac_status" >&5 + echo "$as_me:5498: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4943: \"$ac_try\"") >&5 + { (eval echo "$as_me:5500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4946: \$? = $ac_status" >&5 + echo "$as_me:5503: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else @@ -4955,7 +5512,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:4958: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:5515: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 cat >>confdefs.h <<EOF @@ -4967,23 +5524,23 @@ fi for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4970: checking for $ac_header" >&5 +echo "$as_me:5527: 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 4976 "configure" +#line 5533 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4980: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5537: \"$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:4986: \$? = $ac_status" >&5 + echo "$as_me:5543: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5002,7 +5559,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5005: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5562: 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 <<EOF @@ -5015,13 +5572,13 @@ done for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5018: checking for $ac_func" >&5 +echo "$as_me:5575: 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 5024 "configure" +#line 5581 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5052,16 +5609,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5055: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5612: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5058: \$? = $ac_status" >&5 + echo "$as_me:5615: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5061: \"$ac_try\"") >&5 + { (eval echo "$as_me:5618: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5064: \$? = $ac_status" >&5 + echo "$as_me:5621: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5071,7 +5628,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5074: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5631: 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 <<EOF @@ -5081,7 +5638,7 @@ EOF fi done -echo "$as_me:5084: checking for working mmap" >&5 +echo "$as_me:5641: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5090,7 +5647,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF -#line 5093 "configure" +#line 5650 "configure" #include "confdefs.h" $ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. @@ -5217,15 +5774,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5220: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5777: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5223: \$? = $ac_status" >&5 + echo "$as_me:5780: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5225: \"$ac_try\"") >&5 + { (eval echo "$as_me:5782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5228: \$? = $ac_status" >&5 + echo "$as_me:5785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else @@ -5237,7 +5794,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:5240: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:5797: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -5248,13 +5805,13 @@ EOF fi rm -f conftest.mmap - echo "$as_me:5251: checking whether we are using the GNU C Library 2.1 or newer" >&5 + echo "$as_me:5808: checking whether we are using the GNU C Library 2.1 or newer" >&5 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 if test "${ac_cv_gnu_library_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5257 "configure" +#line 5814 "configure" #include "confdefs.h" #include <features.h> @@ -5274,7 +5831,7 @@ fi rm -rf conftest* fi -echo "$as_me:5277: result: $ac_cv_gnu_library_2_1" >&5 +echo "$as_me:5834: result: $ac_cv_gnu_library_2_1" >&5 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 GLIBC21="$ac_cv_gnu_library_2_1" @@ -5287,7 +5844,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec : ${CONFIG_H:=config.h} if test -z "$PACKAGE" ; then - { { echo "$as_me:5290: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 + { { echo "$as_me:5847: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} { (exit 1); exit 1; }; } fi @@ -5304,23 +5861,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5307: checking for $ac_header" >&5 +echo "$as_me:5864: 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 5313 "configure" +#line 5870 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5317: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5874: \"$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:5323: \$? = $ac_status" >&5 + echo "$as_me:5880: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5339,7 +5896,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5342: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5899: 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 <<EOF @@ -5354,13 +5911,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5357: checking for $ac_func" >&5 +echo "$as_me:5914: 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 5363 "configure" +#line 5920 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5391,16 +5948,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5394: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5951: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5397: \$? = $ac_status" >&5 + echo "$as_me:5954: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5400: \"$ac_try\"") >&5 + { (eval echo "$as_me:5957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5403: \$? = $ac_status" >&5 + echo "$as_me:5960: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5410,7 +5967,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5413: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5970: 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 <<EOF @@ -5458,7 +6015,7 @@ if test -n "$cf_searchpath/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 5461 "configure" +#line 6018 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5470,16 +6027,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5473: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6030: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5476: \$? = $ac_status" >&5 + echo "$as_me:6033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5479: \"$ac_try\"") >&5 + { (eval echo "$as_me:6036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5482: \$? = $ac_status" >&5 + echo "$as_me:6039: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5496,7 +6053,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}:5499: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6056: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5537,7 +6094,7 @@ if test -n "$cf_searchpath/../include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 5540 "configure" +#line 6097 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5549,16 +6106,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5552: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5555: \$? = $ac_status" >&5 + echo "$as_me:6112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5558: \"$ac_try\"") >&5 + { (eval echo "$as_me:6115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5561: \$? = $ac_status" >&5 + echo "$as_me:6118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5575,7 +6132,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}:5578: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6135: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5591,7 +6148,7 @@ echo "${as_me:-configure}:5578: testing adding $cf_add_incdir to include-path .. fi else -{ { echo "$as_me:5594: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:6151: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -5616,7 +6173,7 @@ if test -n "$cf_searchpath/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}:5619: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6176: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5645,7 +6202,7 @@ if test -n "$cf_searchpath" ; 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}:5648: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6205: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5654,7 +6211,7 @@ echo "${as_me:-configure}:5648: testing adding $cf_add_libdir to library-path .. fi else -{ { echo "$as_me:5657: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:6214: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -5665,7 +6222,7 @@ done fi; - echo "$as_me:5668: checking for iconv" >&5 + echo "$as_me:6225: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5676,12 +6233,12 @@ else cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:5679: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:6236: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5684 "configure" +#line 6241 "configure" #include "confdefs.h" #include <stdlib.h> @@ -5700,16 +6257,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5703: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5706: \$? = $ac_status" >&5 + echo "$as_me:6263: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5709: \"$ac_try\"") >&5 + { (eval echo "$as_me:6266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5712: \$? = $ac_status" >&5 + echo "$as_me:6269: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_iconv=yes @@ -5723,7 +6280,7 @@ cat conftest.$ac_ext >&5 LIBS="-liconv $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5726 "configure" +#line 6283 "configure" #include "confdefs.h" #include <stdlib.h> @@ -5742,16 +6299,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5745: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6302: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5748: \$? = $ac_status" >&5 + echo "$as_me:6305: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5751: \"$ac_try\"") >&5 + { (eval echo "$as_me:6308: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5754: \$? = $ac_status" >&5 + echo "$as_me:6311: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_iconv=yes @@ -5768,9 +6325,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:5771: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:6328: testing find linkage for iconv library ..." 1>&5 -echo "${as_me:-configure}:5773: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:6330: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -5883,11 +6440,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:5886: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6443: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv" cat >conftest.$ac_ext <<_ACEOF -#line 5890 "configure" +#line 6447 "configure" #include "confdefs.h" #include <stdlib.h> @@ -5906,21 +6463,21 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6466: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5912: \$? = $ac_status" >&5 + echo "$as_me:6469: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5915: \"$ac_try\"") >&5 + { (eval echo "$as_me:6472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5918: \$? = $ac_status" >&5 + echo "$as_me:6475: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:5923: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6480: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -5938,7 +6495,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_iconv" = maybe ; then -echo "${as_me:-configure}:5941: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:6498: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6035,13 +6592,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:6038: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6595: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-liconv $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" cat >conftest.$ac_ext <<_ACEOF -#line 6044 "configure" +#line 6601 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6060,21 +6617,21 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6063: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6066: \$? = $ac_status" >&5 + echo "$as_me:6623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6069: \"$ac_try\"") >&5 + { (eval echo "$as_me:6626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6072: \$? = $ac_status" >&5 + echo "$as_me:6629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:6077: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6634: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes cf_cv_library_file_iconv="-liconv" @@ -6114,7 +6671,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" fi fi -echo "$as_me:6117: result: $am_cv_func_iconv" >&5 +echo "$as_me:6674: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then @@ -6123,14 +6680,14 @@ cat >>confdefs.h <<\EOF #define HAVE_ICONV 1 EOF - echo "$as_me:6126: checking if the declaration of iconv() needs const." >&5 + echo "$as_me:6683: checking if the declaration of iconv() needs const." >&5 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 if test "${am_cv_proto_iconv_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6133 "configure" +#line 6690 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6155,16 +6712,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6158: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6715: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6161: \$? = $ac_status" >&5 + echo "$as_me:6718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6164: \"$ac_try\"") >&5 + { (eval echo "$as_me:6721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6167: \$? = $ac_status" >&5 + echo "$as_me:6724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_proto_iconv_const=no else @@ -6174,7 +6731,7 @@ am_cv_proto_iconv_const=yes fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6177: result: $am_cv_proto_iconv_const" >&5 +echo "$as_me:6734: result: $am_cv_proto_iconv_const" >&5 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 if test "$am_cv_proto_iconv_const" = yes ; then @@ -6216,7 +6773,7 @@ if test -n "$cf_cv_header_path_iconv" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6219 "configure" +#line 6776 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6228,16 +6785,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6231: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6234: \$? = $ac_status" >&5 + echo "$as_me:6791: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6237: \"$ac_try\"") >&5 + { (eval echo "$as_me:6794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6240: \$? = $ac_status" >&5 + echo "$as_me:6797: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6254,7 +6811,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}:6257: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6814: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6291,7 +6848,7 @@ if test -n "$cf_cv_library_path_iconv" ; 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}:6294: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6851: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6302,13 +6859,13 @@ fi fi fi - echo "$as_me:6305: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:6862: 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 6311 "configure" +#line 6868 "configure" #include "confdefs.h" #include <langinfo.h> int @@ -6320,16 +6877,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6323: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6880: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6326: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6329: \"$ac_try\"") >&5 + { (eval echo "$as_me:6886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6332: \$? = $ac_status" >&5 + echo "$as_me:6889: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -6340,7 +6897,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6343: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6900: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -6351,13 +6908,13 @@ EOF fi if test $ac_cv_header_locale_h = yes; then - echo "$as_me:6354: checking for LC_MESSAGES" >&5 + echo "$as_me:6911: checking for LC_MESSAGES" >&5 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6360 "configure" +#line 6917 "configure" #include "confdefs.h" #include <locale.h> int @@ -6369,16 +6926,16 @@ return LC_MESSAGES } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6372: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6929: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6375: \$? = $ac_status" >&5 + echo "$as_me:6932: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6378: \"$ac_try\"") >&5 + { (eval echo "$as_me:6935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6381: \$? = $ac_status" >&5 + echo "$as_me:6938: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_val_LC_MESSAGES=yes else @@ -6388,7 +6945,7 @@ am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6391: result: $am_cv_val_LC_MESSAGES" >&5 +echo "$as_me:6948: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 if test $am_cv_val_LC_MESSAGES = yes; then @@ -6398,7 +6955,7 @@ EOF fi fi - echo "$as_me:6401: checking whether NLS is requested" >&5 + echo "$as_me:6958: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. @@ -6408,7 +6965,7 @@ if test "${enable_nls+set}" = set; then else USE_NLS=no fi; - echo "$as_me:6411: result: $USE_NLS" >&5 + echo "$as_me:6968: result: $USE_NLS" >&5 echo "${ECHO_T}$USE_NLS" >&6 BUILD_INCLUDED_LIBINTL=no @@ -6421,7 +6978,7 @@ cat >>confdefs.h <<\EOF #define ENABLE_NLS 1 EOF - echo "$as_me:6424: checking whether included gettext is requested" >&5 + echo "$as_me:6981: checking whether included gettext is requested" >&5 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 # Check whether --with-included-gettext or --without-included-gettext was given. @@ -6431,7 +6988,7 @@ if test "${with_included_gettext+set}" = set; then else nls_cv_force_use_gnu_gettext=no fi; - echo "$as_me:6434: result: $nls_cv_force_use_gnu_gettext" >&5 + echo "$as_me:6991: result: $nls_cv_force_use_gnu_gettext" >&5 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" @@ -6440,7 +6997,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 cf_save_LIBS_1="$LIBS" LIBS="$LIBICONV $LIBS" - echo "$as_me:6443: checking for libintl.h and gettext()" >&5 + echo "$as_me:7000: checking for libintl.h and gettext()" >&5 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 if test "${cf_cv_func_gettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6451,12 +7008,12 @@ else cf_cv_header_path_intl= cf_cv_library_path_intl= -echo "${as_me:-configure}:6454: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:7011: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6459 "configure" +#line 7016 "configure" #include "confdefs.h" #include <libintl.h> @@ -6476,16 +7033,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6479: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7036: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6482: \$? = $ac_status" >&5 + echo "$as_me:7039: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6485: \"$ac_try\"") >&5 + { (eval echo "$as_me:7042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6488: \$? = $ac_status" >&5 + echo "$as_me:7045: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_intl=yes @@ -6499,7 +7056,7 @@ cat conftest.$ac_ext >&5 LIBS="-lintl $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6502 "configure" +#line 7059 "configure" #include "confdefs.h" #include <libintl.h> @@ -6519,16 +7076,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6522: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6525: \$? = $ac_status" >&5 + echo "$as_me:7082: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6528: \"$ac_try\"") >&5 + { (eval echo "$as_me:7085: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6531: \$? = $ac_status" >&5 + echo "$as_me:7088: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_intl=yes @@ -6545,9 +7102,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me:-configure}:6548: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:7105: testing find linkage for intl library ..." 1>&5 -echo "${as_me:-configure}:6550: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:7107: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6660,11 +7217,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:6663: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:7220: testing ... testing $cf_cv_header_path_intl ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl" cat >conftest.$ac_ext <<_ACEOF -#line 6667 "configure" +#line 7224 "configure" #include "confdefs.h" #include <libintl.h> @@ -6684,21 +7241,21 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6687: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7244: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6690: \$? = $ac_status" >&5 + echo "$as_me:7247: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6693: \"$ac_try\"") >&5 + { (eval echo "$as_me:7250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6696: \$? = $ac_status" >&5 + echo "$as_me:7253: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:6701: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:7258: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 cf_cv_find_linkage_intl=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6716,7 +7273,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_intl" = maybe ; then -echo "${as_me:-configure}:6719: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:7276: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6813,13 +7370,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:6816: testing ... testing $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:7373: testing ... testing $cf_cv_library_path_intl ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lintl $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl" cat >conftest.$ac_ext <<_ACEOF -#line 6822 "configure" +#line 7379 "configure" #include "confdefs.h" #include <libintl.h> @@ -6839,21 +7396,21 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6845: \$? = $ac_status" >&5 + echo "$as_me:7402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6848: \"$ac_try\"") >&5 + { (eval echo "$as_me:7405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6851: \$? = $ac_status" >&5 + echo "$as_me:7408: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:6856: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:7413: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 cf_cv_find_linkage_intl=yes cf_cv_library_file_intl="-lintl" @@ -6893,7 +7450,7 @@ cf_cv_func_gettext=no fi fi -echo "$as_me:6896: result: $cf_cv_func_gettext" >&5 +echo "$as_me:7453: result: $cf_cv_func_gettext" >&5 echo "${ECHO_T}$cf_cv_func_gettext" >&6 LIBS="$cf_save_LIBS_1" @@ -6932,7 +7489,7 @@ if test -n "$cf_cv_header_path_intl" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6935 "configure" +#line 7492 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6944,16 +7501,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6947: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6950: \$? = $ac_status" >&5 + echo "$as_me:7507: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6953: \"$ac_try\"") >&5 + { (eval echo "$as_me:7510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6956: \$? = $ac_status" >&5 + echo "$as_me:7513: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6970,7 +7527,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}:6973: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7530: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7007,7 +7564,7 @@ if test -n "$cf_cv_library_path_intl" ; 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}:7010: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7567: testing adding $cf_add_libdir to library-path ..." 1>&5 INTLLIBS="-L$cf_add_libdir $INTLLIBS" fi @@ -7023,13 +7580,13 @@ fi for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7026: checking for $ac_func" >&5 +echo "$as_me:7583: 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 7032 "configure" +#line 7589 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7060,16 +7617,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7063: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7066: \$? = $ac_status" >&5 + echo "$as_me:7623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7069: \"$ac_try\"") >&5 + { (eval echo "$as_me:7626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7072: \$? = $ac_status" >&5 + echo "$as_me:7629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7079,7 +7636,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7082: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7639: 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 <<EOF @@ -7094,7 +7651,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:7097: checking for $ac_word" >&5 +echo "$as_me:7654: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7121,16 +7678,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:7124: result: $MSGFMT" >&5 + echo "$as_me:7681: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:7127: result: no" >&5 + echo "$as_me:7684: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:7133: checking for $ac_word" >&5 +echo "$as_me:7690: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7147,7 +7704,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_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:7150: found $ac_dir/$ac_word" >&5 + echo "$as_me:7707: found $ac_dir/$ac_word" >&5 break fi done @@ -7159,17 +7716,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:7162: result: $GMSGFMT" >&5 + echo "$as_me:7719: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:7165: result: no" >&5 + echo "$as_me:7722: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:7172: checking for $ac_word" >&5 +echo "$as_me:7729: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7196,10 +7753,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:7199: result: $XGETTEXT" >&5 + echo "$as_me:7756: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:7202: result: no" >&5 + echo "$as_me:7759: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7214,7 +7771,7 @@ fi if test "$nls_cv_use_gnu_gettext" = "yes"; then if test ! -d $srcdir/intl ; then - { { echo "$as_me:7217: error: no NLS library is packaged with this application" >&5 + { { echo "$as_me:7774: error: no NLS library is packaged with this application" >&5 echo "$as_me: error: no NLS library is packaged with this application" >&2;} { (exit 1); exit 1; }; } fi @@ -7222,7 +7779,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;} # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:7225: checking for $ac_word" >&5 +echo "$as_me:7782: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7249,16 +7806,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:7252: result: $MSGFMT" >&5 + echo "$as_me:7809: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:7255: result: no" >&5 + echo "$as_me:7812: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:7261: checking for $ac_word" >&5 +echo "$as_me:7818: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7275,7 +7832,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_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:7278: found $ac_dir/$ac_word" >&5 + echo "$as_me:7835: found $ac_dir/$ac_word" >&5 break fi done @@ -7287,17 +7844,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:7290: result: $GMSGFMT" >&5 + echo "$as_me:7847: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:7293: result: no" >&5 + echo "$as_me:7850: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:7300: checking for $ac_word" >&5 +echo "$as_me:7857: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7324,10 +7881,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:7327: result: $XGETTEXT" >&5 + echo "$as_me:7884: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:7330: result: no" >&5 + echo "$as_me:7887: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7342,7 +7899,7 @@ fi if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else - echo "$as_me:7345: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 + echo "$as_me:7902: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 GMSGFMT=":" fi @@ -7352,7 +7909,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else - echo "$as_me:7355: result: found xgettext program is not GNU xgettext; ignore it" >&5 + echo "$as_me:7912: result: found xgettext program is not GNU xgettext; ignore it" >&5 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 XGETTEXT=":" fi @@ -7372,7 +7929,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 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:7375: checking for $ac_word" >&5 +echo "$as_me:7932: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7387,7 +7944,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_INTLBISON="$ac_prog" -echo "$as_me:7390: found $ac_dir/$ac_word" >&5 +echo "$as_me:7947: found $ac_dir/$ac_word" >&5 break done @@ -7395,10 +7952,10 @@ fi fi INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$as_me:7398: result: $INTLBISON" >&5 + echo "$as_me:7955: result: $INTLBISON" >&5 echo "${ECHO_T}$INTLBISON" >&6 else - echo "$as_me:7401: result: no" >&5 + echo "$as_me:7958: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7408,7 +7965,7 @@ done if test -z "$INTLBISON"; then ac_verc_fail=yes else - echo "$as_me:7411: checking version of bison" >&5 + echo "$as_me:7968: checking version of bison" >&5 echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in @@ -7417,7 +7974,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$as_me:7420: result: $ac_prog_version" >&5 + echo "$as_me:7977: result: $ac_prog_version" >&5 echo "${ECHO_T}$ac_prog_version" >&6 fi if test $ac_verc_fail = yes; then @@ -7443,7 +8000,7 @@ echo "${ECHO_T}$ac_prog_version" >&6 if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - echo "$as_me:7446: checking for catalogs to be installed" >&5 + echo "$as_me:8003: checking for catalogs to be installed" >&5 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -7463,7 +8020,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 fi done LINGUAS=$NEW_LINGUAS - echo "$as_me:7466: result: $LINGUAS" >&5 + echo "$as_me:8023: result: $LINGUAS" >&5 echo "${ECHO_T}$LINGUAS" >&6 fi @@ -7498,7 +8055,7 @@ cf_makefile=makefile use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then -echo "$as_me:7501: checking if we should use included message-library" >&5 +echo "$as_me:8058: checking if we should use included message-library" >&5 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 # Check whether --enable-included-msgs or --disable-included-msgs was given. @@ -7509,7 +8066,7 @@ else use_our_messages=yes fi; fi -echo "$as_me:7512: result: $use_our_messages" >&5 +echo "$as_me:8069: result: $use_our_messages" >&5 echo "${ECHO_T}$use_our_messages" >&6 fi @@ -7550,23 +8107,23 @@ else for ac_header in libintl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7553: checking for $ac_header" >&5 +echo "$as_me:8110: 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 7559 "configure" +#line 8116 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7563: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8120: \"$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:7569: \$? = $ac_status" >&5 + echo "$as_me:8126: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7585,7 +8142,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7588: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8145: 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 <<EOF @@ -7630,14 +8187,14 @@ EOF fi fi -echo "$as_me:7633: checking if -lm needed for math functions" >&5 +echo "$as_me:8190: 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 7640 "configure" +#line 8197 "configure" #include "confdefs.h" #include <stdio.h> @@ -7652,16 +8209,16 @@ double x = rand(); printf("result = %g\n", sqrt(x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7655: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8212: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7658: \$? = $ac_status" >&5 + echo "$as_me:8215: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7661: \"$ac_try\"") >&5 + { (eval echo "$as_me:8218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7664: \$? = $ac_status" >&5 + echo "$as_me:8221: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -7671,7 +8228,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7674: result: $cf_cv_need_libm" >&5 +echo "$as_me:8231: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -7680,7 +8237,7 @@ then fi -echo "$as_me:7683: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:8240: 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. @@ -7696,7 +8253,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:7699: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:8256: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -7790,23 +8347,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:7793: checking for dmalloc.h" >&5 + echo "$as_me:8350: 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 7799 "configure" +#line 8356 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:7803: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8360: \"$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:7809: \$? = $ac_status" >&5 + echo "$as_me:8366: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7825,11 +8382,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7828: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:8385: 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:7832: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:8389: 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 @@ -7837,7 +8394,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7840 "configure" +#line 8397 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7856,16 +8413,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7859: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8416: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7862: \$? = $ac_status" >&5 + echo "$as_me:8419: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7865: \"$ac_try\"") >&5 + { (eval echo "$as_me:8422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7868: \$? = $ac_status" >&5 + echo "$as_me:8425: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -7876,7 +8433,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7879: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:8436: 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 <<EOF @@ -7891,7 +8448,7 @@ fi fi -echo "$as_me:7894: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:8451: 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. @@ -7907,7 +8464,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:7910: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:8467: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -8001,23 +8558,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:8004: checking for dbmalloc.h" >&5 + echo "$as_me:8561: 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 8010 "configure" +#line 8567 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:8014: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8571: \"$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:8020: \$? = $ac_status" >&5 + echo "$as_me:8577: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8036,11 +8593,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8039: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:8596: 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:8043: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:8600: 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 @@ -8048,7 +8605,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8051 "configure" +#line 8608 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8067,16 +8624,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8070: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8627: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8073: \$? = $ac_status" >&5 + echo "$as_me:8630: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8076: \"$ac_try\"") >&5 + { (eval echo "$as_me:8633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8079: \$? = $ac_status" >&5 + echo "$as_me:8636: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -8087,7 +8644,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8090: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:8647: 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 <<EOF @@ -8102,7 +8659,7 @@ fi fi -echo "$as_me:8105: checking if you want to use purify for testing" >&5 +echo "$as_me:8662: checking if you want to use purify for testing" >&5 echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6 # Check whether --with-purify or --without-purify was given. @@ -8118,7 +8675,7 @@ EOF else with_purify= fi; -echo "$as_me:8121: result: ${with_purify:-no}" >&5 +echo "$as_me:8678: result: ${with_purify:-no}" >&5 echo "${ECHO_T}${with_purify:-no}" >&6 case .$with_cflags in #(vi @@ -8211,7 +8768,7 @@ fi ;; esac -echo "$as_me:8214: checking if you want to use valgrind for testing" >&5 +echo "$as_me:8771: 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. @@ -8227,7 +8784,7 @@ EOF else with_valgrind= fi; -echo "$as_me:8230: result: ${with_valgrind:-no}" >&5 +echo "$as_me:8787: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -8320,7 +8877,7 @@ fi ;; esac -echo "$as_me:8323: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:8880: 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 --with-no-leaks or --without-no-leaks was given. @@ -8342,10 +8899,10 @@ EOF else with_no_leaks= fi; -echo "$as_me:8345: result: $with_no_leaks" >&5 +echo "$as_me:8902: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 -echo "$as_me:8348: checking if you want --trace option" >&5 +echo "$as_me:8905: checking if you want --trace option" >&5 echo $ECHO_N "checking if you want --trace option... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -8355,7 +8912,7 @@ if test "${enable_trace+set}" = set; then else enableval=yes fi; -echo "$as_me:8358: result: $enableval" >&5 +echo "$as_me:8915: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS trace\$o" @@ -8369,7 +8926,7 @@ fi LIBTOOL_MAKE="#" -echo "$as_me:8372: checking if libtool -version-number should be used" >&5 +echo "$as_me:8929: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -8386,7 +8943,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:8389: result: $cf_libtool_version" >&5 +echo "$as_me:8946: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -8411,7 +8968,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:8414: checking if you want to build libraries with libtool" >&5 +echo "$as_me:8971: 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. @@ -8421,7 +8978,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:8424: result: $with_libtool" >&5 +echo "$as_me:8981: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -8452,7 +9009,7 @@ case ".$with_libtool" in #(vi with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:8455: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:9012: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8462,7 +9019,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:8465: checking for $ac_word" >&5 +echo "$as_me:9022: 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 @@ -8479,7 +9036,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:8482: found $ac_dir/$ac_word" >&5 + echo "$as_me:9039: found $ac_dir/$ac_word" >&5 break fi done @@ -8490,16 +9047,16 @@ fi LIBTOOL=$ac_cv_path_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:8493: result: $LIBTOOL" >&5 + echo "$as_me:9050: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:8496: result: no" >&5 + echo "$as_me:9053: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:8502: error: Cannot find libtool" >&5 + { { echo "$as_me:9059: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -8514,17 +9071,17 @@ echo "$as_me: error: Cannot find libtool" >&2;} LIB_PREP=: # Show the version of libtool - echo "$as_me:8517: checking version of libtool" >&5 + echo "$as_me:9074: 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:8524: result: $cf_cv_libtool_version" >&5 + echo "$as_me:9081: 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:8527: error: This is not GNU libtool" >&5 + { { echo "$as_me:9084: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -8532,7 +9089,7 @@ echo "$as_me: error: This is not GNU libtool" >&2;} # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[456]) #(vi + cygwin*|mingw32*|uwin*|aix[4-7]) #(vi LT_UNDEF=-no-undefined ;; esac @@ -8558,7 +9115,7 @@ if test "$with_libtool" = "yes" ; then OBJEXT="lo" LIBTOOL_MAKE= -echo "$as_me:8561: checking for additional libtool options" >&5 +echo "$as_me:9118: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -8568,7 +9125,7 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:8571: result: $with_libtool_opts" >&5 +echo "$as_me:9128: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in @@ -8581,7 +9138,7 @@ esac fi -echo "$as_me:8584: checking for specific curses-directory" >&5 +echo "$as_me:9141: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -8591,7 +9148,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:8594: result: $cf_cv_curses_dir" >&5 +echo "$as_me:9151: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) @@ -8622,7 +9179,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:8625: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:9182: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8655,7 +9212,7 @@ if test -n "$cf_cv_curses_dir/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 8658 "configure" +#line 9215 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8667,16 +9224,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8670: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9227: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8673: \$? = $ac_status" >&5 + echo "$as_me:9230: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8676: \"$ac_try\"") >&5 + { (eval echo "$as_me:9233: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8679: \$? = $ac_status" >&5 + echo "$as_me:9236: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8693,7 +9250,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}:8696: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9253: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8727,7 +9284,7 @@ if test -n "$cf_cv_curses_dir/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}:8730: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:9287: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -8755,7 +9312,7 @@ if test $use_ncurses != no ; then cf_wide_curses=yes if test $use_ncurses = ncursesw ; then -echo "$as_me:8758: checking for multibyte character support" >&5 +echo "$as_me:9315: 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 @@ -8763,7 +9320,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8766 "configure" +#line 9323 "configure" #include "confdefs.h" #include <stdlib.h> @@ -8776,16 +9333,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9336: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8782: \$? = $ac_status" >&5 + echo "$as_me:9339: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8785: \"$ac_try\"") >&5 + { (eval echo "$as_me:9342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8788: \$? = $ac_status" >&5 + echo "$as_me:9345: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -8797,12 +9354,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:8800: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:9357: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8805 "configure" +#line 9362 "configure" #include "confdefs.h" #include <libutf8.h> @@ -8815,16 +9372,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8818: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9375: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8821: \$? = $ac_status" >&5 + echo "$as_me:9378: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8824: \"$ac_try\"") >&5 + { (eval echo "$as_me:9381: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8827: \$? = $ac_status" >&5 + echo "$as_me:9384: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8838,7 +9395,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8841 "configure" +#line 9398 "configure" #include "confdefs.h" #include <libutf8.h> @@ -8851,16 +9408,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8854: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9411: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8857: \$? = $ac_status" >&5 + echo "$as_me:9414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8860: \"$ac_try\"") >&5 + { (eval echo "$as_me:9417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8863: \$? = $ac_status" >&5 + echo "$as_me:9420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8877,9 +9434,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:8880: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:9437: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:8882: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:9439: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -8992,11 +9549,11 @@ cf_search="$cf_search $cf_header_path_list" 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}:8995: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9552: 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 8999 "configure" +#line 9556 "configure" #include "confdefs.h" #include <libutf8.h> @@ -9009,21 +9566,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9569: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9015: \$? = $ac_status" >&5 + echo "$as_me:9572: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9018: \"$ac_try\"") >&5 + { (eval echo "$as_me:9575: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9021: \$? = $ac_status" >&5 + echo "$as_me:9578: \$? = $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}:9026: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9583: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -9041,7 +9598,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:9044: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:9601: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -9138,13 +9695,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}:9141: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9698: 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 9147 "configure" +#line 9704 "configure" #include "confdefs.h" #include <libutf8.h> @@ -9157,21 +9714,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9160: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9717: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9163: \$? = $ac_status" >&5 + echo "$as_me:9720: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9166: \"$ac_try\"") >&5 + { (eval echo "$as_me:9723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9169: \$? = $ac_status" >&5 + echo "$as_me:9726: \$? = $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}:9174: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9731: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -9213,7 +9770,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9216: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:9773: 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 @@ -9247,7 +9804,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 9250 "configure" +#line 9807 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9259,16 +9816,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9262: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9819: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9265: \$? = $ac_status" >&5 + echo "$as_me:9822: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9268: \"$ac_try\"") >&5 + { (eval echo "$as_me:9825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9271: \$? = $ac_status" >&5 + echo "$as_me:9828: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9285,7 +9842,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}:9288: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9845: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9319,7 +9876,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}:9322: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:9879: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -9335,48 +9892,87 @@ fi cf_ncuconfig_root=$use_ncurses echo "Looking for ${cf_ncuconfig_root}-config" -for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + 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:9901: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:9916: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:9924: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:9927: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config 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:9342: checking for $ac_word" >&5 +echo "$as_me:9940: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $NCURSES_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. - ;; - *) + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else ac_save_IFS=$IFS; IFS=$ac_path_separator ac_dummy="$PATH" for ac_dir in $ac_dummy; do IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - echo "$as_me:9359: found $ac_dir/$ac_word" >&5 - break -fi + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:9955: found $ac_dir/$ac_word" >&5 +break done - ;; -esac fi -NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG - -if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9370: result: $NCURSES_CONFIG" >&5 -echo "${ECHO_T}$NCURSES_CONFIG" >&6 +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:9963: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9373: result: no" >&5 + echo "$as_me:9966: result: no" >&5 echo "${ECHO_T}no" >&6 fi - test -n "$NCURSES_CONFIG" && break + test -n "$ac_ct_NCURSES_CONFIG" && break done -test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi if test "$NCURSES_CONFIG" != none ; then @@ -9385,7 +9981,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS" # even with config script, some packages use no-override for curses.h -echo "$as_me:9388: checking if we have identified curses headers" >&5 +echo "$as_me:9984: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9399,7 +9995,7 @@ for cf_header in \ curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 9402 "configure" +#line 9998 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -9411,16 +10007,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9414: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9417: \$? = $ac_status" >&5 + echo "$as_me:10013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9420: \"$ac_try\"") >&5 + { (eval echo "$as_me:10016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9423: \$? = $ac_status" >&5 + echo "$as_me:10019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -9431,11 +10027,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:9434: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:10030: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:9438: error: No curses header-files found" >&5 + { { echo "$as_me:10034: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -9445,23 +10041,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9448: checking for $ac_header" >&5 +echo "$as_me:10044: 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 9454 "configure" +#line 10050 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9458: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10054: \"$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:9464: \$? = $ac_status" >&5 + echo "$as_me:10060: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9480,7 +10076,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9483: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:10079: 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 <<EOF @@ -9533,7 +10129,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9536 "configure" +#line 10132 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9545,16 +10141,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9548: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9551: \$? = $ac_status" >&5 + echo "$as_me:10147: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9554: \"$ac_try\"") >&5 + { (eval echo "$as_me:10150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9557: \$? = $ac_status" >&5 + echo "$as_me:10153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9571,7 +10167,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}:9574: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10170: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9588,7 +10184,7 @@ fi } -echo "$as_me:9591: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10187: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9600,7 +10196,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 9603 "configure" +#line 10199 "configure" #include "confdefs.h" #include <$cf_header> @@ -9624,16 +10220,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9627: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9630: \$? = $ac_status" >&5 + echo "$as_me:10226: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9633: \"$ac_try\"") >&5 + { (eval echo "$as_me:10229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9636: \$? = $ac_status" >&5 + echo "$as_me:10232: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -9648,14 +10244,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:9651: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10247: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:9658: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10254: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9795,7 +10391,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9798 "configure" +#line 10394 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9807,16 +10403,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10406: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9813: \$? = $ac_status" >&5 + echo "$as_me:10409: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9816: \"$ac_try\"") >&5 + { (eval echo "$as_me:10412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9819: \$? = $ac_status" >&5 + echo "$as_me:10415: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9833,7 +10429,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}:9836: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10432: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9854,7 +10450,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 9857 "configure" +#line 10453 "configure" #include "confdefs.h" #include <$cf_header> @@ -9878,16 +10474,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9881: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9884: \$? = $ac_status" >&5 + echo "$as_me:10480: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9887: \"$ac_try\"") >&5 + { (eval echo "$as_me:10483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9890: \$? = $ac_status" >&5 + echo "$as_me:10486: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9908,12 +10504,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9911: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10507: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9916: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10512: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -9946,7 +10542,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9949 "configure" +#line 10545 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9958,16 +10554,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9961: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10557: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9964: \$? = $ac_status" >&5 + echo "$as_me:10560: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9967: \"$ac_try\"") >&5 + { (eval echo "$as_me:10563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9970: \$? = $ac_status" >&5 + echo "$as_me:10566: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9984,7 +10580,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}:9987: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10583: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10027,7 +10623,7 @@ EOF ;; esac -echo "$as_me:10030: checking for terminfo header" >&5 +echo "$as_me:10626: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10045,7 +10641,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 10048 "configure" +#line 10644 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -10060,16 +10656,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10066: \$? = $ac_status" >&5 + echo "$as_me:10662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10069: \"$ac_try\"") >&5 + { (eval echo "$as_me:10665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10072: \$? = $ac_status" >&5 + echo "$as_me:10668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -10085,7 +10681,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10088: result: $cf_cv_term_header" >&5 +echo "$as_me:10684: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10119,7 +10715,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10122: checking for ncurses version" >&5 +echo "$as_me:10718: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10145,10 +10741,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10148: \"$cf_try\"") >&5 + { (eval echo "$as_me:10744: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10151: \$? = $ac_status" >&5 + echo "$as_me:10747: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -10158,7 +10754,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 10161 "configure" +#line 10757 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -10183,15 +10779,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10186: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10782: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10189: \$? = $ac_status" >&5 + echo "$as_me:10785: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10191: \"$ac_try\"") >&5 + { (eval echo "$as_me:10787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10194: \$? = $ac_status" >&5 + echo "$as_me:10790: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10205,7 +10801,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:10208: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10804: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -10217,7 +10813,7 @@ cf_nculib_root=$use_ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10220: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10816: 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 @@ -10225,7 +10821,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10228 "configure" +#line 10824 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10244,16 +10840,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10247: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10843: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10250: \$? = $ac_status" >&5 + echo "$as_me:10846: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10253: \"$ac_try\"") >&5 + { (eval echo "$as_me:10849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10256: \$? = $ac_status" >&5 + echo "$as_me:10852: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10264,10 +10860,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10267: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10863: 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 - echo "$as_me:10270: checking for initscr in -lgpm" >&5 + echo "$as_me:10866: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10275,7 +10871,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10278 "configure" +#line 10874 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10294,16 +10890,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10297: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10300: \$? = $ac_status" >&5 + echo "$as_me:10896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10303: \"$ac_try\"") >&5 + { (eval echo "$as_me:10899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10306: \$? = $ac_status" >&5 + echo "$as_me:10902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10314,7 +10910,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10317: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10913: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -10329,7 +10925,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10332: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10928: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10337,7 +10933,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10340 "configure" +#line 10936 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10356,16 +10952,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10359: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10362: \$? = $ac_status" >&5 + echo "$as_me:10958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10365: \"$ac_try\"") >&5 + { (eval echo "$as_me:10961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10368: \$? = $ac_status" >&5 + echo "$as_me:10964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10376,7 +10972,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10379: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10975: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -10395,13 +10991,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:10398: checking for initscr" >&5 + echo "$as_me:10994: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10404 "configure" +#line 11000 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -10432,16 +11028,16 @@ f = initscr; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10435: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11031: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10438: \$? = $ac_status" >&5 + echo "$as_me:11034: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10441: \"$ac_try\"") >&5 + { (eval echo "$as_me:11037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10444: \$? = $ac_status" >&5 + echo "$as_me:11040: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -10451,18 +11047,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10454: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11050: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:10461: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11057: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10465 "configure" +#line 11061 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10474,25 +11070,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10477: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11073: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10480: \$? = $ac_status" >&5 + echo "$as_me:11076: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10483: \"$ac_try\"") >&5 + { (eval echo "$as_me:11079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10486: \$? = $ac_status" >&5 + echo "$as_me:11082: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10488: result: yes" >&5 + echo "$as_me:11084: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10495: result: no" >&5 +echo "$as_me:11091: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -10582,11 +11178,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:10585: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11181: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10589 "configure" +#line 11185 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10598,25 +11194,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10601: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11197: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10604: \$? = $ac_status" >&5 + echo "$as_me:11200: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10607: \"$ac_try\"") >&5 + { (eval echo "$as_me:11203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10610: \$? = $ac_status" >&5 + echo "$as_me:11206: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10612: result: yes" >&5 + echo "$as_me:11208: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10619: result: no" >&5 +echo "$as_me:11215: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10631,7 +11227,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:10634: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11230: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10639,7 +11235,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10642: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11238: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -10649,7 +11245,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 10652 "configure" +#line 11248 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10661,23 +11257,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10664: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10667: \$? = $ac_status" >&5 + echo "$as_me:11263: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10670: \"$ac_try\"") >&5 + { (eval echo "$as_me:11266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10673: \$? = $ac_status" >&5 + echo "$as_me:11269: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10675: result: yes" >&5 + echo "$as_me:11271: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10680: result: no" >&5 +echo "$as_me:11276: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10695,7 +11291,7 @@ fi else cf_wide_curses=no -echo "$as_me:10698: checking for extra include directories" >&5 +echo "$as_me:11294: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10721,11 +11317,11 @@ sunos3*|sunos4*) esac fi -echo "$as_me:10724: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:11320: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" -echo "$as_me:10728: checking if we have identified curses headers" >&5 +echo "$as_me:11324: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10737,7 +11333,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 10740 "configure" +#line 11336 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -10749,16 +11345,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11348: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10755: \$? = $ac_status" >&5 + echo "$as_me:11351: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10758: \"$ac_try\"") >&5 + { (eval echo "$as_me:11354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10761: \$? = $ac_status" >&5 + echo "$as_me:11357: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -10769,11 +11365,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10772: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11368: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:10776: error: No curses header-files found" >&5 + { { echo "$as_me:11372: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10783,23 +11379,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10786: checking for $ac_header" >&5 +echo "$as_me:11382: 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 10792 "configure" +#line 11388 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10796: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11392: \"$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:10802: \$? = $ac_status" >&5 + echo "$as_me:11398: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10818,7 +11414,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:10821: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:11417: 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 <<EOF @@ -10828,7 +11424,7 @@ EOF fi done -echo "$as_me:10831: checking for terminfo header" >&5 +echo "$as_me:11427: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10846,7 +11442,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 10849 "configure" +#line 11445 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -10861,16 +11457,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10864: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11460: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10867: \$? = $ac_status" >&5 + echo "$as_me:11463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10870: \"$ac_try\"") >&5 + { (eval echo "$as_me:11466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10873: \$? = $ac_status" >&5 + echo "$as_me:11469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -10886,7 +11482,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10889: result: $cf_cv_term_header" >&5 +echo "$as_me:11485: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10915,7 +11511,7 @@ EOF ;; esac -echo "$as_me:10918: checking for ncurses version" >&5 +echo "$as_me:11514: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10941,10 +11537,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10944: \"$cf_try\"") >&5 + { (eval echo "$as_me:11540: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10947: \$? = $ac_status" >&5 + echo "$as_me:11543: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -10954,7 +11550,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 10957 "configure" +#line 11553 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -10979,15 +11575,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10982: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11578: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10985: \$? = $ac_status" >&5 + echo "$as_me:11581: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10987: \"$ac_try\"") >&5 + { (eval echo "$as_me:11583: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10990: \$? = $ac_status" >&5 + echo "$as_me:11586: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11001,16 +11597,16 @@ fi rm -f $cf_tempfile fi -echo "$as_me:11004: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11600: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:11010: checking if we have identified curses libraries" >&5 +echo "$as_me:11606: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 11013 "configure" +#line 11609 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11022,16 +11618,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11025: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11028: \$? = $ac_status" >&5 + echo "$as_me:11624: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11031: \"$ac_try\"") >&5 + { (eval echo "$as_me:11627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11034: \$? = $ac_status" >&5 + echo "$as_me:11630: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -11040,13 +11636,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:11043: result: $cf_result" >&5 +echo "$as_me:11639: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - echo "$as_me:11049: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11645: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11054,7 +11650,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11057 "configure" +#line 11653 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11073,16 +11669,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11076: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11672: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11079: \$? = $ac_status" >&5 + echo "$as_me:11675: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11082: \"$ac_try\"") >&5 + { (eval echo "$as_me:11678: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11085: \$? = $ac_status" >&5 + echo "$as_me:11681: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11093,7 +11689,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11096: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11692: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then LIBS="-lmytinfo $LIBS" @@ -11107,7 +11703,7 @@ hpux10.*) #(vi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:11110: checking for initscr in -lcur_colr" >&5 + echo "$as_me:11706: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11115,7 +11711,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11118 "configure" +#line 11714 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11134,16 +11730,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11140: \$? = $ac_status" >&5 + echo "$as_me:11736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11143: \"$ac_try\"") >&5 + { (eval echo "$as_me:11739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11146: \$? = $ac_status" >&5 + echo "$as_me:11742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -11154,7 +11750,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11157: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:11753: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then @@ -11163,7 +11759,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then else - echo "$as_me:11166: checking for initscr in -lHcurses" >&5 + echo "$as_me:11762: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11171,7 +11767,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11174 "configure" +#line 11770 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11190,16 +11786,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11193: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11789: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11196: \$? = $ac_status" >&5 + echo "$as_me:11792: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11199: \"$ac_try\"") >&5 + { (eval echo "$as_me:11795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11202: \$? = $ac_status" >&5 + echo "$as_me:11798: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -11210,7 +11806,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11213: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:11809: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then @@ -11250,7 +11846,7 @@ if test -n "/lib64" ; 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}:11253: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11849: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11279,7 +11875,7 @@ if test -n "/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}:11282: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11878: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11310,7 +11906,7 @@ if test -n "/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}:11313: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11909: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11345,7 +11941,7 @@ if test -n "/usr/5lib" ; 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}:11348: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11944: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11374,13 +11970,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. - echo "$as_me:11377: checking for tgoto" >&5 + echo "$as_me:11973: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11383 "configure" +#line 11979 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -11411,16 +12007,16 @@ f = tgoto; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11414: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12010: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11417: \$? = $ac_status" >&5 + echo "$as_me:12013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11420: \"$ac_try\"") >&5 + { (eval echo "$as_me:12016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11423: \$? = $ac_status" >&5 + echo "$as_me:12019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -11430,16 +12026,16 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11433: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:12029: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined else - for cf_term_lib in $cf_check_list termcap termlib unknown + for cf_term_lib in $cf_check_list otermcap termcap termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:11442: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:12038: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11447,7 +12043,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11450 "configure" +#line 12046 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11466,16 +12062,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11469: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12065: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11472: \$? = $ac_status" >&5 + echo "$as_me:12068: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11475: \"$ac_try\"") >&5 + { (eval echo "$as_me:12071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11478: \$? = $ac_status" >&5 + echo "$as_me:12074: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -11486,7 +12082,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11489: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:12085: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break @@ -11501,7 +12097,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -echo "$as_me:11504: checking for initscr in -l$cf_curs_lib" >&5 +echo "$as_me:12100: checking for initscr in -l$cf_curs_lib" >&5 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11509,7 +12105,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11512 "configure" +#line 12108 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11528,16 +12124,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11531: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11534: \$? = $ac_status" >&5 + echo "$as_me:12130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11537: \"$ac_try\"") >&5 + { (eval echo "$as_me:12133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11540: \$? = $ac_status" >&5 + echo "$as_me:12136: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -11548,23 +12144,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11551: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:12147: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi done - test $cf_curs_lib = unknown && { { echo "$as_me:11558: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:12154: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then - echo "$as_me:11564: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:12160: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 11567 "configure" +#line 12163 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11576,16 +12172,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11579: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12175: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11582: \$? = $ac_status" >&5 + echo "$as_me:12178: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11585: \"$ac_try\"") >&5 + { (eval echo "$as_me:12181: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11588: \$? = $ac_status" >&5 + echo "$as_me:12184: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -11594,18 +12190,18 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:11597: result: $cf_result" >&5 + echo "$as_me:12193: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:11599: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:12195: error: Cannot link curses library" >&5 echo "$as_me: error: Cannot link curses library" >&2;} { (exit 1); exit 1; }; } elif test "$cf_curs_lib" = "$cf_term_lib" ; then : elif test "$cf_term_lib" != predefined ; then - echo "$as_me:11605: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:12201: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 11608 "configure" +#line 12204 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11617,16 +12213,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11620: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12216: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11623: \$? = $ac_status" >&5 + echo "$as_me:12219: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11626: \"$ac_try\"") >&5 + { (eval echo "$as_me:12222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11629: \$? = $ac_status" >&5 + echo "$as_me:12225: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -11635,7 +12231,7 @@ cat conftest.$ac_ext >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11638 "configure" +#line 12234 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11647,16 +12243,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11650: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12246: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11653: \$? = $ac_status" >&5 + echo "$as_me:12249: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11656: \"$ac_try\"") >&5 + { (eval echo "$as_me:12252: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11659: \$? = $ac_status" >&5 + echo "$as_me:12255: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -11668,7 +12264,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:11671: result: $cf_result" >&5 + echo "$as_me:12267: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 fi fi @@ -11678,7 +12274,7 @@ fi cf_all_widgets=yes -echo "$as_me:11681: checking if you want extra dialogs" >&5 +echo "$as_me:12277: checking if you want extra dialogs" >&5 echo $ECHO_N "checking if you want extra dialogs... $ECHO_C" >&6 # Check whether --enable-extras or --disable-extras was given. @@ -11688,7 +12284,7 @@ if test "${enable_extras+set}" = set; then else enableval=yes fi; -echo "$as_me:11691: result: $enableval" >&5 +echo "$as_me:12287: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then cf_all_widgets=yes @@ -11696,7 +12292,7 @@ else cf_all_widgets=no fi -echo "$as_me:11699: checking if you want config-file support" >&5 +echo "$as_me:12295: checking if you want config-file support" >&5 echo $ECHO_N "checking if you want config-file support... $ECHO_C" >&6 # Check whether --enable-rc-file or --disable-rc-file was given. @@ -11706,7 +12302,7 @@ if test "${enable_rc_file+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11709: result: $enableval" >&5 +echo "$as_me:12305: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS rc\$o" @@ -11718,7 +12314,7 @@ else : fi -echo "$as_me:11721: checking if you want Xdialog-style dialogs" >&5 +echo "$as_me:12317: checking if you want Xdialog-style dialogs" >&5 echo $ECHO_N "checking if you want Xdialog-style dialogs... $ECHO_C" >&6 # Check whether --enable-Xdialog or --disable-Xdialog was given. @@ -11728,7 +12324,7 @@ if test "${enable_Xdialog+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11731: result: $enableval" >&5 +echo "$as_me:12327: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o" @@ -11740,7 +12336,7 @@ else : fi -echo "$as_me:11743: checking if you want the form dialog" >&5 +echo "$as_me:12339: checking if you want the form dialog" >&5 echo $ECHO_N "checking if you want the form dialog... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -11750,7 +12346,7 @@ if test "${enable_form+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11753: result: $enableval" >&5 +echo "$as_me:12349: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS formbox\$o" @@ -11762,7 +12358,7 @@ else : fi -echo "$as_me:11765: checking if you want the gauge dialog" >&5 +echo "$as_me:12361: checking if you want the gauge dialog" >&5 echo $ECHO_N "checking if you want the gauge dialog... $ECHO_C" >&6 # Check whether --enable-gauge or --disable-gauge was given. @@ -11772,7 +12368,7 @@ if test "${enable_gauge+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11775: result: $enableval" >&5 +echo "$as_me:12371: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o" @@ -11784,7 +12380,7 @@ else : fi -echo "$as_me:11787: checking if you want the tailbox dialog" >&5 +echo "$as_me:12383: checking if you want the tailbox dialog" >&5 echo $ECHO_N "checking if you want the tailbox dialog... $ECHO_C" >&6 # Check whether --enable-tailbox or --disable-tailbox was given. @@ -11794,7 +12390,7 @@ if test "${enable_tailbox+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11797: result: $enableval" >&5 +echo "$as_me:12393: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS tailbox\$o" @@ -11806,7 +12402,7 @@ else : fi -echo "$as_me:11809: checking if you want the mixedform dialog" >&5 +echo "$as_me:12405: checking if you want the mixedform dialog" >&5 echo $ECHO_N "checking if you want the mixedform dialog... $ECHO_C" >&6 # Check whether --enable-mixedform or --disable-mixedform was given. @@ -11816,7 +12412,7 @@ if test "${enable_mixedform+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11819: result: $enableval" >&5 +echo "$as_me:12415: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS mixedform\$o" @@ -11828,7 +12424,7 @@ else : fi -echo "$as_me:11831: checking if you want the mixedgauge dialog" >&5 +echo "$as_me:12427: checking if you want the mixedgauge dialog" >&5 echo $ECHO_N "checking if you want the mixedgauge dialog... $ECHO_C" >&6 # Check whether --enable-mixedgauge or --disable-mixedgauge was given. @@ -11838,7 +12434,7 @@ if test "${enable_mixedgauge+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:11841: result: $enableval" >&5 +echo "$as_me:12437: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS mixedgauge\$o" @@ -11850,7 +12446,7 @@ else : fi -echo "$as_me:11853: checking if you want the wide-curses features" >&5 +echo "$as_me:12449: checking if you want the wide-curses features" >&5 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -11860,7 +12456,7 @@ if test "${enable_widec+set}" = set; then else enableval=$cf_wide_curses fi; -echo "$as_me:11863: result: $enableval" >&5 +echo "$as_me:12459: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then cat >>confdefs.h <<\EOF @@ -11871,13 +12467,13 @@ else : fi -echo "$as_me:11874: checking for ANSI C header files" >&5 +echo "$as_me:12470: 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 11880 "configure" +#line 12476 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -11885,13 +12481,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:11888: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12484: \"$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:11894: \$? = $ac_status" >&5 + echo "$as_me:12490: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11913,7 +12509,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 11916 "configure" +#line 12512 "configure" #include "confdefs.h" #include <string.h> @@ -11931,7 +12527,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 11934 "configure" +#line 12530 "configure" #include "confdefs.h" #include <stdlib.h> @@ -11952,7 +12548,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 11955 "configure" +#line 12551 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -11978,15 +12574,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11981: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12577: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11984: \$? = $ac_status" >&5 + echo "$as_me:12580: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11986: \"$ac_try\"") >&5 + { (eval echo "$as_me:12582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11989: \$? = $ac_status" >&5 + echo "$as_me:12585: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11999,7 +12595,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:12002: result: $ac_cv_header_stdc" >&5 +echo "$as_me:12598: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -12009,13 +12605,13 @@ EOF fi -echo "$as_me:12012: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:12608: 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 12018 "configure" +#line 12614 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -12031,16 +12627,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12034: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12037: \$? = $ac_status" >&5 + echo "$as_me:12633: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12040: \"$ac_try\"") >&5 + { (eval echo "$as_me:12636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12043: \$? = $ac_status" >&5 + echo "$as_me:12639: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -12050,7 +12646,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12053: result: $ac_cv_header_time" >&5 +echo "$as_me:12649: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -12063,13 +12659,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:12066: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:12662: 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 12072 "configure" +#line 12668 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -12084,16 +12680,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12087: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12683: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12090: \$? = $ac_status" >&5 + echo "$as_me:12686: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12093: \"$ac_try\"") >&5 + { (eval echo "$as_me:12689: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12096: \$? = $ac_status" >&5 + echo "$as_me:12692: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -12103,7 +12699,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12106: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12702: 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 <<EOF @@ -12116,7 +12712,7 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:12119: checking for opendir in -ldir" >&5 + echo "$as_me:12715: 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 @@ -12124,7 +12720,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12127 "configure" +#line 12723 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12143,16 +12739,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12146: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12742: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12149: \$? = $ac_status" >&5 + echo "$as_me:12745: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12152: \"$ac_try\"") >&5 + { (eval echo "$as_me:12748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12155: \$? = $ac_status" >&5 + echo "$as_me:12751: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -12163,14 +12759,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12166: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:12762: 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:12173: checking for opendir in -lx" >&5 + echo "$as_me:12769: 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 @@ -12178,7 +12774,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12181 "configure" +#line 12777 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12197,16 +12793,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12200: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12796: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12203: \$? = $ac_status" >&5 + echo "$as_me:12799: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12206: \"$ac_try\"") >&5 + { (eval echo "$as_me:12802: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12209: \$? = $ac_status" >&5 + echo "$as_me:12805: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -12217,7 +12813,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12220: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:12816: 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" @@ -12228,23 +12824,23 @@ fi for ac_header in search.h unctrl.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12231: checking for $ac_header" >&5 +echo "$as_me:12827: 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 12237 "configure" +#line 12833 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12241: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12837: \"$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:12247: \$? = $ac_status" >&5 + echo "$as_me:12843: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12263,7 +12859,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12266: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12862: 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 <<EOF @@ -12273,7 +12869,7 @@ EOF fi done -echo "$as_me:12276: checking for term.h" >&5 +echo "$as_me:12872: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12294,7 +12890,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 12297 "configure" +#line 12893 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -12308,16 +12904,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12311: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12907: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12314: \$? = $ac_status" >&5 + echo "$as_me:12910: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12317: \"$ac_try\"") >&5 + { (eval echo "$as_me:12913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12320: \$? = $ac_status" >&5 + echo "$as_me:12916: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -12336,7 +12932,7 @@ no) for cf_header in ncurses/term.h ncursesw/term.h do cat >conftest.$ac_ext <<_ACEOF -#line 12339 "configure" +#line 12935 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -12354,16 +12950,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12357: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12360: \$? = $ac_status" >&5 + echo "$as_me:12956: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12363: \"$ac_try\"") >&5 + { (eval echo "$as_me:12959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12366: \$? = $ac_status" >&5 + echo "$as_me:12962: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -12378,7 +12974,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext esac fi -echo "$as_me:12381: result: $cf_cv_term_header" >&5 +echo "$as_me:12977: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in #(vi @@ -12402,13 +12998,13 @@ EOF ;; esac -echo "$as_me:12405: checking return type of signal handlers" >&5 +echo "$as_me:13001: 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 12411 "configure" +#line 13007 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -12430,16 +13026,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12433: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12436: \$? = $ac_status" >&5 + echo "$as_me:13032: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12439: \"$ac_try\"") >&5 + { (eval echo "$as_me:13035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12442: \$? = $ac_status" >&5 + echo "$as_me:13038: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -12449,7 +13045,7 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12452: result: $ac_cv_type_signal" >&5 +echo "$as_me:13048: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<EOF @@ -12474,13 +13070,13 @@ wctomb \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12477: checking for $ac_func" >&5 +echo "$as_me:13073: 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 12483 "configure" +#line 13079 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12511,16 +13107,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12514: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13110: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12517: \$? = $ac_status" >&5 + echo "$as_me:13113: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12520: \"$ac_try\"") >&5 + { (eval echo "$as_me:13116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12523: \$? = $ac_status" >&5 + echo "$as_me:13119: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -12530,7 +13126,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12533: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13129: 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 <<EOF @@ -12540,14 +13136,14 @@ EOF fi done -echo "$as_me:12543: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:13139: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12550 "configure" +#line 13146 "configure" #include "confdefs.h" #include <stdlib.h> @@ -12569,23 +13165,23 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12572: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13168: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12575: \$? = $ac_status" >&5 + echo "$as_me:13171: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12578: \"$ac_try\"") >&5 + { (eval echo "$as_me:13174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12581: \$? = $ac_status" >&5 + echo "$as_me:13177: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 12588 "configure" +#line 13184 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -12607,16 +13203,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12610: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13206: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12613: \$? = $ac_status" >&5 + echo "$as_me:13209: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12616: \"$ac_try\"") >&5 + { (eval echo "$as_me:13212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12619: \$? = $ac_status" >&5 + echo "$as_me:13215: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=yes else @@ -12628,11 +13224,11 @@ 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:12631: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:13227: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" -echo "$as_me:12635: checking for unctrl.h" >&5 +echo "$as_me:13231: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12653,7 +13249,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 12656 "configure" +#line 13252 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -12667,16 +13263,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12673: \$? = $ac_status" >&5 + echo "$as_me:13269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12676: \"$ac_try\"") >&5 + { (eval echo "$as_me:13272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12679: \$? = $ac_status" >&5 + echo "$as_me:13275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unctrl_header=$cf_header break @@ -12690,13 +13286,13 @@ done case $cf_cv_unctrl_header in #(vi no) - { echo "$as_me:12693: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:13289: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac fi -echo "$as_me:12699: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:13295: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case $cf_cv_unctrl_header in #(vi @@ -12742,10 +13338,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:12745: checking for ${cf_func}" >&5 + echo "$as_me:13341: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:12748: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:13344: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12754,7 +13350,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 12757 "configure" +#line 13353 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -12786,16 +13382,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12789: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13385: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12792: \$? = $ac_status" >&5 + echo "$as_me:13388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12795: \"$ac_try\"") >&5 + { (eval echo "$as_me:13391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12798: \$? = $ac_status" >&5 + echo "$as_me:13394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12811,7 +13407,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:12814: result: $cf_result" >&5 + echo "$as_me:13410: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <<EOF @@ -12821,13 +13417,13 @@ EOF fi done -echo "$as_me:12824: checking for start_color" >&5 +echo "$as_me:13420: checking for start_color" >&5 echo $ECHO_N "checking for start_color... $ECHO_C" >&6 if test "${ac_cv_func_start_color+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12830 "configure" +#line 13426 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char start_color (); below. */ @@ -12858,16 +13454,16 @@ f = start_color; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12861: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13457: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12864: \$? = $ac_status" >&5 + echo "$as_me:13460: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12867: \"$ac_try\"") >&5 + { (eval echo "$as_me:13463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12870: \$? = $ac_status" >&5 + echo "$as_me:13466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_start_color=yes else @@ -12877,7 +13473,7 @@ ac_cv_func_start_color=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12880: result: $ac_cv_func_start_color" >&5 +echo "$as_me:13476: result: $ac_cv_func_start_color" >&5 echo "${ECHO_T}$ac_cv_func_start_color" >&6 if test $ac_cv_func_start_color = yes; then cat >>confdefs.h <<\EOF @@ -12886,14 +13482,14 @@ EOF fi -echo "$as_me:12889: checking for chtype typedef" >&5 +echo "$as_me:13485: checking for chtype typedef" >&5 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6 if test "${cf_cv_chtype_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12896 "configure" +#line 13492 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12905,16 +13501,16 @@ chtype foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12911: \$? = $ac_status" >&5 + echo "$as_me:13507: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12914: \"$ac_try\"") >&5 + { (eval echo "$as_me:13510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12917: \$? = $ac_status" >&5 + echo "$as_me:13513: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_chtype_decl=yes else @@ -12924,21 +13520,21 @@ cf_cv_chtype_decl=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12927: result: $cf_cv_chtype_decl" >&5 +echo "$as_me:13523: result: $cf_cv_chtype_decl" >&5 echo "${ECHO_T}$cf_cv_chtype_decl" >&6 if test $cf_cv_chtype_decl = yes ; then cat >>confdefs.h <<\EOF #define HAVE_TYPE_CHTYPE 1 EOF - echo "$as_me:12934: checking if chtype is scalar or struct" >&5 + echo "$as_me:13530: checking if chtype is scalar or struct" >&5 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6 if test "${cf_cv_chtype_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12941 "configure" +#line 13537 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12950,16 +13546,16 @@ chtype foo; long x = foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13549: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12956: \$? = $ac_status" >&5 + echo "$as_me:13552: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12959: \"$ac_try\"") >&5 + { (eval echo "$as_me:13555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12962: \$? = $ac_status" >&5 + echo "$as_me:13558: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_chtype_type=scalar else @@ -12969,7 +13565,7 @@ cf_cv_chtype_type=struct fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12972: result: $cf_cv_chtype_type" >&5 +echo "$as_me:13568: result: $cf_cv_chtype_type" >&5 echo "${ECHO_T}$cf_cv_chtype_type" >&6 if test $cf_cv_chtype_type = scalar ; then cat >>confdefs.h <<\EOF @@ -12979,7 +13575,7 @@ EOF fi fi -echo "$as_me:12982: checking for wide alternate character set array" >&5 +echo "$as_me:13578: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12989,7 +13585,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 12992 "configure" +#line 13588 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -13005,16 +13601,16 @@ void *foo = &($name['k']) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13008: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13604: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13011: \$? = $ac_status" >&5 + echo "$as_me:13607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13014: \"$ac_try\"") >&5 + { (eval echo "$as_me:13610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13017: \$? = $ac_status" >&5 + echo "$as_me:13613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -13025,14 +13621,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:13028: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:13624: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map EOF -echo "$as_me:13035: checking for wide alternate character constants" >&5 +echo "$as_me:13631: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13042,7 +13638,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 13045 "configure" +#line 13641 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -13059,16 +13655,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13062: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13065: \$? = $ac_status" >&5 + echo "$as_me:13661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13068: \"$ac_try\"") >&5 + { (eval echo "$as_me:13664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13071: \$? = $ac_status" >&5 + echo "$as_me:13667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -13078,7 +13674,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 13081 "configure" +#line 13677 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -13094,16 +13690,16 @@ cchar_t *foo = WACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13097: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13693: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13100: \$? = $ac_status" >&5 + echo "$as_me:13696: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13103: \"$ac_try\"") >&5 + { (eval echo "$as_me:13699: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13106: \$? = $ac_status" >&5 + echo "$as_me:13702: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -13114,33 +13710,163 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:13117: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:13713: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && cat >>confdefs.h <<\EOF #define CURSES_WACS_SYMBOLS 1 EOF +for cf_func in wgetparent +do + +cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + echo "$as_me:13725: checking for ${cf_func}" >&5 +echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +echo "${as_me:-configure}:13728: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +#line 13737 "configure" +#include "confdefs.h" + +#ifdef HAVE_XCURSES +#include <xcurses.h> +char * XCursesProgramName = "test"; +#else +#include <${cf_cv_ncurses_header:-curses.h}> +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) +#include <ncursesw/term.h> +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) +#include <ncurses/term.h> +#elif defined(HAVE_TERM_H) +#include <term.h> +#endif +#endif + +int +main () +{ + +#ifndef ${cf_func} +long foo = (long)(&${cf_func}); +if (foo + 1234 > 5678) + ${cf_cv_main_return:-return}(foo); +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13769: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13772: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13778: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + eval 'cf_cv_func_'$cf_func'=$cf_result' + +fi + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func + echo "$as_me:13794: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <<EOF +#define HAVE_${cf_tr_func} 1 +EOF + + fi +done + +if test "x$cf_cv_func_wgetparent" != xyes +then + echo "$as_me:13806: checking if WINDOW has _parent member" >&5 +echo $ECHO_N "checking if WINDOW has _parent member... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 13809 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main () +{ +WINDOW *p = stdscr->_parent + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13821: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13824: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13827: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13830: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_window__parent=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_window__parent=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:13839: result: $cf_window__parent" >&5 +echo "${ECHO_T}$cf_window__parent" >&6 + if test "$cf_window__parent" = yes + then + cat >>confdefs.h <<\EOF +#define HAVE_WINDOW__PARENT 1 +EOF + + fi +fi + for ac_header in sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13127: checking for $ac_header" >&5 +echo "$as_me:13853: 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 13133 "configure" +#line 13859 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13137: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13863: \"$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:13143: \$? = $ac_status" >&5 + echo "$as_me:13869: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13159,7 +13885,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13162: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13888: 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 <<EOF @@ -13180,23 +13906,23 @@ else for ac_header in wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13183: checking for $ac_header" >&5 +echo "$as_me:13909: 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 13189 "configure" +#line 13915 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13193: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13919: \"$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:13199: \$? = $ac_status" >&5 + echo "$as_me:13925: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13215,7 +13941,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13218: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13944: 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 <<EOF @@ -13228,23 +13954,23 @@ done for ac_header in waitstatus.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13231: checking for $ac_header" >&5 +echo "$as_me:13957: 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 13237 "configure" +#line 13963 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13241: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13967: \"$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:13247: \$? = $ac_status" >&5 + echo "$as_me:13973: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13263,7 +13989,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13266: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13992: 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 <<EOF @@ -13285,14 +14011,14 @@ cf_wait_headers="$cf_wait_headers fi fi -echo "$as_me:13288: checking for union wait" >&5 +echo "$as_me:14014: checking for union wait" >&5 echo $ECHO_N "checking for union wait... $ECHO_C" >&6 if test "${cf_cv_type_unionwait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13295 "configure" +#line 14021 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13308,16 +14034,16 @@ int x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14037: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13314: \$? = $ac_status" >&5 + echo "$as_me:14040: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13317: \"$ac_try\"") >&5 + { (eval echo "$as_me:14043: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13320: \$? = $ac_status" >&5 + echo "$as_me:14046: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -13327,7 +14053,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13330 "configure" +#line 14056 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13347,16 +14073,16 @@ union wait x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14076: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13353: \$? = $ac_status" >&5 + echo "$as_me:14079: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13356: \"$ac_try\"") >&5 + { (eval echo "$as_me:14082: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13359: \$? = $ac_status" >&5 + echo "$as_me:14085: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -13371,7 +14097,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13374: result: $cf_cv_type_unionwait" >&5 +echo "$as_me:14100: result: $cf_cv_type_unionwait" >&5 echo "${ECHO_T}$cf_cv_type_unionwait" >&6 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_UNIONWAIT 1 @@ -13379,14 +14105,14 @@ EOF if test $cf_cv_type_unionwait = yes; then - echo "$as_me:13382: checking if union wait can be used as wait-arg" >&5 + echo "$as_me:14108: checking if union wait can be used as wait-arg" >&5 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13389 "configure" +#line 14115 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13398,16 +14124,16 @@ union wait x; wait(&x) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13401: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14127: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13404: \$? = $ac_status" >&5 + echo "$as_me:14130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13407: \"$ac_try\"") >&5 + { (eval echo "$as_me:14133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13410: \$? = $ac_status" >&5 + echo "$as_me:14136: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_arg_union_wait=yes else @@ -13419,20 +14145,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:13422: result: $cf_cv_arg_union_wait" >&5 + echo "$as_me:14148: result: $cf_cv_arg_union_wait" >&5 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6 test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF #define WAIT_USES_UNION 1 EOF - echo "$as_me:13428: checking if union wait can be used as waitpid-arg" >&5 + echo "$as_me:14154: checking if union wait can be used as waitpid-arg" >&5 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_waitpid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13435 "configure" +#line 14161 "configure" #include "confdefs.h" $cf_wait_headers int @@ -13444,16 +14170,16 @@ union wait x; waitpid(0, &x, 0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13447: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14173: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13450: \$? = $ac_status" >&5 + echo "$as_me:14176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13453: \"$ac_try\"") >&5 + { (eval echo "$as_me:14179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13456: \$? = $ac_status" >&5 + echo "$as_me:14182: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_arg_union_waitpid=yes else @@ -13465,7 +14191,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:13468: result: $cf_cv_arg_union_waitpid" >&5 + echo "$as_me:14194: result: $cf_cv_arg_union_waitpid" >&5 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6 test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF #define WAITPID_USES_UNION 1 @@ -13473,14 +14199,14 @@ EOF fi -echo "$as_me:13476: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:14202: 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 13483 "configure" +#line 14209 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13497,23 +14223,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13500: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13503: \$? = $ac_status" >&5 + echo "$as_me:14229: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13506: \"$ac_try\"") >&5 + { (eval echo "$as_me:14232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13509: \$? = $ac_status" >&5 + echo "$as_me:14235: \$? = $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 13516 "configure" +#line 14242 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13531,16 +14257,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13534: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13537: \$? = $ac_status" >&5 + echo "$as_me:14263: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13540: \"$ac_try\"") >&5 + { (eval echo "$as_me:14266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13543: \$? = $ac_status" >&5 + echo "$as_me:14269: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -13552,7 +14278,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13555: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:14281: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -13575,7 +14301,7 @@ PACKAGE_CONFIG=dlg_config.h EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in" cat >conftest.$ac_ext <<_ACEOF -#line 13578 "configure" +#line 14304 "configure" #include "confdefs.h" #include <locale.h> int @@ -13587,16 +14313,16 @@ setlocale(LC_ALL, "") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13590: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13593: \$? = $ac_status" >&5 + echo "$as_me:14319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13596: \"$ac_try\"") >&5 + { (eval echo "$as_me:14322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13599: \$? = $ac_status" >&5 + echo "$as_me:14325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF #define HAVE_SETLOCALE 1 @@ -13609,7 +14335,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LD_RPATH_OPT= -echo "$as_me:13612: checking for an rpath option" >&5 +echo "$as_me:14338: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in #(vi irix*) #(vi @@ -13625,7 +14351,7 @@ linux*|gnu*|k*bsd*-gnu) #(vi openbsd[2-9].*|mirbsd*) #(vi LD_RPATH_OPT="-Wl,-rpath," ;; -freebsd*) #(vi +dragonfly*|freebsd*) #(vi LD_RPATH_OPT="-rpath " ;; netbsd*) #(vi @@ -13640,17 +14366,17 @@ solaris2*) #(vi *) ;; esac -echo "$as_me:13643: result: $LD_RPATH_OPT" >&5 +echo "$as_me:14369: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in #(vi x-R*) - echo "$as_me:13648: checking if we need a space after rpath option" >&5 + echo "$as_me:14374: 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="${LD_RPATH_OPT}$libdir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13653 "configure" +#line 14379 "configure" #include "confdefs.h" int @@ -13662,16 +14388,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13665: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14391: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13668: \$? = $ac_status" >&5 + echo "$as_me:14394: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13671: \"$ac_try\"") >&5 + { (eval echo "$as_me:14397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13674: \$? = $ac_status" >&5 + echo "$as_me:14400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -13681,13 +14407,13 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:13684: result: $cf_rpath_space" >&5 + echo "$as_me:14410: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac -echo "$as_me:13690: checking if rpath-hack should be disabled" >&5 +echo "$as_me:14416: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -13704,21 +14430,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:13707: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:14433: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:13711: checking for updated LDFLAGS" >&5 +echo "$as_me:14437: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:13714: result: maybe" >&5 + echo "$as_me:14440: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:13721: checking for $ac_word" >&5 +echo "$as_me:14447: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13733,7 +14459,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:13736: found $ac_dir/$ac_word" >&5 +echo "$as_me:14462: found $ac_dir/$ac_word" >&5 break done @@ -13741,10 +14467,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:13744: result: $cf_ldd_prog" >&5 + echo "$as_me:14470: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:13747: result: no" >&5 + echo "$as_me:14473: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13758,7 +14484,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 13761 "configure" +#line 14487 "configure" #include "confdefs.h" #include <stdio.h> int @@ -13770,16 +14496,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13773: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14499: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13776: \$? = $ac_status" >&5 + echo "$as_me:14502: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13779: \"$ac_try\"") >&5 + { (eval echo "$as_me:14505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:14508: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` @@ -13807,7 +14533,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:13810: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:14536: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -13819,11 +14545,11 @@ echo "${as_me:-configure}:13810: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:13822: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:14548: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:13826: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:14552: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -13860,7 +14586,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:13863: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:14589: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -13873,11 +14599,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:13876: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:14602: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:13880: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:14606: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -13914,7 +14640,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:13917: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:14643: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -13927,11 +14653,11 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:13930: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:14656: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:13934: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:14660: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 fi @@ -14018,7 +14744,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:14021: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:14747: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -14194,7 +14920,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:14197: error: ambiguous option: $1 + { { echo "$as_me:14923: 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;} @@ -14213,7 +14939,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:14216: error: unrecognized option: $1 + -*) { { echo "$as_me:14942: 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;} @@ -14263,7 +14989,7 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "dlg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS dlg_config.h:config.hin" ;; - *) { { echo "$as_me:14266: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:14992: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -14360,6 +15086,8 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@LINT@,$LINT,;t t +s,@LINT_OPTS@,$LINT_OPTS,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t @@ -14435,6 +15163,7 @@ s,@LIB_INSTALL@,$LIB_INSTALL,;t t s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t s,@LIBTOOL_MAKE@,$LIBTOOL_MAKE,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t +s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t s,@EXTRAOBJS@,$EXTRAOBJS,;t t s,@PACKAGE_PREFIX@,$PACKAGE_PREFIX,;t t s,@PACKAGE_CONFIG@,$PACKAGE_CONFIG,;t t @@ -14554,7 +15283,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:14557: creating $ac_file" >&5 + { echo "$as_me:15286: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -14572,7 +15301,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:14575: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:15304: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -14585,7 +15314,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:14588: error: cannot find input file: $f" >&5 + { { echo "$as_me:15317: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -14651,7 +15380,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:14654: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:15383: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -14662,7 +15391,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:14665: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:15394: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -14675,7 +15404,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:14678: error: cannot find input file: $f" >&5 + { { echo "$as_me:15407: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -14733,7 +15462,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:14736: $ac_file is unchanged" >&5 + { echo "$as_me:15465: $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/contrib/dialog/configure.in b/contrib/dialog/configure.in index 2feac73..ea2d562 100644 --- a/contrib/dialog/configure.in +++ b/contrib/dialog/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.65 2011/06/27 10:42:27 tom Exp $ +dnl $Id: configure.in,v 1.68 2011/10/20 21:02:43 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl --------------------------------------------------------------------------- dnl Copyright 1999-2010,2011 -- Thomas E. Dickey @@ -45,6 +45,7 @@ AC_PROG_GCC_TRADITIONAL AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_INSTALL +CF_PROG_LINT dnl needed for CF_WITH_LIBTOOL AC_CHECK_TOOL(AR, ar, ar) @@ -232,6 +233,7 @@ wget_wch \ AC_CHECK_FUNC(start_color,[AC_DEFINE(HAVE_COLOR)]) CF_CURSES_CHTYPE CF_CURSES_WACS_SYMBOLS +CF_CURSES_WGETPARENT CF_FUNC_WAIT CF_MBSTATE_T diff --git a/contrib/dialog/dialog.1 b/contrib/dialog/dialog.1 index 8fd4de1..89f4918 100644 --- a/contrib/dialog/dialog.1 +++ b/contrib/dialog/dialog.1 @@ -1,6 +1,6 @@ '\" t -.\" $Id: dialog.1,v 1.133 2011/06/29 09:39:29 tom Exp $ -.\" Copyright 2005-2010,2011 Thomas E. Dickey +.\" $Id: dialog.1,v 1.145 2012/07/03 08:32:33 tom Exp $ +.\" Copyright 2005-2011,2012 Thomas E. Dickey .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU Lesser General Public License, version 2.1 @@ -27,16 +27,17 @@ .ne 8 .IP .. -.de EX -.RS +10 +.de Ex +.RS +7 +.PP .nf .. -.de EE +.de Ee .fi .RE .. . -.TH \*D 1 "" "$Date: 2011/06/29 09:39:29 $" +.TH \*D 1 "" "$Date: 2012/07/03 08:32:33 $" .SH NAME \*p \- display dialog boxes from shell scripts .SH SYNOPSIS @@ -172,39 +173,39 @@ To compare the effects, use these: . .ES All three widgets visible, staircase effect, ordered 1,2,3: -.EX -\*p \ +.Ex +\*p \\ --begin 2 2 --yesno "" 0 0 \\ --and-widget --begin 4 4 --yesno "" 0 0 \\ --and-widget --begin 6 6 --yesno "" 0 0 -.EE +.Ee . .ES Only the last widget is left visible: -.EX -\*p \ +.Ex +\*p \\ --clear --begin 2 2 --yesno "" 0 0 \\ --and-widget --clear --begin 4 4 --yesno "" 0 0 \\ --and-widget --begin 6 6 --yesno "" 0 0 -.EE +.Ee . .ES All three widgets visible, staircase effect, ordered 3,2,1: -.EX -\*p \ +.Ex +\*p \\ --keep-window --begin 2 2 --yesno "" 0 0 \\ --and-widget --keep-window --begin 4 4 --yesno "" 0 0 \\ --and-widget --begin 6 6 --yesno "" 0 0 -.EE +.Ee . .ES First and third widget visible, staircase effect, ordered 3,1: -.EX -\*p \ +.Ex +\*p \\ --keep-window --begin 2 2 --yesno "" 0 0 \\ --and-widget --clear --begin 4 4 --yesno "" 0 0 \\ --and-widget --begin 6 6 --yesno "" 0 0 -.EE +.Ee .IP Note, if you want to restore original console colors and send your cursor home after the dialog program has exited, use the \fBclear\fR\ (1) @@ -237,6 +238,7 @@ occurrences of the given string, and to align the split data into columns. .IP "\fB--cr-wrap" Interpret embedded newlines in the dialog text as a newline on the screen. Otherwise, \fB\*p\fR will only wrap lines where needed to fit inside the text box. +.IP Even though you can control line breaks with this, \fB\*L\fR will still wrap any lines that are too long for the width of the box. Without cr-wrap, the layout of your text may be formatted to look nice @@ -270,6 +272,25 @@ If "\fB--nocancel\fP" or "\fB--visit-items\fP" are given those options overrides this, making the default button always "Yes" (internally the same as "OK"). . +.IP "\fB--default-button \fIstring" +Set the default (preselected) button in a widget. +By preselecting a button, +a script makes it possible for the user to simply press \fIEnter\fP +to proceed through a dialog with minimum interaction. +.IP +The option's value is the name of the button: +.IR ok , +.IR yes , +.IR cancel , +.IR no , +.IR help "\ or" +.IR extra . +.IP +Normally the first button in each widget is the default. +The first button shown is determined by the widget +together with the "\fB--nook\fP" and "\fB--nocancel\fP options. +If this option is not given, there is no default button assigned. +. .IP "\fB--default-item \fIstring" Set the default item in a checklist, form or menu box. Normally the first item in the box is the default. @@ -338,13 +359,14 @@ adding a column which is displayed in the bottom line of the screen, for the currently selected item. . .IP "\fB--keep-tite" -Normally \fB\*p\fP checks to see if it is running in an \fBxterm\fP, +When built with \fBncurses\fP, +\fB\*p\fP normally checks to see if it is running in an \fBxterm\fP, and in that case tries to suppress the initialization strings that would make it switch to the alternate screen. Switching between the normal and alternate screens is visually distracting in a script which runs \fB\*p\fP several times. -Use this option to allow \fB\*p\fP to use those initialization strings. +Use this option to allow \fB\*p\fP to use those initialization strings. . .IP "\fB--keep-window" Normally when \fB\*p\fR performs several \fBtailboxbg\fR widgets @@ -433,6 +455,11 @@ Prints \fB\*p\fR's version to \fB\*p\fP's output. This may be used alone, without other options. It does not cause \fBdialog\fP to exit by itself. . +.IP "\fB--quoted" +Normally \fB\*p\fP quotes the strings returned by checklist's +as well as the item-help text. +Use this option to quote all string results. +. .IP "\fB--scrollbar" For widgets holding a scrollable set of data, draw a scrollbar on its right-margin. @@ -456,8 +483,8 @@ Draw a shadow to the right and bottom of each dialog box. Use single-quoting as needed (and no quotes if unneeded) for the output of checklist's as well as the item-help text. If this option is not set, \fB\*p\fP uses double quotes around each item. -That requires occasional use of backslashes to make the output useful in -shell scripts. +In either case, +\fB\*p\fP adds backslashes to make the output useful in shell scripts. . .IP "\fB--size-err" Check the resulting size of a dialog box before trying to use it, @@ -501,8 +528,11 @@ The day, month, year values in this case are for the current local time. .IP "\fB--timeout \fIsecs" Timeout (exit with error code) if no user response within the given number of seconds. -This is overridden if the background "\fB--tailboxbg\fP is used. A timeout of zero seconds is ignored. +.IP +This option is ignored by the "\fB--pause\fP" widget. +It is also overridden if the background "\fB--tailboxbg\fP" option is used +to setup multiple concurrent widgets. . .IP "\fB--title \fItitle" Specifies a @@ -510,11 +540,16 @@ Specifies a string to be displayed at the top of the dialog box. . .IP "\fB--trace \fIfilename" -logs the command-line parameters and -keystrokes to the given file. +logs the command-line parameters, +keystrokes and other information to the given file. If \fBdialog\fP reads a configure file, it is logged as well. Piped input to the \fIgauge\fP widget is logged. Use control/T to log a picture of the current dialog window. +.PP +The \fB\*p\fR program handles some command-line parameters specially, +and removes them from the parameter list as they are processed. +For example, if the first option is \fB--trace\fP, +then that is processed (and removed) before \fB\*p\fR initializes the display. . .IP "\fB--trim" eliminate leading blanks, @@ -589,8 +624,10 @@ The initial on/off state of each entry is specified by On exit, a list of the \fItag\fP strings of those entries that are turned on will be printed on \fB\*p\fP's output. +.IP If the "\fB--separate-output\fP" option is not given, -the strings will be quoted to make it simple for scripts to separate them. +the strings will be quoted as needed to make it simple for scripts to separate them. +By default, this uses double-quotes. See the "\fB--single-quoted\fP" option, which modifies the quoting behavior. . . @@ -621,7 +658,7 @@ On exit, the contents of the text-entry window are written to \fB\*p\fP's output . .IP "\fB--editbox \fIfilepath height width\fR" The edit-box dialog displays a copy of the file. -You may edit it using +You may edit it using the \fIbackspace\fP, \fIdelete\fP and cursor keys to correct typing errors. It also recognizes pageup/pagedown. @@ -847,7 +884,7 @@ On exit, no text is written to \fB\*p\fP's output. Only an "OK" button is provided for input, but an ESC exit status may be returned. . -.IP "\fB\-\-pause \fItext height width seconds\fR" +.IP "\fB--pause \fItext height width seconds\fR" A \fBpause\fP box displays a meter along the bottom of the box. @@ -899,7 +936,8 @@ If only two parameters are given, this text is omitted. .IP "\fB--programbox \fIheight width" A \fBprogrambox\fP is very similar to a \fBprogressbox\fP. The only difference between a \fBprogram\fP box and a \fBprogress\fP -box is that a \fBprogram\fP box displays an \fBOK\fP button. +box is that a \fBprogram\fP box displays an \fBOK\fP button +(but only after the command completes). .IP This dialog box is used to display the piped output of a command. After the command completes, the user can press the \fIENTER\fP key so that @@ -913,7 +951,16 @@ If only two parameters are given, this text is omitted. .IP "\fB--progressbox \fItext height width" .IP "\fB--progressbox \fIheight width" A \fBprogressbox\fP is similar to an \fBtailbox\fP, -except that it will exit when it reaches the end of the file. +except that +.RS +.TP 3 +a) rather than displaying the contents of a file, +it displays the piped output of a command and +.TP 3 +b) it will exit when it reaches the end of the file +(there is no "OK" button). +.RE +.IP If three parameters are given, it displays the text under the title, delineated from the scrolling file's contents. If only two parameters are given, this text is omitted. @@ -1094,9 +1141,10 @@ can find, as stated in step 2 above. You can override or add to key bindings in \fB\*p\fP by adding to the configuration file. \fB\*L\fP's \fBbindkey\fP command maps single keys to its internal coding. -.EX +.Ex bindkey \fIwidget\fP \fIcurses_key\fP \fIdialog_key\fP -.EE +.Ee +.PP The \fIwidget\fP name can be "*" (all widgets), or specific widgets such as \fBtextbox\fP. Specific widget bindings override the "*" bindings. @@ -1111,6 +1159,82 @@ Finally, it allows any single character to be escaped with a backslash. \fB\*L\fP's internal keycode names correspond to the \fBDLG_KEYS_ENUM\fP type in \fBdlg_keys.h\fP, e.g., "HELP" from "DLGK_HELP". +.SS Widget Names +.PP +Some widgets (such as the formbox) have an area where fields can be edited. +Those are managed in a subwindow of the widget, and +may have separate keybindings from the main widget +because the subwindows are registered using a different name. +.TS +center tab(/) ; +l l l +l l l . +\fIWidget\fR/\fIWindow name\fR/\fISubwindow Name\fR +calendar/calendar +checklist/checklist +editbox/editbox/editbox2 +form/formbox/formfield +fselect/fselect/fselect2 +inputbox/inputbox/inputbox2 +menu/menubox/menu +msgbox/msgbox +pause/pause +progressbox/progressbox +radiolist/radiolist +tailbox/tailbox +textbox/textbox/searchbox +timebox/timebox +yesno/yesno +.TE +.PP +Some widgets are actually other widgets, +using internal settings to modify the behavior. +Those use the same widget name as the actual widget: +.TS +center tab(/) ; +l l +l l . +\fIWidget\fR/\fIActual Widget\fR +dselect/fselect +infobox/msgbox +inputmenu/menu +mixedform/form +passwordbox/inputbox +passwordform/form +prgbox/progressbox +programbox/progressbox +tailboxbg/tailbox +.TE +.SS Built-in Bindings +This manual page does not list the key bindings for each widget, +because that detailed information can be obtained by running \fB\*p\fP. +If you have set the \fB--trace\fP option, +\fB\*p\fP writes the key-binding information for each widget +as it is registered. +.SS Example +Normally \fB\*p\fP uses different keys for navigating between the buttons +and editing part of a dialog versus navigating within the editing part. +That is, tab (and back-tab) traverse buttons +(or between buttons and the editing part), +while arrow keys traverse fields within the editing part. +Tabs are also recognized as a special case for traversing between +widgets, e.g., when using multiple tailboxbg widgets. +.PP +Some users may wish to use the same key for traversing within the +editing part as for traversing between buttons. +The form widget is written to support this sort of redefinition of +the keys, by adding a special group in <code>dlgk_keys.h</code> +for "form" (left/right/next/prev). +Here is an example binding demonstrating how to do this: +.Ex +bindkey formfield TAB form_NEXT +bindkey formbox TAB form_NEXT +bindkey formfield BTAB form_prev +bindkey formbox BTAB form_prev +.Ee +.PP +That type of redefinition would not be useful in other widgets, +e.g., calendar, due to the potentially large number of fields to traverse. . .\" ************************************************************************ .SH ENVIRONMENT @@ -1149,7 +1273,7 @@ error (-1), ESC (255), Extra (3), Help (2), -Help with --item-help (2), +Help with \fB--item-help\fP (2), or OK (0). Normally shell scripts cannot distinguish between -1 and 255. .TP 15 @@ -1167,35 +1291,39 @@ of how to use the different box options and how they look. Just take a look into the directory \fBsamples/\fP of the source. .SH DIAGNOSTICS Exit status is subject to being overridden by environment variables. -Normally they are: +The default values and corresponding environment variables +that can override them are: .TP 5 0 if .BR \*p " is exited by pressing the " Yes " or " OK -button. +button (DIALOG_OK). .TP 5 1 if the .BR No " or " Cancel -button is pressed. +button is pressed (DIALOG_CANCEL). .TP 5 2 if the .BR Help -button is pressed. +button is pressed (DIALOG_HELP). .TP 5 3 if the .BR Extra -button is pressed. +button is pressed (DIALOG_EXTRA). +.TP 5 4 if the -.BR Item Help -button is pressed. +.BR Help +button is pressed (DIALOG_HELP), +or the \fB--item-help\fP option is set +when the \fBHelp\fP button is pressed (DIALOG_ITEM_HELP), .TP 5 -1 -if errors occur inside \fB\*p\fP -or \fB\*p\fP is exited by pressing the \fIESC\fP key. +if errors occur inside \fB\*p\fP (DIALOG_ERROR) +or \fB\*p\fP is exited by pressing the \fIESC\fP key (DIALOG_ESC). . .\" ************************************************************************ .SH PORTABILITY @@ -1270,7 +1398,8 @@ Its documentation claims .sp .nf whiptail(1) is a lightweight replacement for \*p(1), -to provide dialog boxes for shell scripts. It is built on the +to provide dialog boxes for shell scripts. +It is built on the newt windowing library rather than the ncurses library, allowing it to be smaller in embedded enviroments such as installers, rescue disks, etc. @@ -1298,7 +1427,7 @@ but oddly cites only \fB\*p\fP versions up to 0.4 (1996) as a source. That is, its manpage refers to features which were borrowed from more recent versions of \fB\*p\fP, e.g., the \fB--gauge\fP and \fB--password\fP boxes, -as well as options such as \fB-separate-output\fP (2008). +as well as options such as \fB--separate-output\fP (2008). Somewhat humorously, one may note that the \fBpopt\fP feature (undocumented in its manpage) of using a "--" as an escape was documented in \fB\*p\fP's manpage about diff --git a/contrib/dialog/dialog.3 b/contrib/dialog/dialog.3 index 62938af..737b577 100644 --- a/contrib/dialog/dialog.3 +++ b/contrib/dialog/dialog.3 @@ -1,5 +1,5 @@ -.\" $Id: dialog.3,v 1.68 2011/06/29 09:07:36 tom Exp $ -.\" Copyright 2005-2010,2011 Thomas E. Dickey +.\" $Id: dialog.3,v 1.76 2012/07/03 08:22:10 tom Exp $ +.\" Copyright 2005-2011,2012 Thomas E. Dickey .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU Lesser General Public License, version 2.1 @@ -38,7 +38,7 @@ .de bP .IP \(bu 4 .. -.TH \*D 3 "" "$Date: 2011/06/29 09:07:36 $" +.TH \*D 3 "" "$Date: 2012/07/03 08:22:10 $" .SH NAME \*l \- widgets and utilities for the \*p program .SH SYNOPSIS @@ -108,6 +108,11 @@ are designed for use by the calling application while variables beginning with "\fIdlg_\fP" are intended for lower levels, e.g., by the \fB\*l\fP library. .\" --------------------------------------------------------------------------- +.IP \fIDIALOG_STATE.all_subwindows +This is a linked list of all subwindows created by the library. +The \fBdlg_del_window\fP function uses this +to free storage for subwindows when deleting a window. +.\" --------------------------------------------------------------------------- .IP \fIDIALOG_STATE.all_windows This is a linked list of all windows created by the library. The \fBdlg_del_window\fP function uses this to locate windows which @@ -290,6 +295,9 @@ bright red. Restore normal settings with "\\Zn". .\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.column_separator +This corresponds to the command-line option "\fB--column-separator\fP". +\fB\*L\fP splits data for radio/checkboxes and menus on the +occurrences of the given string, and aligns the split data into columns. .\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.cr_wrap This corresponds to the command-line option "\fB--cr-wrap\fP". @@ -307,11 +315,16 @@ This corresponds to the command-line option "\fB--date-format\fP \fIstring\fP". If the host provides \fBstrftime\fP, and the value is nonnull, the calendar widget uses this to format its output. .\" --------------------------------------------------------------------------- +.IP \fIDIALOG_VARS.default_button +This is set by the command-line option "\fB--default-button\fP. +It is used by \fBdlg_default_button\fP. +.\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.default_item This corresponds to the command-line option "\fB--default-item\fP \fIstring\fP". The given string is used as the default item in a checklist, form or menu box. Normally the first item in the box is the default. +.\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.defaultno This corresponds to the command-line option "\fB--defaultno\fP". If true, @@ -477,6 +490,8 @@ Note that \fB\*p\fR will still wrap text, subject to the \fB--cr-wrap\fR option. .\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.nook +This corresponds to the command-line option "\fB--nook\fP. +\fB\*L\fP will suppress the "ok" (or "yes") button from the widget. .\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.ok_label This corresponds to the command-line option "\fB--ok-label\fP \fIstring\fP". @@ -488,6 +503,7 @@ If true, each widget prints its size to \fB\*p\fP's output when it is invoked. .\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.quoted +This corresponds to the command-line option "\fB--quoted\fP. .\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.separate_output This corresponds to the command-line option "\fB--separate-output\fP". @@ -501,8 +517,9 @@ If true, Use single-quoting as needed (and no quotes if unneeded) for the output of checklist's as well as the item-help text. If this option is not set, \fB\*p\fP uses double quotes around each item. -That requires occasional use of backslashes to make the output useful in +The latter requires occasional use of backslashes to make the output useful in shell scripts. +.\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.size_err This corresponds to the command-line option "\fB--size-err\fP". If true, @@ -918,7 +935,8 @@ If zero, the height is based on the screen size. .B int \fIwidth is the desired width of the box. If zero, the height is based on the screen size. -.IP percent +.TP 5 +.B int \fIpercent is the percentage to show in the progress bar. .TP 5 .B int \fIitem_no @@ -1193,6 +1211,9 @@ function to call when input ends, e.g., to free caller's additional data. .TP 5 .B dlg_add_quoted Add a quoted string to the result buffer (see \fBdlg_add_result\fP). +If no quotes are necessary, none are used. +If \fBdialog_vars.single_quoted\fR is set, single-quotes are used. +Otherwise, double-quotes are used. .RS .TP 5 .B char * \fIstring @@ -1201,7 +1222,7 @@ is the string to add. .\" --------------------------------------------------------------------------- .TP 5 .B dlg_add_result -Add a quoted string to the result buffer \fBdialog_vars.input_result\fP. +Add a string to the result buffer \fBdialog_vars.input_result\fP. .RS .TP 5 .B char * \fIstring @@ -1276,6 +1297,10 @@ is the percentage to show in the progress bar. returns its parameter transformed to the corresponding "+" or "-", etc. for the line-drawing characters used in \fB\*p\fP. If the parameter is not a line-drawing or other special character such as ACS_DARROW, it returns 0. +.RS +.TP 5 +.B chtype \fIch +is the parameter, usually one of the \fBACS_\fP\fIxxx\fP constants. .RE .\" --------------------------------------------------------------------------- .TP 5 @@ -1337,13 +1362,13 @@ is the name of the file. .TP 5 .B int * \fIheight is the nominal height. -If it is -1, use the screen's height after subtracting \fBdialog_vars.begin_y\fP -if \fBdialog_vars.begin_set\fP is true. +If it is -1, use the screen's height (after subtracting \fBdialog_vars.begin_y\fP +if \fBdialog_vars.begin_set\fP is true). .TP 5 -.B int \fI*width +.B int * \fIwidth is the nominal width. -If it is -1, use the screen's width after subtracting \fBdialog_vars.begin_x\fP -if \fBdialog_vars.begin_set\fP is true. +If it is -1, use the screen's width (after subtracting \fBdialog_vars.begin_x\fP +if \fBdialog_vars.begin_set\fP is true). .TP 5 .B int \fIboxlines is the number of lines to reserve on the screen for drawing boxes. @@ -1360,7 +1385,7 @@ this calls \fBbeep\fP once and sets .\" --------------------------------------------------------------------------- .TP 5 .B dlg_boxchar -returns its parameter transformed as follows: +returns its \fBchtype\fP parameter transformed as follows: .RS .TP 3 .B - @@ -1685,6 +1710,18 @@ is the string to measure. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_count_real_columns +Returns the number of columns used for a string, +accounting for "\\Z" sequences which can be used for +coloring the text if \fBdialog_vars.colors\fP is set. +This is not necessarily the number of bytes in a string. +.RS +.TP 5 +.B const char * \fIstring +is the string to measure. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_count_wchars Returns the number of wide-characters in the string. .RS @@ -1719,6 +1756,13 @@ is the window's width .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_default_button +If \fBdialog_vars.default_button\fP is positive, +return the button-index for that button code, +using \fBdlg_ok_buttoncode\fP to test indices starting with zero. +Otherwise (or if no match was found for the button code), return zero. +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_default_formitem If \fBdialog_vars.default_item\fP is not null, find that name by matching the \fIname\fP field in the list of form \fIitems\fP. @@ -1830,12 +1874,34 @@ is the window's border attribute. Draw a partial box at the bottom of a window, e.g., to surround a row of buttons. It is designed to merge with an existing box around -the whole window, so it uses tee-elements rather than corner-elements +the whole window (see \fBdlg_draw_box\fP), +so it uses tee-elements rather than corner-elements +on the top corners of this box. +.RS +.TP 5 +.B WINDOW * \fIwin +is the window to update. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 +.B dlg_draw_bottom_box2 +Draw a partial box at the bottom of a window, +e.g., to surround a row of buttons. +It is designed to merge with an existing box around +the whole window (see \fBdlg_draw_box2\fP), +so it uses tee-elements rather than corner-elements on the top corners of this box. .RS .TP 5 .B WINDOW * \fIwin is the window to update. +.B chtype \fIon_left +is used to color the upper/left edges of the box, i.e., the tee-element and +horizontal line +.B chtype \fIon_right +is used to color the right edge of the box, i.e., the tee-element +.B chtype \fIon_inside +is used to fill-color the inside of the box .RE .\" --------------------------------------------------------------------------- .TP 5 @@ -1867,6 +1933,36 @@ is used to color the upper/left edges. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_draw_box2 +Draw a rectangular box with line drawing characters. +.RS +.TP 5 +.B WINDOW * \fIwin +is the window to update. +.TP 5 +.B int \fIy +is the top row of the box. +.TP 5 +.B int \fIx +is the left column of the box. +.TP 5 +.B int \fIheight +is the height of the box. +.TP 5 +.B int \fIwidth +is the width of the box. +.TP 5 +.B chtype \fIboxchar +is used to fill-color for the box contents. +.TP 5 +.B chtype \fIborderchar +is used to color the upper/left edges. +.TP 5 +.B chtype \fIborderchar2 +is used to color the right/lower edges. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_draw_buttons Print a list of buttons at the given position. .RS @@ -1992,6 +2088,27 @@ is the title string to display at the top of the widget. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_dummy_menutext +This is a utility function which supports the \fB--inputmenu\fP option of +the \fB\*p\fP program. +If \fBdialog_vars.input_menu\fP is set, \fBdialog_menu\fP passes this +pointer to \fBdlg_menu\fP as the \fIrename_menutext\fP parameter. +Otherwise, it passes \fBdlg_dummy_menutext\fP. +.IP +The function should only return \fBDLG_EXIT_ERROR\fP. +.RS +.TP 5 +.B DIALOG_LISTITEM * \fIitems +is the list of menu items +.TP 5 +.B int \fIcurrent +is the index of the currently-selected item +.TP 5 +.B char * \fInewtext +is the updated text for the menu item +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_dump_keys Write all user-defined key-bindings to the given stream, e.g., as part of \fBdlg_create_rc\fP. @@ -2002,6 +2119,20 @@ is the stream on which to write the bindings. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_dump_window_keys +Write all user-defined key-bindings to the given stream, +e.g., as part of \fBdlg_create_rc\fP. +.RS +.TP 5 +.B FILE * \fIfp +is the stream on which to write the bindings. +.TP 5 +.B WINDOW * \fIwin +is the window for which bindings should be dumped. +If it is null, then only built-in bindings are dumped. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_eat_argv Remove one or more items from an argument vector. .RS @@ -2416,6 +2547,10 @@ The widget sets the referenced location to the index of the current display item (cursor) when it returns. .TP 5 .B DIALOG_INPUTMENU \fIrename_menutext +If this is not \fBdlg_dummy_menutext\fP, +the widget acts like an \fIinputmenu\fP widget, +providing an extra "Rename" button, +which activates an edit feature on the selected menu item. .RE .\" --------------------------------------------------------------------------- .TP 5 @@ -2898,11 +3033,35 @@ is the binding table Remove a callback. .RS .TP 5 -.B DIALOG_CALLBACK \fI* p +.B DIALOG_CALLBACK * \fIp contains the callback information. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_renamed_menutext +This is a utility function which supports the \fB--inputmenu\fP option of +the \fB\*p\fP program. +If \fBdialog_vars.input_menu\fP is set, \fBdialog_menu\fP passes this +pointer to \fBdlg_menu\fP as the \fIrename_menutext\fP parameter. +Otherwise, it passes \fBdlg_dummy_menutext\fP. +.IP +The function should add "RENAMED" to \fBdialog_vars.input_result\fP , +followed by the menu item's name and the \fInewtext\fP value +(with a space separating the three items), +and return \fBDLG_EXIT_EXTRA\fP. +.RS +.TP 5 +.B DIALOG_LISTITEM * \fIitems +is the list of menu items +.TP 5 +.B int \fIcurrent +is the index of the currently-selected item +.TP 5 +.B char * \fInewtext +is the updated text for the menu item +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_restore_vars Restore \fB\*p\fP's variables from the given variable (see \fBdialog_save_vars\fP). .RS @@ -3015,10 +3174,10 @@ is the string to duplicate compare two strings, ignoring case. .RS .TP 5 -.B const char \fI* a +.B const char * \fIa is one string .TP 5 -.B const char \fI* b +.B const char * \fIb is the other string .RE .\" --------------------------------------------------------------------------- diff --git a/contrib/dialog/dialog.c b/contrib/dialog/dialog.c index 44a16db..249eaac 100644 --- a/contrib/dialog/dialog.c +++ b/contrib/dialog/dialog.c @@ -1,9 +1,9 @@ /* - * $Id: dialog.c,v 1.193 2011/06/29 09:10:56 tom Exp $ + * $Id: dialog.c,v 1.202 2012/07/01 20:20:39 tom Exp $ * * cdialog - Display simple dialog boxes from shell scripts * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -57,6 +57,7 @@ typedef enum { ,o_cr_wrap ,o_create_rc ,o_date_format + ,o_default_button ,o_default_item ,o_defaultno ,o_dselect @@ -201,6 +202,7 @@ static const Options options[] = { { "cr-wrap", o_cr_wrap, 1, "" }, { "create-rc", o_create_rc, 1, NULL }, { "date-format", o_date_format, 1, "<str>" }, + { "default-button", o_default_button, 1, "<str>" }, { "default-item", o_default_item, 1, "<str>" }, { "defaultno", o_defaultno, 1, "" }, { "dselect", o_dselect, 2, "<directory> <height> <width>" }, @@ -431,6 +433,12 @@ unescape_argv(int *argcp, char ***argvp) dialog_argv = (*argvp); } +#define OptionChars "\ +0123456789\ +-\ +abcdefghijklmnopqrstuvwxyz\ +" + /* * Check if the given string from main's argv is an option. */ @@ -449,7 +457,11 @@ isOption(const char *arg) } } } else if (!strncmp(arg, "--", (size_t) 2) && isalpha(UCH(arg[2]))) { - result = TRUE; + if (strlen(arg) == strspn(arg, OptionChars)) { + result = TRUE; + } else { + dlg_exiterr("Invalid option \"%s\"", arg); + } } } return result; @@ -459,17 +471,19 @@ static eOptions lookupOption(const char *name, int pass) { unsigned n; + eOptions result = o_unknown; if (isOption(name)) { name += 2; for (n = 0; n < sizeof(options) / sizeof(options[0]); n++) { if ((pass & options[n].pass) != 0 && !strcmp(name, options[n].name)) { - return options[n].code; + result = options[n].code; + break; } } } - return o_unknown; + return result; } static void @@ -685,9 +699,7 @@ call_checklist(CALLARGS) { int tags = howmany_tags(av + 5, CHECKBOX_TAGS); int code; - bool save_quoted = dialog_vars.quoted; - dialog_vars.quoted = !dialog_vars.separate_output; *offset_add = 5 + tags * CHECKBOX_TAGS; code = dialog_checklist(t, av[1], @@ -695,7 +707,6 @@ call_checklist(CALLARGS) numeric_arg(av, 3), numeric_arg(av, 4), tags, av + 5, FLAG_CHECK); - dialog_vars.quoted = save_quoted; return code; } @@ -1052,6 +1063,43 @@ optionValue(char **argv, int *num) return result; } +/* Return exit-code for a named button */ +static int +button_code(const char *name) +{ + /* *INDENT-OFF* */ + static struct { + const char *name; + int code; + } table[] = { + { "ok", DLG_EXIT_OK }, + { "yes", DLG_EXIT_OK }, + { "cancel", DLG_EXIT_CANCEL }, + { "no", DLG_EXIT_CANCEL }, + { "help", DLG_EXIT_HELP }, + { "extra", DLG_EXIT_EXTRA }, + }; + /* *INDENT-ON* */ + + int code = DLG_EXIT_ERROR; + size_t i; + + for (i = 0; i < (sizeof(table) / sizeof(table[0])); i++) { + if (!dlg_strcmp(name, table[i].name)) { + code = table[i].code; + break; + } + } + + if (code == DLG_EXIT_ERROR) { + char temp[80]; + sprintf(temp, "Button name \"%.20s\" unknown", name); + Usage(temp); + } + + return code; +} + /* * Print parts of a message */ @@ -1115,7 +1163,7 @@ Help(void) static const char *const tbl_1[] = { "cdialog (ComeOn Dialog!) version %s", - "Copyright 2000-2008,2011 Thomas E. Dickey", + "Copyright 2000-2011,2012 Thomas E. Dickey", "This is free software; see the source for copying conditions. There is NO", "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.", "", @@ -1179,6 +1227,29 @@ Help(void) dlg_exit(DLG_EXIT_OK); } +#ifdef HAVE_DLG_TRACE +/* + * Only the first call to dlg_trace will open a trace file. But each time + * --trace is parsed, we show the whole parameter list as it is at that moment, + * counting discarded parameters. The only way to capture the whole parameter + * list is if --trace is the first option. + */ +static void +process_trace_option(char **argv, int *offset) +{ + int j; + + if (dialog_state.trace_output == 0) + dlg_trace(optionString(argv, offset)); + + dlg_trace_msg("# Parameters:\n"); + for (j = 0; argv[j] != 0; ++j) { + dlg_trace_msg("# argv[%d] = %s\n", j, argv[j]); + } + *offset += 1; +} +#endif + /* * "Common" options apply to all widgets more/less. Most of the common options * set values in dialog_vars, a few set dialog_state and a couple write to the @@ -1187,12 +1258,12 @@ Help(void) static int process_common_options(int argc, char **argv, int offset, bool output) { -#ifdef HAVE_DLG_TRACE - int n; -#endif bool done = FALSE; + dlg_trace_msg("# process_common_options, offset %d\n", offset); + while (offset < argc && !done) { /* Common options */ + dlg_trace_msg("#\targv[%d] = %s\n", offset, argv[offset]); switch (lookupOption(argv[offset], 1)) { case o_title: dialog_vars.title = optionString(argv, &offset); @@ -1250,6 +1321,11 @@ process_common_options(int argc, char **argv, int offset, bool output) break; case o_defaultno: dialog_vars.defaultno = TRUE; + dialog_vars.default_button = DLG_EXIT_CANCEL; + break; + case o_default_button: + dialog_vars.default_button = button_code(optionString(argv, &offset)); + dialog_vars.defaultno = dialog_vars.default_button == DLG_EXIT_CANCEL; break; case o_default_item: dialog_vars.default_item = optionString(argv, &offset); @@ -1416,10 +1492,7 @@ process_common_options(int argc, char **argv, int offset, bool output) break; #ifdef HAVE_DLG_TRACE case o_trace: - dlg_trace(optionString(argv, &offset)); - for (n = 0; argv[n] != 0; ++n) { - dlg_trace_msg("argv[%d] = %s\n", n, argv[n]); - } + process_trace_option(argv, &offset); break; #endif } @@ -1440,12 +1513,16 @@ init_result(char *buffer) static char **special_argv = 0; static int special_argc = 0; + dlg_trace_msg("# init_result\n"); + /* clear everything we do not save for the next widget */ memset(&dialog_vars, 0, sizeof(dialog_vars)); dialog_vars.input_result = buffer; dialog_vars.input_result[0] = '\0'; + dialog_vars.default_button = -1; + /* * The first time this is called, check for common options given by an * environment variable. @@ -1458,12 +1535,20 @@ init_result(char *buffer) special_argv = dlg_string_to_argv(env); special_argc = dlg_count_argv(special_argv); } + first = FALSE; } + + /* + * If we are not checking memory leaks, just do the parse of the + * environment once. + */ if (special_argv != 0) { process_common_options(special_argc, special_argv, 0, FALSE); #ifdef NO_LEAKS free(special_argv[0]); free(special_argv); + special_argv = 0; + special_argc = 0; first = TRUE; #endif } @@ -1539,10 +1624,28 @@ main(int argc, char *argv[]) case o_help: Help(); break; +#ifdef HAVE_DLG_TRACE + case o_trace: + /* + * Process/remove the --trace option if it is the first option. + * Otherwise, process it in more/less expected order as a + * "common" option. + */ + if (base == 1) { + process_trace_option(argv, &offset); + break; + } else { + ++offset; + continue; + } +#endif default: ++offset; continue; } + dlg_trace_msg("# discarding %d parameters starting with argv[%d] (%s)\n", + 1 + offset - base, base, + argv[base]); for (j = base; j < argc; ++j) { dialog_argv[j] = dialog_argv[j + 1 + (offset - base)]; if (dialog_opts != 0) @@ -1679,6 +1782,7 @@ main(int argc, char *argv[]) retval = show_result((*(modePtr->jumper)) (dialog_vars.title, argv + offset, &offset_add)); + dlg_trace_msg("# widget returns %d\n", retval); offset += offset_add; if (dialog_vars.input_result != my_buffer) { diff --git a/contrib/dialog/dialog.h b/contrib/dialog/dialog.h index 4e1b01c..1e31b09 100644 --- a/contrib/dialog/dialog.h +++ b/contrib/dialog/dialog.h @@ -1,9 +1,9 @@ /* - * $Id: dialog.h,v 1.231 2011/06/29 09:51:00 tom Exp $ + * $Id: dialog.h,v 1.245 2012/07/01 18:44:03 tom Exp $ * * dialog.h -- common declarations for all dialog modules * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -59,11 +59,9 @@ #include <ncurses.h> #else #include <curses.h> -#endif - -/* most curses.h headers include this, some do not */ #if defined(HAVE_UNCTRL_H) -#include <unctrl.h> +#include <unctrl.h> /* most curses.h headers include this, some do not */ +#endif #endif /* Solaris xpg4 renames these */ @@ -97,6 +95,10 @@ #define _(s) s #endif +#ifndef GCC_PRINTFLIKE +#define GCC_PRINTFLIKE(fmt,var) /*nothing*/ +#endif + #ifndef GCC_NORETURN #define GCC_NORETURN /*nothing*/ #endif @@ -233,6 +235,11 @@ #define getparyx(win,y,x) (y = (win)?(win)->_pary:ERR, x = (win)?(win)->_parx:ERR) #endif +#if !defined(HAVE_WGETPARENT) && defined(HAVE_WINDOW__PARENT) +#undef wgetparent +#define wgetparent(win) ((win) ? (win)->_parent : 0) +#endif + #ifdef __cplusplus extern "C" { #endif @@ -274,6 +281,12 @@ extern int dlg_getparx(WINDOW * /*win*/); extern int dlg_getpary(WINDOW * /*win*/); #endif +#if !(defined(HAVE_WGETPARENT) && defined(HAVE_WINDOW__PARENT)) +#undef wgetparent +#define wgetparent(win) dlg_wgetparent(win) +extern WINDOW * dlg_wgetparent(WINDOW * /*win*/); +#endif + /* * This is a list of "old" names, which should be helpful in updating * applications that use libdialog. Starting with 2003/11/26, all exported @@ -357,6 +370,10 @@ extern int dlg_getpary(WINDOW * /*win*/); #define form_text_attr DIALOG_ATR(31) #define form_item_readonly_attr DIALOG_ATR(32) #define gauge_attr DIALOG_ATR(33) +#define border2_attr DIALOG_ATR(34) +#define inputbox_border2_attr DIALOG_ATR(35) +#define searchbox_border2_attr DIALOG_ATR(36) +#define menubox_border2_attr DIALOG_ATR(37) #define DLGK_max (KEY_MAX + 256) @@ -396,6 +413,7 @@ typedef struct { DIALOG_CALLBACK *getc_callbacks; DIALOG_CALLBACK *getc_redirect; DIALOG_WINDOWS *all_windows; + DIALOG_WINDOWS *all_subwindows; FILE *output; /* option "--output-fd fd" */ FILE *pipe_input; /* used for gauge widget */ FILE *screen_output; /* newterm(), etc. */ @@ -485,6 +503,8 @@ typedef struct { char *help_file; /* option "--hfile" */ bool in_helpfile; /* flag to prevent recursion in --hfile */ bool no_nl_expand; /* option "--no-nl-expand" */ + /* 1.1-20120701 */ + int default_button; /* option "--default-button" (exit code) */ } DIALOG_VARS; #define USE_ITEM_HELP(s) (dialog_vars.item_help && (s) != 0) @@ -623,7 +643,7 @@ extern void dlg_align_columns(char ** /* target */, int /* per_row */, int /* n extern void dlg_free_columns(char ** /* target */, int /* per_row */, int /* num_rows */); /* editbox.c */ -extern int dlg_editbox(const char */*title*/, char ***/*list*/, int */*rows*/, int /*height*/, int /*width*/); +extern int dlg_editbox(const char * /*title*/, char *** /*list*/, int * /*rows*/, int /*height*/, int /*width*/); /* formbox.c */ extern int dlg_default_formitem(DIALOG_FORMITEM * /*items*/); @@ -646,6 +666,10 @@ extern int dlg_find_index(const int * /*list*/, int /*limit*/, int /*to_find*/) extern int dlg_limit_columns(const char * /*string*/, int /*limit*/, int /*offset*/); extern void dlg_show_string(WINDOW * /*win*/, const char * /*string*/, int /*offset*/, chtype /*attr*/, int /*y_base*/, int /*x_base*/, int /*x_last*/, bool /*hidden*/, bool /*force*/); +/* menubox.c */ +extern int dlg_dummy_menutext(DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/); +extern int dlg_renamed_menutext(DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/); + /* rc.c */ #ifdef HAVE_RC_FILE extern int dlg_parse_rc(void); @@ -673,15 +697,17 @@ extern char * dlg_strempty(void); extern chtype dlg_asciibox(chtype /*ch*/); extern chtype dlg_boxchar(chtype /*ch*/); extern chtype dlg_get_attrs(WINDOW * /*win*/); -extern const char * dlg_print_line(WINDOW */*win*/, chtype */*attr*/, const char */*prompt*/, int /*lm*/, int /*rm*/, int */*x*/); +extern const char * dlg_print_line(WINDOW * /*win*/, chtype * /*attr*/, const char * /*prompt*/, int /*lm*/, int /*rm*/, int * /*x*/); extern int dlg_box_x_ordinate(int /*width*/); extern int dlg_box_y_ordinate(int /*height*/); extern int dlg_calc_list_width(int /*item_no*/, DIALOG_LISTITEM * /*items*/); extern int dlg_calc_listw(int /*item_no*/, char ** /*items*/, int /*group*/); -extern int dlg_check_scrolled(int /* key */, int /* last */, int /* page */, bool */* show */, int */* offset */); +extern int dlg_check_scrolled(int /* key */, int /* last */, int /* page */, bool * /* show */, int * /* offset */); +extern int dlg_count_real_columns(const char * /*text*/); extern int dlg_default_item(char ** /*items*/, int /*llen*/); extern int dlg_default_listitem(DIALOG_LISTITEM * /*items*/); extern int dlg_defaultno_button(void); +extern int dlg_default_button(void); extern int dlg_max_input(int /*max_len*/); extern int dlg_print_scrolled(WINDOW * /* win */, const char * /* prompt */, int /* offset */, int /* height */, int /* width */, int /* pauseopt */); extern void dlg_add_quoted(char * /*string*/); @@ -699,7 +725,9 @@ extern void dlg_ctl_size(int /*height*/, int /*width*/); extern void dlg_del_window(WINDOW * /*win*/); extern void dlg_does_output(void); extern void dlg_draw_bottom_box(WINDOW * /*win*/); +extern void dlg_draw_bottom_box2(WINDOW * /*win*/, chtype /*on_left*/, chtype /*on_right*/, chtype /*on_inside*/); extern void dlg_draw_box(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/); +extern void dlg_draw_box2(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/, chtype /*borderchar2*/); extern void dlg_draw_title(WINDOW *win, const char *title); extern void dlg_exit(int /*code*/) GCC_NORETURN; extern void dlg_item_help(const char * /*txt*/); @@ -715,11 +743,7 @@ extern void dlg_trim_string(char * /*src*/); extern void end_dialog(void); extern void init_dialog(FILE * /*input*/, FILE * /*output*/); -extern void dlg_exiterr(const char *, ...) GCC_NORETURN -#if defined(__GNUC__) && !defined(printf) -__attribute__((format(printf,1,2))) -#endif -; +extern void dlg_exiterr(const char *, ...) GCC_NORETURN GCC_PRINTFLIKE(1,2); #ifdef HAVE_COLOR extern chtype dlg_color_pair(int /*foreground*/, int /*background*/); @@ -736,11 +760,7 @@ extern int dlg_strcmp(const char * /*a*/, const char * /*b*/); #ifdef HAVE_DLG_TRACE #define DLG_TRACE(params) dlg_trace_msg params -extern void dlg_trace_msg(const char *fmt, ...) -#ifdef GCC_PRINTF - __attribute__((format(printf,1,2))) -#endif -; +extern void dlg_trace_msg(const char *fmt, ...) GCC_PRINTFLIKE(1,2); extern void dlg_trace_win(WINDOW * /*win*/); extern void dlg_trace_chr(int /*ch*/, int /*fkey*/); extern void dlg_trace(const char * /*fname*/); diff --git a/contrib/dialog/dlg_colors.h b/contrib/dialog/dlg_colors.h index 84123dd..c047f72 100644 --- a/contrib/dialog/dlg_colors.h +++ b/contrib/dialog/dlg_colors.h @@ -1,5 +1,5 @@ /* - * $Id: dlg_colors.h,v 1.16 2011/01/17 00:20:32 tom Exp $ + * $Id: dlg_colors.h,v 1.17 2011/10/14 21:19:59 tom Exp $ * * colors.h -- color attribute definitions * @@ -56,6 +56,10 @@ #define DLGC_BG_BORDER COLOR_WHITE #define DLGC_HL_BORDER TRUE +#define DLGC_FG_BORDER2 DLGC_FG_DIALOG +#define DLGC_BG_BORDER2 DLGC_BG_DIALOG +#define DLGC_HL_BORDER2 DLGC_HL_DIALOG + #define DLGC_FG_BUTTON_ACTIVE COLOR_WHITE #define DLGC_BG_BUTTON_ACTIVE COLOR_BLUE #define DLGC_HL_BUTTON_ACTIVE TRUE @@ -92,6 +96,10 @@ #define DLGC_BG_INPUTBOX_BORDER COLOR_WHITE #define DLGC_HL_INPUTBOX_BORDER FALSE +#define DLGC_FG_INPUTBOX_BORDER2 DLGC_FG_INPUTBOX +#define DLGC_BG_INPUTBOX_BORDER2 DLGC_BG_INPUTBOX +#define DLGC_HL_INPUTBOX_BORDER2 DLGC_HL_INPUTBOX + #define DLGC_FG_SEARCHBOX COLOR_BLACK #define DLGC_BG_SEARCHBOX COLOR_WHITE #define DLGC_HL_SEARCHBOX FALSE @@ -104,6 +112,10 @@ #define DLGC_BG_SEARCHBOX_BORDER COLOR_WHITE #define DLGC_HL_SEARCHBOX_BORDER TRUE +#define DLGC_FG_SEARCHBOX_BORDER2 DLGC_FG_SEARCHBOX +#define DLGC_BG_SEARCHBOX_BORDER2 DLGC_BG_SEARCHBOX +#define DLGC_HL_SEARCHBOX_BORDER2 DLGC_HL_SEARCHBOX + #define DLGC_FG_POSITION_INDICATOR COLOR_BLUE #define DLGC_BG_POSITION_INDICATOR COLOR_WHITE #define DLGC_HL_POSITION_INDICATOR TRUE @@ -116,6 +128,10 @@ #define DLGC_BG_MENUBOX_BORDER COLOR_WHITE #define DLGC_HL_MENUBOX_BORDER TRUE +#define DLGC_FG_MENUBOX_BORDER2 DLGC_FG_MENUBOX +#define DLGC_BG_MENUBOX_BORDER2 DLGC_BG_MENUBOX +#define DLGC_HL_MENUBOX_BORDER2 DLGC_HL_MENUBOX + #define DLGC_FG_ITEM COLOR_BLACK #define DLGC_BG_ITEM COLOR_WHITE #define DLGC_HL_ITEM FALSE diff --git a/contrib/dialog/dlg_keys.c b/contrib/dialog/dlg_keys.c index 97ca865..4b59f6b 100644 --- a/contrib/dialog/dlg_keys.c +++ b/contrib/dialog/dlg_keys.c @@ -1,9 +1,9 @@ /* - * $Id: dlg_keys.c,v 1.26 2009/02/22 16:19:51 tom Exp $ + * $Id: dlg_keys.c,v 1.34 2011/10/14 00:41:08 tom Exp $ * - * dlg_keys.c -- runtime binding support for dialog + * dlg_keys.c -- runtime binding support for dialog * - * Copyright 2006-2007,2009 Thomas E. Dickey + * Copyright 2006-2009,2011 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -34,6 +34,7 @@ LIST_BINDINGS { DLG_KEYS_BINDING *binding; /* list of bindings */ }; +#define WILDNAME "*" static LIST_BINDINGS *all_bindings; static const DLG_KEYS_BINDING end_keys_binding = END_KEYS_BINDING; @@ -61,6 +62,17 @@ dlg_register_window(WINDOW *win, const char *name, DLG_KEYS_BINDING * binding) else all_bindings = p; } +#if defined(HAVE_DLG_TRACE) && defined(HAVE_RC_FILE) + /* + * Trace the binding information assigned to this window. For most widgets + * there is only one binding table. forms have two, so the trace will be + * longer. Since compiled-in bindings are only visible when the widget is + * registered, there is no other way to see what bindings are available, + * than by running dialog and tracing it. + */ + dlg_trace_msg("# dlg_register_window %s\n", name); + dlg_dump_window_keys(dialog_state.trace_output, win); +#endif } /* @@ -189,7 +201,7 @@ int dlg_lookup_key(WINDOW *win, int curses_key, int *fkey) { LIST_BINDINGS *p; - int n; + DLG_KEYS_BINDING *q; /* * Ignore mouse clicks, since they are already encoded properly. @@ -208,19 +220,28 @@ dlg_lookup_key(WINDOW *win, int curses_key, int *fkey) } else #endif if (*fkey == 0 || curses_key < KEY_MAX) { + const char *name = WILDNAME; + if (win != 0) { + for (p = all_bindings; p != 0; p = p->link) { + if (p->win == win) { + name = p->name; + break; + } + } + } for (p = all_bindings; p != 0; p = p->link) { - if (p->win == win || p->win == 0) { + if (p->win == win || (p->win == 0 && !strcmp(p->name, name))) { int function_key = (*fkey != 0); - for (n = 0; p->binding[n].is_function_key >= 0; ++n) { + for (q = p->binding; q->is_function_key >= 0; ++q) { if (p->buttons && !function_key - && p->binding[n].curses_key == (int) dlg_toupper(curses_key)) { + && q->curses_key == (int) dlg_toupper(curses_key)) { *fkey = 0; - return p->binding[n].dialog_key; + return q->dialog_key; } - if (p->binding[n].curses_key == curses_key - && p->binding[n].is_function_key == function_key) { - *fkey = p->binding[n].dialog_key; + if (q->curses_key == curses_key + && q->is_function_key == function_key) { + *fkey = q->dialog_key; return *fkey; } } @@ -295,10 +316,18 @@ typedef struct { int code; } CODENAME; +#define ASCII_NAME(name,code) { #name, code } #define CURSES_NAME(upper) { #upper, KEY_ ## upper } #define COUNT_CURSES sizeof(curses_names)/sizeof(curses_names[0]) static const CODENAME curses_names[] = { + ASCII_NAME(ESC, '\033'), + ASCII_NAME(CR, '\r'), + ASCII_NAME(LF, '\n'), + ASCII_NAME(FF, '\f'), + ASCII_NAME(TAB, '\t'), + ASCII_NAME(DEL, '\177'), + CURSES_NAME(DOWN), CURSES_NAME(UP), CURSES_NAME(LEFT), @@ -408,6 +437,10 @@ static const CODENAME dialog_names[] = DIALOG_NAME(FIELD_LAST), DIALOG_NAME(FIELD_NEXT), DIALOG_NAME(FIELD_PREV), + DIALOG_NAME(FORM_FIRST), + DIALOG_NAME(FORM_LAST), + DIALOG_NAME(FORM_NEXT), + DIALOG_NAME(FORM_PREV), DIALOG_NAME(GRID_UP), DIALOG_NAME(GRID_DOWN), DIALOG_NAME(GRID_LEFT), @@ -418,7 +451,9 @@ static const CODENAME dialog_names[] = DIALOG_NAME(ENTER), DIALOG_NAME(BEGIN), DIALOG_NAME(FINAL), - DIALOG_NAME(SELECT) + DIALOG_NAME(SELECT), + DIALOG_NAME(HELPFILE), + DIALOG_NAME(TRACE) }; static char * @@ -472,9 +507,9 @@ compare_bindings(LIST_BINDINGS * a, LIST_BINDINGS * b) if (a->win == b->win) { if (!strcmp(a->name, b->name)) { result = a->binding[0].curses_key - b->binding[0].curses_key; - } else if (!strcmp(b->name, "*")) { + } else if (!strcmp(b->name, WILDNAME)) { result = -1; - } else if (!strcmp(a->name, "*")) { + } else if (!strcmp(a->name, WILDNAME)) { result = 1; } else { result = dlg_strcmp(a->name, b->name); @@ -572,6 +607,7 @@ dlg_parse_bindkey(char *params) p = skip_black(p); if (p != widget && *p != '\0') { *p++ = '\0'; + p = skip_white(p); q = p; while (*p != '\0' && curses_key < 0) { if (escaped) { @@ -613,7 +649,7 @@ dlg_parse_bindkey(char *params) for (xx = 0; xx < COUNT_CURSES; ++xx) { if (!dlg_strcmp(curses_names[xx].name, q)) { curses_key = curses_names[xx].code; - is_function = TRUE; + is_function = (curses_key >= KEY_MIN); break; } } @@ -700,30 +736,53 @@ dump_one_binding(FILE *fp, const char *widget, DLG_KEYS_BINDING * binding) fputc('\n', fp); } +/* + * Dump bindings for the given window. If it is a null, then this dumps the + * initial bindings which were loaded from the rc-file that are used as + * overall defaults. + */ void -dlg_dump_keys(FILE *fp) +dlg_dump_window_keys(FILE *fp, WINDOW *win) { - LIST_BINDINGS *p; - const char *last = ""; - unsigned n; - unsigned count = 0; + if (fp != 0) { + LIST_BINDINGS *p; + DLG_KEYS_BINDING *q; + const char *last = ""; - for (p = all_bindings; p != 0; p = p->link) { - if (p->win == 0) { - ++count; - } - } - if (count != 0) { - for (p = all_bindings, n = 0; p != 0; p = p->link) { - if (p->win == 0) { + for (p = all_bindings; p != 0; p = p->link) { + if (p->win == win) { if (dlg_strcmp(last, p->name)) { fprintf(fp, "\n# key bindings for %s widgets\n", - !strcmp(p->name, "*") ? "all" : p->name); + !strcmp(p->name, WILDNAME) ? "all" : p->name); last = p->name; } - dump_one_binding(fp, p->name, p->binding); + for (q = p->binding; q->is_function_key >= 0; ++q) { + dump_one_binding(fp, p->name, q); + } } } } } + +/* + * Dump all of the bindings which are not specific to a given widget, i.e., + * the "win" member is null. + */ +void +dlg_dump_keys(FILE *fp) +{ + if (fp != 0) { + LIST_BINDINGS *p; + unsigned count = 0; + + for (p = all_bindings; p != 0; p = p->link) { + if (p->win == 0) { + ++count; + } + } + if (count != 0) { + dlg_dump_window_keys(fp, 0); + } + } +} #endif /* HAVE_RC_FILE */ diff --git a/contrib/dialog/dlg_keys.h b/contrib/dialog/dlg_keys.h index 34b4cba..3469e40 100644 --- a/contrib/dialog/dlg_keys.h +++ b/contrib/dialog/dlg_keys.h @@ -1,9 +1,9 @@ /* - * $Id: dlg_keys.h,v 1.26 2011/06/21 22:09:22 tom Exp $ + * $Id: dlg_keys.h,v 1.31 2012/07/02 23:57:52 tom Exp $ * * dlg_keys.h -- runtime binding support for dialog * - * Copyright 2005-2010,2011 Thomas E. Dickey + * Copyright 2005-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -23,6 +23,7 @@ #ifndef DLG_KEYS_H_included #define DLG_KEYS_H_included 1 +/* *INDENT-OFF* */ #include <dialog.h> @@ -31,7 +32,7 @@ #define dlg_toupper(ch) towupper((wint_t)ch) #define dlg_isupper(ch) iswupper((wint_t)ch) #else -#define dlg_toupper(ch) toupper(ch) +#define dlg_toupper(ch) (((ch) > 0 && (ch) <= 255) ? toupper(ch) : (ch)) #define dlg_isupper(ch) (isalpha(ch) && isupper(ch)) #endif @@ -45,7 +46,7 @@ typedef struct { int dialog_key; } DLG_KEYS_BINDING; -#define DLG_KEYS_DATA(dialog, curses) { curses >= KEY_MIN, curses, dialog } +#define DLG_KEYS_DATA(dialog, curses) { (curses) >= KEY_MIN, curses, dialog } #define END_KEYS_BINDING { -1, 0, 0 } @@ -75,6 +76,11 @@ typedef enum { DLGK_FIELD_LAST, DLGK_FIELD_NEXT, DLGK_FIELD_PREV, + /* moving from form-field to form-field (or buttons) */ + DLGK_FORM_FIRST, + DLGK_FORM_LAST, + DLGK_FORM_NEXT, + DLGK_FORM_PREV, /* moving within a grid */ DLGK_GRID_UP, DLGK_GRID_DOWN, @@ -136,6 +142,15 @@ typedef enum { DLG_KEYS_DATA( DLGK_PAGE_PREV, 'b' ), \ DLG_KEYS_DATA( DLGK_PAGE_PREV, KEY_PPAGE ) +#define TRAVERSE_BINDINGS \ + DLG_KEYS_DATA( DLGK_ENTER, ' ' ), \ + DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ), \ + DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), \ + DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), \ + DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ), \ + DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), \ + DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ) + extern int dlg_lookup_key(WINDOW * /*win*/, int /*curses_key*/, int * /*dialog_key*/); extern int dlg_result_key(int /*dialog_key*/, int /*fkey*/, int * /*resultp*/); extern void dlg_register_buttons(WINDOW * /*win*/, const char * /*name*/, const char ** /*buttons*/); @@ -145,10 +160,12 @@ extern void dlg_unregister_window(WINDOW * /*win*/); #ifdef HAVE_RC_FILE extern int dlg_parse_bindkey(char * /*params*/); extern void dlg_dump_keys(FILE * /*fp*/); +extern void dlg_dump_window_keys(FILE * /*fp*/, WINDOW * /*win*/); #endif #ifdef __cplusplus } #endif +/* *INDENT-ON* */ #endif /* DLG_KEYS_H_included */ diff --git a/contrib/dialog/editbox.c b/contrib/dialog/editbox.c index c7da10c..7488d65 100644 --- a/contrib/dialog/editbox.c +++ b/contrib/dialog/editbox.c @@ -1,9 +1,9 @@ /* - * $Id: editbox.c,v 1.55 2011/06/21 00:10:46 tom Exp $ + * $Id: editbox.c,v 1.61 2012/07/01 18:13:32 Zoltan.Kelemen Exp $ * * editbox.c -- implements the edit box * - * Copyright 2007-2010,2011 Thomas E. Dickey + * Copyright 2007-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -43,9 +43,10 @@ grow_list(char ***list, int *have, int want) (*list) = dlg_realloc(char *, need, *list); if ((*list) == 0) { fail_list(); - } - while (++last < need) { - (*list)[last] = 0; + } else { + while (++last < need) { + (*list)[last] = 0; + } } } } @@ -68,45 +69,47 @@ load_list(const char *file, char ***list, int *rows) dlg_exiterr("Not a file: %s", file); size = (size_t) sb.st_size; - if ((blob = dlg_malloc(char, size + 1)) == 0) - fail_list(); - blob[size] = '\0'; - - if ((fp = fopen(file, "r")) == 0) - dlg_exiterr("Cannot open: %s", file); - size = fread(blob, sizeof(char), size, fp); - fclose(fp); - - for (pass = 0; pass < 2; ++pass) { - int first = TRUE; - need = 0; - for (n = 0; n < size; ++n) { - if (first && pass) { - (*list)[need] = blob + n; - first = FALSE; - } - if (blob[n] == '\n') { - first = TRUE; - ++need; - if (pass) - blob[n] = '\0'; + if ((blob = dlg_malloc(char, size + 1)) == 0) { + fail_list(); + } else { + blob[size] = '\0'; + + if ((fp = fopen(file, "r")) == 0) + dlg_exiterr("Cannot open: %s", file); + size = fread(blob, sizeof(char), size, fp); + fclose(fp); + + for (pass = 0; pass < 2; ++pass) { + int first = TRUE; + need = 0; + for (n = 0; n < size; ++n) { + if (first && pass) { + (*list)[need] = blob + n; + first = FALSE; + } + if (blob[n] == '\n') { + first = TRUE; + ++need; + if (pass) + blob[n] = '\0'; + } } - } - if (pass) { - if (need == 0) { - (*list)[0] = dlg_strclone(""); - (*list)[1] = 0; - } else { - for (n = 0; n < need; ++n) { - (*list)[n] = dlg_strclone((*list)[n]); + if (pass) { + if (need == 0) { + (*list)[0] = dlg_strclone(""); + (*list)[1] = 0; + } else { + for (n = 0; n < need; ++n) { + (*list)[n] = dlg_strclone((*list)[n]); + } + (*list)[need] = 0; } - (*list)[need] = 0; + } else { + grow_list(list, rows, (int) need + 1); } - } else { - grow_list(list, rows, (int) need + 1); } + free(blob); } - free(blob); } static void @@ -344,6 +347,7 @@ dlg_editbox(const char *title, size_t max_len = (size_t) dlg_max_input(widest_line(*list)); char *input, *buffer; bool show_all, show_one, was_mouse; + bool first_trace = TRUE; WINDOW *dialog; WINDOW *editing; DIALOG_VARS save_vars; @@ -364,8 +368,8 @@ dlg_editbox(const char *title, retry: #endif show_buttons = TRUE; - state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT; - key = fkey = 0; + state = dialog_vars.default_button >= 0 ? dlg_default_button() : sTEXT; + fkey = 0; dlg_button_layout(buttons, &mincols); dlg_auto_size(title, "", &height, &width, 3 * LINES / 4, mincols); @@ -381,11 +385,11 @@ dlg_editbox(const char *title, dlg_mouse_setbase(x, y); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); /* Draw the editing field in a box */ box_y = MARGIN + 0; @@ -398,7 +402,7 @@ dlg_editbox(const char *title, box_x, box_height, box_width, - border_attr, dialog_attr); + border_attr, border2_attr); dlg_mouse_mkbigregion(box_y + MARGIN, box_x + MARGIN, box_height - (2 * MARGIN), @@ -409,7 +413,7 @@ dlg_editbox(const char *title, box_width - (2 * MARGIN), getbegy(dialog) + box_y + 1, getbegx(dialog) + box_x + 1); - dlg_register_window(editing, "editbox", binding2); + dlg_register_window(editing, "editbox2", binding2); show_all = TRUE; show_one = FALSE; @@ -444,7 +448,7 @@ dlg_editbox(const char *title, box_x + getmaxx(editing), box_y + 0, box_y + getmaxy(editing) + 1, - dialog_attr, + border2_attr, border_attr); wmove(editing, y, x); show_one = FALSE; @@ -476,6 +480,11 @@ dlg_editbox(const char *title, } } + if (first_trace) { + first_trace = FALSE; + dlg_trace_win(dialog); + } + key = dlg_mouse_wgetch((state == sTEXT) ? editing : dialog, &fkey); if (key == ERR) { result = DLG_EXIT_ERROR; diff --git a/contrib/dialog/formbox.c b/contrib/dialog/formbox.c index 7ec798c..8cbe8a8 100644 --- a/contrib/dialog/formbox.c +++ b/contrib/dialog/formbox.c @@ -1,9 +1,9 @@ /* - * $Id: formbox.c,v 1.73 2011/06/29 09:48:08 tom Exp $ + * $Id: formbox.c,v 1.81 2012/07/01 18:13:51 Zoltan.Kelemen Exp $ * * formbox.c -- implements the form (i.e, some pairs label/editbox) * - * Copyright 2003-2010,2011 Thomas E. Dickey + * Copyright 2003-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -188,6 +188,34 @@ form_limit(DIALOG_FORMITEM item[]) return limit; } +static int +is_first_field(DIALOG_FORMITEM item[], int choice) +{ + int count = 0; + while (choice >= 0) { + if (item[choice].text_flen > 0) { + ++count; + } + --choice; + } + + return (count == 1); +} + +static int +is_last_field(DIALOG_FORMITEM item[], int choice, int item_no) +{ + int count = 0; + while (choice < item_no) { + if (item[choice].text_flen > 0) { + ++count; + } + ++choice; + } + + return (count == 1); +} + /* * Tab to the next field. */ @@ -454,8 +482,9 @@ dlg_form(const char *title, int form_width; int first = TRUE; + int first_trace = TRUE; int chr_offset = 0; - int state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT; + int state = dialog_vars.default_button >=0 ? dlg_default_button() : sTEXT; int x, y, cur_x, cur_y, box_x, box_y; int code; int key = 0; @@ -510,30 +539,31 @@ dlg_form(const char *title, dialog = dlg_new_window(height, width, y, x); dlg_register_window(dialog, "formbox", binding); - dlg_register_window(dialog, "formfield", binding2); dlg_register_buttons(dialog, "formbox", buttons); dlg_mouse_setbase(x, y); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_print_autowrap(dialog, prompt, height, width); form_width = width - 6; getyx(dialog, cur_y, cur_x); + (void) cur_x; box_y = cur_y + 1; box_x = (width - form_width) / 2 - 1; /* create new window for the form */ form = dlg_sub_window(dialog, form_height, form_width, y + box_y + 1, x + box_x + 1); + dlg_register_window(form, "formfield", binding2); /* draw a box around the form items */ dlg_draw_box(dialog, box_y, box_x, form_height + 2, form_width + 2, - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); /* register the new window, along with its borders */ dlg_mouse_mkbigregion(getbegy(form) - getbegy(dialog), @@ -564,7 +594,7 @@ dlg_form(const char *title, box_x + form_width, box_y, box_y + form_height + 1, - menubox_attr, + menubox_border2_attr, menubox_border_attr); scroll_changed = FALSE; } @@ -579,6 +609,11 @@ dlg_form(const char *title, show_buttons = FALSE; } + if (first_trace) { + first_trace = FALSE; + dlg_trace_win(dialog); + } + if (field_changed || state == sTEXT) { if (field_changed) chr_offset = 0; @@ -594,7 +629,7 @@ dlg_form(const char *title, field_changed = FALSE; } - key = dlg_mouse_wgetch(dialog, &fkey); + key = dlg_mouse_wgetch((state == sTEXT) ? form : dialog, &fkey); if (dlg_result_key(key, fkey, &result)) break; @@ -653,6 +688,25 @@ dlg_form(const char *title, continue; } + case DLGK_FORM_PREV: + if (state == sTEXT && !is_first_field(items, choice)) { + do_tab = TRUE; + move_by = -1; + break; + } else { + int old_state = state; + state = prev_valid_buttonindex(state, sTEXT, non_editable); + show_buttons = TRUE; + if (old_state >= 0 && state == sTEXT) { + new_choice = item_no - 1; + if (choice != new_choice) { + print_item(form, items + choice, scrollamt, FALSE); + choice = new_choice; + } + } + continue; + } + case DLGK_FIELD_PREV: state = prev_valid_buttonindex(state, sTEXT, non_editable); show_buttons = TRUE; @@ -679,6 +733,21 @@ dlg_form(const char *title, continue; } + case DLGK_FORM_NEXT: + if (state == sTEXT && !is_last_field(items, choice, item_no)) { + do_tab = TRUE; + move_by = 1; + break; + } else { + state = next_valid_buttonindex(state, sTEXT, non_editable); + show_buttons = TRUE; + if (state == sTEXT && choice) { + print_item(form, items + choice, scrollamt, FALSE); + choice = 0; + } + continue; + } + #ifdef KEY_RESIZE case KEY_RESIZE: /* reset data */ diff --git a/contrib/dialog/fselect.c b/contrib/dialog/fselect.c index e082abf..123605e 100644 --- a/contrib/dialog/fselect.c +++ b/contrib/dialog/fselect.c @@ -1,9 +1,9 @@ /* - * $Id: fselect.c,v 1.78 2011/06/29 09:48:21 tom Exp $ + * $Id: fselect.c,v 1.87 2012/07/01 18:14:09 Zoltan.Kelemen Exp $ * * fselect.c -- implements the file-selector box * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -230,11 +230,11 @@ display_list(LIST * list) break; (void) wmove(list->win, y, 0); if (n == list->choice) - wattrset(list->win, item_selected_attr); + (void) wattrset(list->win, item_selected_attr); (void) waddstr(list->win, list->data[n]); - wattrset(list->win, item_attr); + (void) wattrset(list->win, item_attr); } - wattrset(list->win, item_attr); + (void) wattrset(list->win, item_attr); getparyx(list->win, y, x); @@ -249,7 +249,7 @@ display_list(LIST * list) x + getmaxx(list->win), top, bottom, - menubox_attr, + menubox_border2_attr, menubox_border_attr); (void) wmove(list->win, list->choice - list->offset, 0); @@ -270,18 +270,20 @@ fix_arrows(LIST * list) int x; int y; int top; + int right; int bottom; if (list->win != 0) { getparyx(list->win, y, x); top = y - 1; + right = getmaxx(list->win); bottom = y + getmaxy(list->win); - mouse_mkbutton(top, x, 6, + mouse_mkbutton(top, x, right, ((list->mousex == MOUSE_D) ? KEY_PREVIOUS : KEY_PPAGE)); - mouse_mkbutton(bottom, x, 6, + mouse_mkbutton(bottom, x, right, ((list->mousex == MOUSE_D) ? KEY_NEXT : KEY_NPAGE)); @@ -429,6 +431,8 @@ complete(char *name, LIST * d_list, LIST * f_list, char **buff_ptr) static bool fill_lists(char *current, char *input, LIST * d_list, LIST * f_list, int keep) { + bool result = TRUE; + bool rescan = FALSE; DIR *dp; DIRENT *de; struct stat sb; @@ -441,51 +445,60 @@ fill_lists(char *current, char *input, LIST * d_list, LIST * f_list, int keep) if (current[n] != input[n]) break; } - if (current[n] == input[n]) - return FALSE; - if (strchr(current + n, '/') == 0 - && strchr(input + n, '/') == 0) { - return show_both_lists(input, d_list, f_list, keep); - } - - strcpy(current, input); - /* refill the lists */ - free_list(d_list, TRUE); - free_list(f_list, TRUE); - strcpy(path, current); - if ((leaf = strrchr(path, '/')) != 0) { - *++leaf = 0; + if (current[n] == input[n]) { + result = FALSE; + rescan = (n == 0 && d_list->length == 0); + } else if (strchr(current + n, '/') == 0 + && strchr(input + n, '/') == 0) { + result = show_both_lists(input, d_list, f_list, keep); } else { - strcpy(path, "./"); - leaf = path + strlen(path); + rescan = TRUE; } - if ((dp = opendir(path)) != 0) { - while ((de = readdir(dp)) != 0) { - strncpy(leaf, de->d_name, NAMLEN(de))[NAMLEN(de)] = 0; - if (stat(path, &sb) == 0) { - if ((sb.st_mode & S_IFMT) == S_IFDIR) - add_to_list(d_list, leaf); - else if (f_list->win) - add_to_list(f_list, leaf); + + if (rescan) { + + strcpy(current, input); + + /* refill the lists */ + free_list(d_list, TRUE); + free_list(f_list, TRUE); + strcpy(path, current); + if ((leaf = strrchr(path, '/')) != 0) { + *++leaf = 0; + } else { + strcpy(path, "./"); + leaf = path + strlen(path); + } + dlg_trace_msg("opendir '%s'\n", path); + if ((dp = opendir(path)) != 0) { + while ((de = readdir(dp)) != 0) { + strncpy(leaf, de->d_name, NAMLEN(de))[NAMLEN(de)] = 0; + if (stat(path, &sb) == 0) { + if ((sb.st_mode & S_IFMT) == S_IFDIR) + add_to_list(d_list, leaf); + else if (f_list->win) + add_to_list(f_list, leaf); + } } + (void) closedir(dp); + /* sort the lists */ + qsort(d_list->data, + (size_t) d_list->length, + sizeof(d_list->data[0]), + compar); + qsort(f_list->data, + (size_t) f_list->length, + sizeof(f_list->data[0]), + compar); } - (void) closedir(dp); - /* sort the lists */ - qsort(d_list->data, - (size_t) d_list->length, - sizeof(d_list->data[0]), - compar); - qsort(f_list->data, - (size_t) f_list->length, - sizeof(f_list->data[0]), - compar); - } - (void) show_both_lists(input, d_list, f_list, FALSE); - d_list->offset = d_list->choice; - f_list->offset = f_list->choice; - return TRUE; + (void) show_both_lists(input, d_list, f_list, FALSE); + d_list->offset = d_list->choice; + f_list->offset = f_list->choice; + result = TRUE; + } + return result; } static bool @@ -560,9 +573,10 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel int fkey = FALSE; int code; int result = DLG_EXIT_UNKNOWN; - int state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT; - int button = state; + int state = dialog_vars.default_button >=0 ? dlg_default_button() : sTEXT; + int button; int first = (state == sTEXT); + int first_trace = TRUE; char *input; char *completed; char current[MAX_LEN + 1]; @@ -604,11 +618,11 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel dlg_mouse_setbase(0, 0); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); /* Draw the input field box */ tbox_height = 1; @@ -623,14 +637,14 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel (void) keypad(w_text, TRUE); dlg_draw_box(dialog, tbox_y - MARGIN, tbox_x - MARGIN, (2 * MARGIN + 1), tbox_width + (MARGIN + EXT_WIDE), - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); dlg_mouse_mkbigregion(getbegy(dialog) + tbox_y - MARGIN, getbegx(dialog) + tbox_x - MARGIN, 1 + (2 * MARGIN), tbox_width + (MARGIN + EXT_WIDE), MOUSE_T, 1, 1, 3 /* doesn't matter */ ); - dlg_register_window(w_text, "fselect", binding2); + dlg_register_window(w_text, "fselect2", binding2); /* Draw the directory listing box */ if (dselect) @@ -646,11 +660,11 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel return DLG_EXIT_ERROR; (void) keypad(w_work, TRUE); - (void) mvwprintw(dialog, dbox_y - (MARGIN + 1), dbox_x - MARGIN, d_label); + (void) mvwaddstr(dialog, dbox_y - (MARGIN + 1), dbox_x - MARGIN, d_label); dlg_draw_box(dialog, dbox_y - MARGIN, dbox_x - MARGIN, dbox_height + (MARGIN + 1), dbox_width + (MARGIN + 1), - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); init_list(&d_list, dialog, w_work, MOUSE_D); if (!dselect) { @@ -665,11 +679,11 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel return DLG_EXIT_ERROR; (void) keypad(w_work, TRUE); - (void) mvwprintw(dialog, fbox_y - (MARGIN + 1), fbox_x - MARGIN, f_label); + (void) mvwaddstr(dialog, fbox_y - (MARGIN + 1), fbox_x - MARGIN, f_label); dlg_draw_box(dialog, fbox_y - MARGIN, fbox_x - MARGIN, fbox_height + (MARGIN + 1), fbox_width + (MARGIN + 1), - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); init_list(&f_list, dialog, w_work, MOUSE_F); } else { memset(&f_list, 0, sizeof(f_list)); @@ -696,6 +710,12 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel button = (state < 0) ? 0 : state; dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width); } + + if (first_trace) { + first_trace = FALSE; + dlg_trace_win(dialog); + } + if (state < 0) { switch (state) { case sTEXT: diff --git a/contrib/dialog/guage.c b/contrib/dialog/guage.c index b25052f..1e2929c 100644 --- a/contrib/dialog/guage.c +++ b/contrib/dialog/guage.c @@ -1,5 +1,5 @@ /* - * $Id: guage.c,v 1.60 2011/06/27 00:52:28 tom Exp $ + * $Id: guage.c,v 1.64 2011/10/20 23:34:35 tom Exp $ * * guage.c -- implements the gauge dialog * @@ -122,27 +122,29 @@ repaint_text(MY_OBJ * obj) if (dialog != 0 && obj->obj.input != 0) { (void) werase(dialog); - dlg_draw_box(dialog, 0, 0, obj->height, obj->width, dialog_attr, border_attr); + dlg_draw_box2(dialog, 0, 0, obj->height, obj->width, dialog_attr, + border_attr, border2_attr); dlg_draw_title(dialog, obj->title); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_draw_helpline(dialog, FALSE); dlg_print_autowrap(dialog, obj->prompt, obj->height, obj->width); - dlg_draw_box(dialog, - obj->height - 4, 2 + MARGIN, - 2 + MARGIN, obj->width - 2 * (2 + MARGIN), - dialog_attr, - border_attr); + dlg_draw_box2(dialog, + obj->height - 4, 2 + MARGIN, + 2 + MARGIN, obj->width - 2 * (2 + MARGIN), + dialog_attr, + border_attr, + border2_attr); /* * Clear the area for the progress bar by filling it with spaces - * in the title-attribute, and write the percentage with that + * in the gauge-attribute, and write the percentage with that * attribute. */ (void) wmove(dialog, obj->height - 3, 4); - wattrset(dialog, gauge_attr); + (void) wattrset(dialog, gauge_attr); for (i = 0; i < (obj->width - 2 * (3 + MARGIN)); i++) (void) waddch(dialog, ' '); @@ -156,15 +158,15 @@ repaint_text(MY_OBJ * obj) * but requires some tweaks to reverse it. */ x = (obj->percent * (obj->width - 2 * (3 + MARGIN))) / 100; - if ((title_attr & A_REVERSE) != 0) { + if ((gauge_attr & A_REVERSE) != 0) { wattroff(dialog, A_REVERSE); } else { - wattrset(dialog, A_REVERSE); + (void) wattrset(dialog, A_REVERSE); } (void) wmove(dialog, obj->height - 3, 4); for (i = 0; i < x; i++) { chtype ch2 = winch(dialog); - if (title_attr & A_REVERSE) { + if (gauge_attr & A_REVERSE) { ch2 &= ~A_REVERSE; } (void) waddch(dialog, ch2); @@ -335,7 +337,6 @@ dlg_free_gauge(void *objptr) delink(obj); obj->obj.keep_win = FALSE; dlg_remove_callback(&(obj->obj)); - free(obj); } } @@ -362,6 +363,7 @@ dialog_gauge(const char *title, dlg_add_callback_ref((DIALOG_CALLBACK **) & obj, my_cleanup); dlg_update_gauge(obj, percent); + dlg_trace_win(obj->obj.win); do { ch = dlg_getc(obj->obj.win, &fkey); #ifdef KEY_RESIZE diff --git a/contrib/dialog/headers-sh.in b/contrib/dialog/headers-sh.in index 906c018..9bad19f 100755 --- a/contrib/dialog/headers-sh.in +++ b/contrib/dialog/headers-sh.in @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: headers-sh.in,v 1.9 2011/01/06 09:38:25 tom Exp $ +# $Id: headers-sh.in,v 1.11 2011/10/18 23:49:13 tom Exp $ ############################################################################## # Copyright (c) 2004-2007,2011 Thomas E. Dickey # # # @@ -45,6 +45,8 @@ PKGNAME=@PACKAGE_PREFIX@ CONFIGH=@PACKAGE_CONFIG@ SUB_INC=@SUB_INC@ +: ${TMPDIR:=/tmp} + TMPSED=headers.sed DIGIT=0123456789 @@ -98,9 +100,9 @@ s/ $// :done EOF # pick up autoconf-style symbols used in the application's headers - for i in $REF/*.h + for name in $REF/*.h do - sed -e 's/^[ ][ ]*#[ ][ ]*/#/' $i \ + sed -e 's/^[ ][ ]*#[ ][ ]*/#/' $name \ | egrep '^#(if|ifdef|ifndef|elif)' \ | sed -f headers.tmp \ | sort -u \ @@ -116,8 +118,7 @@ EOF -e 's/^#define[ ][ ]*//' \ -e 's/[ ].*//' \ | egrep -v "^${PACKAGE}_" \ - | sort -u \ - | egrep -v "^${PKGNAME}_"` + | sort -u` do echo "s/\\<$name\\>/${PKGNAME}_$name/g" >>$TMPSED done @@ -127,6 +128,8 @@ EOF echo "s,#include <${pkgname}_,#include <${PACKAGE}/${pkgname}_," >>$TMPSED fi + echo '/_FILE_OFFSET_BITS/d' >>$TMPSED + # reduce the count if possible, since some old sed's limit is 100 lines sort -u $TMPSED >headers.tmp mv headers.tmp $TMPSED @@ -142,13 +145,32 @@ else SRC=$3 SHOW=`basename $SRC` - TMPSRC=${TMPDIR-/tmp}/${SHOW}$$ + TMPSRC=$TMPDIR/${SHOW}-text$$ + TMPEDT=$TMPDIR/${SHOW}-edit$$ + TMPTMP=$TMPDIR/${SHOW}-temp$$ echo " ... $SHOW" test -f $REF/$SRC && SRC="$REF/$SRC" rm -f $TMPSRC - sed -f $TMPSED $SRC > $TMPSRC + cat $SRC >$TMPSRC + + tmp1=1 + while true + do + tmp2=`expr $tmp1 + 49` + if test $tmp1 = 1 + then + sed "${tmp2}q" $TMPSED >$TMPEDT + else + sed "1,${tmp1}d; ${tmp2}q" $TMPSED >$TMPEDT + fi + test -s $TMPEDT || break + sed -f $TMPEDT $TMPSRC > $TMPTMP + mv $TMPTMP $TMPSRC + tmp1=$tmp2 + done + NAME=`basename $SRC` # Just in case someone gzip'd manpages, remove the conflicting copy. @@ -172,6 +194,6 @@ else fi eval $PRG $TMPSRC $DST/$NAME - rm -f $TMPSRC + rm -f $TMPEDT $TMPTMP $TMPSRC fi # vile:ts=4 sw=4 diff --git a/contrib/dialog/inputbox.c b/contrib/dialog/inputbox.c index 14e2c28..9d2eec2 100644 --- a/contrib/dialog/inputbox.c +++ b/contrib/dialog/inputbox.c @@ -1,9 +1,9 @@ /* - * $Id: inputbox.c,v 1.67 2011/06/29 09:48:34 tom Exp $ + * $Id: inputbox.c,v 1.74 2012/07/01 18:13:40 Zoltan.Kelemen Exp $ * * inputbox.c -- implements the input box * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -90,7 +90,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width, retry: #endif show_buttons = TRUE; - state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT; + state = dialog_vars.default_button >= 0 ? dlg_default_button() : sTEXT; first = (state == sTEXT); key = fkey = 0; @@ -116,27 +116,29 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width, dlg_mouse_setbase(xorg, yorg); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_draw_helpline(dialog, FALSE); dlg_print_autowrap(dialog, prompt, height, width); /* Draw the input field box */ box_width = width - 6; getyx(dialog, y, x); + (void) x; box_y = y + 2; box_x = (width - box_width) / 2; dlg_mouse_mkregion(y + 1, box_x - 1, 3, box_width + 2, 'i'); dlg_draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2, - border_attr, dialog_attr); + border_attr, border2_attr); /* Make a window for the input-field, to associate bindings */ editor = dlg_sub_window(dialog, 1, box_width, yorg + box_y, xorg + box_x); - dlg_register_window(editor, "inputbox", binding2); + dlg_register_window(editor, "inputbox2", binding2); + dlg_trace_win(dialog); while (result == DLG_EXIT_UNKNOWN) { int edit = 0; diff --git a/contrib/dialog/inputstr.c b/contrib/dialog/inputstr.c index 685b126..aa719a1 100644 --- a/contrib/dialog/inputstr.c +++ b/contrib/dialog/inputstr.c @@ -1,5 +1,5 @@ /* - * $Id: inputstr.c,v 1.69 2011/01/16 21:52:35 tom Exp $ + * $Id: inputstr.c,v 1.70 2011/10/20 23:42:49 tom Exp $ * * inputstr.c -- functions for input/display of a string * @@ -261,7 +261,6 @@ dlg_count_wcbytes(const char *string, size_t len) load_cache(&cache, string); if (!same_cache1(&cache, string, len)) { while (len != 0) { - int part = 0; size_t code = 0; const char *src = cache.string; mbstate_t state; @@ -274,7 +273,6 @@ dlg_count_wcbytes(const char *string, size_t len) if ((int) code >= 0) { break; } - ++part; --len; } cache.i_len = len; @@ -700,7 +698,7 @@ dlg_show_string(WINDOW *win, compute_edit_offset(string, chr_offset, x_last, &input_x, &scrollamt); - wattrset(win, attr); + (void) wattrset(win, attr); (void) wmove(win, y_base, x_base); for (i = scrollamt, k = 0; i < limit && k < x_last; ++i) { int check = cols[i + 1] - cols[scrollamt]; diff --git a/contrib/dialog/makefile.in b/contrib/dialog/makefile.in index d05d74d..bef2d48 100644 --- a/contrib/dialog/makefile.in +++ b/contrib/dialog/makefile.in @@ -1,7 +1,7 @@ -# $Id: makefile.in,v 1.79 2011/06/25 00:27:56 tom Exp $ +# $Id: makefile.in,v 1.82 2012/02/16 00:35:37 Li-Wen.Hsu Exp $ # template makefile for DIALOG ############################################################################## -# Copyright (c) 1999-2010,2011 Thomas E. Dickey # +# Copyright (c) 1999-2011,2012 Thomas E. Dickey # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -71,7 +71,8 @@ LIBS = @LIBS@ @INTLLIBS@ RANLIB = @LIB_PREP@ RM = rm -f -LINT = lint +LINT = @LINT@ +LINT_OPTS = @LINT_OPTS@ CTAGS = @CTAGS@ ETAGS = @ETAGS@ @@ -84,6 +85,7 @@ LIBTOOL_CREATE = @LIB_CREATE@ LIBTOOL_LINK = @LIB_LINK@ LIBTOOL_INSTALL = @LIB_INSTALL@ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ +LIBTOOL_VERSION = @LIBTOOL_VERSION@ INSTALL = @INSTALL@ INSTALL_PROGRAM = $(LIBTOOL_INSTALL) @INSTALL_PROGRAM@ @@ -101,7 +103,7 @@ LIB_CONFIG = @PACKAGE@-config # The library name $(LIB) is set at configure/make time, since it is used as a # makefile target. Ditto for $(PROG). LIB = @LIB_PREFIX@@PACKAGE@$a -PROG = dialog$x +PROG = @PACKAGE@$x # # Standard .c to .o compile line. # @@ -179,7 +181,7 @@ $(LIB) : $(LIB_OBJECT) $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(RANLIB) $@ -dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@ +$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS) clean \ @@ -249,20 +251,20 @@ install-lib :: $(LIB_DIRS) $(LIB) headers.sed @ echo "** installing library in $(LIBDIR)" @ $(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(LIBDIR) @ echo "** installing headers in $(INCLUDEDIR)" - @ $(SHELL) $(srcdir)/headers-sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dialog.h - @ $(SHELL) $(srcdir)/headers-sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dlg_colors.h - @ $(SHELL) $(srcdir)/headers-sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dlg_keys.h - @ $(SHELL) $(srcdir)/headers-sh $(INSTALL_DATA) $(INCLUDEDIR) . dlg_config.h + @ $(SHELL) headers-sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dialog.h + @ $(SHELL) headers-sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dlg_colors.h + @ $(SHELL) headers-sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dlg_keys.h + @ $(SHELL) headers-sh $(INSTALL_DATA) $(INCLUDEDIR) . dlg_config.h uninstall-lib :: $(BINDIR) $(RM) $(BINDIR)/$(LIB_CONFIG) uninstall-lib :: $(LIB_DIRS) - $(LIBTOOL_UNINSTALL) $(RM) $(LIBDIR)/$(LIB) - @ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dialog.h - @ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dlg_colors.h - @ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dlg_keys.h - @ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) . dlg_config.h + @ $(SHELL) headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dialog.h + @ $(SHELL) headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dlg_colors.h + @ $(SHELL) headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dlg_keys.h + @ $(SHELL) headers-sh $(RM) $(INCLUDEDIR) . dlg_config.h install-lib :: $(MAN3DIR) @ echo "** installing @PACKAGE@.3" @@ -276,8 +278,8 @@ install-lib :: $(MAN3DIR) uninstall-lib :: $(RM) $(MAN3DIR)/@PACKAGE@.3 -headers.sed : $(srcdir)/headers-sh - $(SHELL) $(srcdir)/headers-sh $(INCLUDEDIR) $(srcdir) +headers.sed : headers-sh + $(SHELL) headers-sh $(INCLUDEDIR) $(srcdir) ################################################################################ TOP_DOCS = \ @@ -328,4 +330,4 @@ update-po: test -f $(PO_DIR)/makefile && cd $(PO_DIR) && $(MAKE) $@ lint: - $(LINT) $(CPPFLAGS) *.c + $(LINT) $(LINT_OPTS) $(CPPFLAGS) *.c diff --git a/contrib/dialog/menubox.c b/contrib/dialog/menubox.c index 25005a4..58a714b 100644 --- a/contrib/dialog/menubox.c +++ b/contrib/dialog/menubox.c @@ -1,9 +1,9 @@ /* - * $Id: menubox.c,v 1.122 2011/06/29 09:48:46 tom Exp $ + * $Id: menubox.c,v 1.132 2012/07/01 16:30:04 Zoltan.Kelemen Exp $ * * menubox.c -- implements the menu box * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public Licens, version 2.1e @@ -66,7 +66,7 @@ print_arrows(WINDOW *win, box_x + menu_width, box_y, box_y + menu_height + 1, - menubox_attr, + menubox_border2_attr, menubox_border_attr); } @@ -83,14 +83,11 @@ print_tag(WINDOW *win, int my_x = item_x; int my_y = ItemToRow(choice); int tag_width = (my_x - tag_x - GUTTER); - const int *cols; const int *indx; int limit; int prefix; - cols = dlg_index_columns(item->name); indx = dlg_index_wchars(item->name); - limit = dlg_count_wchars(item->name); prefix = (indx[1] - indx[0]); /* highlight first char of the tag to be special */ @@ -252,7 +249,7 @@ handle_button(int code, DIALOG_LISTITEM * items, int choice) return code; } -static int +int dlg_renamed_menutext(DIALOG_LISTITEM * items, int current, char *newtext) { if (dialog_vars.input_result) @@ -264,7 +261,7 @@ dlg_renamed_menutext(DIALOG_LISTITEM * items, int current, char *newtext) return DLG_EXIT_EXTRA; } -static int +int dlg_dummy_menutext(DIALOG_LISTITEM * items, int current, char *newtext) { (void) items; @@ -325,17 +322,18 @@ dlg_menu(const char *title, #endif int i, j, x, y, cur_x, cur_y, box_x, box_y; int key = 0, fkey; - int button = dialog_state.visit_items ? -1 : dlg_defaultno_button(); + int button = dialog_state.visit_items ? -1 : dlg_default_button(); int choice = dlg_default_listitem(items); int result = DLG_EXIT_UNKNOWN; int scrollamt = 0; - int max_choice, min_width; + int max_choice; int found; int use_height, use_width, name_width, text_width; WINDOW *dialog, *menu; char *prompt = dlg_strclone(cprompt); const char **buttons = dlg_ok_labels(); - bool is_inputmenu = (rename_menutext == dlg_renamed_menutext); + bool is_inputmenu = ((rename_menutext != 0) + && (rename_menutext != dlg_dummy_menutext)); dlg_does_output(); dlg_tab_correct_str(prompt); @@ -345,13 +343,14 @@ dlg_menu(const char *title, #endif use_height = menu_height; + use_width = dlg_calc_list_width(item_no, items) + 10; + use_width = MAX(26, use_width); if (use_height == 0) { - min_width = dlg_calc_list_width(item_no, items) + 10; /* calculate height without items (4) */ - dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MAX(26, min_width)); + dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, use_width); dlg_calc_listh(&height, &use_height, item_no); } else { - dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, 26); + dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, use_width); } dlg_button_layout(buttons, &width); dlg_print_size(height, width); @@ -366,8 +365,8 @@ dlg_menu(const char *title, dlg_mouse_setbase(x, y); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); wattrset(dialog, dialog_attr); @@ -402,7 +401,7 @@ dlg_menu(const char *title, /* draw a box around the menu items */ dlg_draw_box(dialog, box_y, box_x, use_height + 2, menu_width + 2, - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); name_width = 0; text_width = 0; @@ -461,6 +460,7 @@ dlg_menu(const char *title, dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width); + dlg_trace_win(dialog); while (result == DLG_EXIT_UNKNOWN) { if (button < 0) /* --visit-items */ wmove(dialog, box_y + ItemToRow(choice) + 1, box_x + tag_x + 1); @@ -687,17 +687,14 @@ dlg_menu(const char *title, FALSE, width); break; case DLGK_ENTER: - result = dlg_enter_buttoncode(button); + if (is_inputmenu) + result = dlg_ok_buttoncode(button); + else + result = dlg_enter_buttoncode(button); /* * If dlg_menu() is called from dialog_menu(), we want to - * capture the results into dialog_vars.input_result, but not - * if dlg_menu() is called directly from an application. We - * can check this by testing if rename_menutext is the function - * pointer owned by dialog_menu(). It would be nicer to have - * this logic inside dialog_menu(), but that cannot be done - * since we would lose compatibility for the results reported - * after input_menu_edit(). + * capture the results into dialog_vars.input_result. */ if (result == DLG_EXIT_ERROR) { result = DLG_EXIT_UNKNOWN; @@ -812,7 +809,9 @@ dialog_menu(const char *title, item_no, listitems, &choice, - dialog_vars.input_menu ? dlg_renamed_menutext : dlg_dummy_menutext); + (dialog_vars.input_menu + ? dlg_renamed_menutext + : dlg_dummy_menutext)); dlg_free_columns(&listitems[0].text, sizeof(DIALOG_LISTITEM), item_no); free(listitems); diff --git a/contrib/dialog/mixedform.c b/contrib/dialog/mixedform.c index b2fe538..05ba7b1 100644 --- a/contrib/dialog/mixedform.c +++ b/contrib/dialog/mixedform.c @@ -1,9 +1,9 @@ /* - * $Id: mixedform.c,v 1.8 2010/04/28 20:54:11 tom Exp $ + * $Id: mixedform.c,v 1.9 2011/10/10 00:49:43 tom Exp $ * - * formbox.c -- implements the form (i.e, some pairs label/editbox) + * mixedform.c -- implements the mixed form (i.e, typed pairs label/editbox) * - * Copyright 2007-2008,2010 Thomas E. Dickey + * Copyright 2007-2010,2011 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 diff --git a/contrib/dialog/mixedgauge.c b/contrib/dialog/mixedgauge.c index e15a4df..6d78517 100644 --- a/contrib/dialog/mixedgauge.c +++ b/contrib/dialog/mixedgauge.c @@ -1,5 +1,5 @@ /* - * $Id: mixedgauge.c,v 1.24 2011/06/27 08:16:38 tom Exp $ + * $Id: mixedgauge.c,v 1.29 2011/10/20 23:35:31 tom Exp $ * * mixedgauge.c -- implements the mixedgauge dialog * @@ -113,7 +113,6 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg) int y = MARGIN; int item; int cells = dlg->len_text - 2; - int rm = limit_x; /* right margin */ int lm = limit_x - dlg->len_text - 1; int bm = limit_y; /* bottom margin */ int last_y = 0, last_x = 0; @@ -123,7 +122,6 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg) char *freeMe = 0; if (win) { - rm -= (2 * MARGIN); bm -= (2 * MARGIN); } if (win != 0) @@ -147,7 +145,7 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg) (void) wmove(win, y, lm + (cells - (int) strlen(status)) / 2); if (freeMe) { (void) wmove(win, y, lm + 1); - wattrset(win, title_attr); + (void) wattrset(win, title_attr); for (j = 0; j < cells; j++) (void) waddch(win, ' '); @@ -157,7 +155,7 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg) if ((title_attr & A_REVERSE) != 0) { wattroff(win, A_REVERSE); } else { - wattrset(win, A_REVERSE); + (void) wattrset(win, A_REVERSE); } (void) wmove(win, y, lm + 1); @@ -181,6 +179,8 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg) (void) waddch(win, ']'); (void) wnoutrefresh(win); } + if (win != 0) + wmove(win, last_y, last_x); } static void @@ -192,10 +192,10 @@ mydraw_mixed_box(WINDOW *win, int y, int x, int height, int width, chtype attr = A_NORMAL; const char *message = _("Overall Progress"); chtype save2 = dlg_get_attrs(win); - wattrset(win, title_attr); + (void) wattrset(win, title_attr); (void) wmove(win, y, x + 2); dlg_print_text(win, message, width, &attr); - wattrset(win, save2); + (void) wattrset(win, save2); } } @@ -223,7 +223,7 @@ dlg_update_mixedgauge(DIALOG_MIXEDGAUGE * dlg, int percent) * attribute. */ (void) wmove(dlg->dialog, dlg->height - 3, 4); - wattrset(dlg->dialog, gauge_attr); + (void) wattrset(dlg->dialog, gauge_attr); for (i = 0; i < (dlg->width - 2 * (3 + MARGIN)); i++) (void) waddch(dlg->dialog, ' '); @@ -240,7 +240,7 @@ dlg_update_mixedgauge(DIALOG_MIXEDGAUGE * dlg, int percent) if ((title_attr & A_REVERSE) != 0) { wattroff(dlg->dialog, A_REVERSE); } else { - wattrset(dlg->dialog, A_REVERSE); + (void) wattrset(dlg->dialog, A_REVERSE); } (void) wmove(dlg->dialog, dlg->height - 3, 4); for (i = 0; i < x; i++) { @@ -251,6 +251,7 @@ dlg_update_mixedgauge(DIALOG_MIXEDGAUGE * dlg, int percent) (void) waddch(dlg->dialog, ch); } myprint_status(dlg); + dlg_trace_win(dlg->dialog); } /* @@ -324,11 +325,11 @@ dlg_begin_mixedgauge(DIALOG_MIXEDGAUGE * dlg, dlg->dialog = dlg_new_window(dlg->height, dlg->width, y, x); (void) werase(dlg->dialog); - dlg_draw_box(dlg->dialog, - 0, 0, - dlg->height, - dlg->width, - dialog_attr, border_attr); + dlg_draw_box2(dlg->dialog, + 0, 0, + dlg->height, + dlg->width, + dialog_attr, border_attr, border2_attr); dlg_draw_title(dlg->dialog, dlg->title); dlg_draw_helpline(dlg->dialog, FALSE); @@ -340,7 +341,7 @@ dlg_begin_mixedgauge(DIALOG_MIXEDGAUGE * dlg, dlg->width, y + dlg->item_no + (2 * MARGIN), x); - wattrset(dlg->caption, dialog_attr); + (void) wattrset(dlg->caption, dialog_attr); dlg_print_autowrap(dlg->caption, dlg->prompt, dlg->height, dlg->width); } diff --git a/contrib/dialog/msgbox.c b/contrib/dialog/msgbox.c index 25a021b..1353209 100644 --- a/contrib/dialog/msgbox.c +++ b/contrib/dialog/msgbox.c @@ -1,9 +1,9 @@ /* - * $Id: msgbox.c,v 1.66 2011/06/27 08:36:28 tom Exp $ + * $Id: msgbox.c,v 1.74 2012/07/06 16:53:53 tom Exp $ * * msgbox.c -- implements the message box and info box * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -39,20 +39,14 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, static DLG_KEYS_BINDING binding[] = { HELPKEY_BINDINGS, ENTERKEY_BINDINGS, - DLG_KEYS_DATA( DLGK_ENTER, ' ' ), + TRAVERSE_BINDINGS, SCROLLKEY_BINDINGS, - DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ), END_KEYS_BINDING }; /* *INDENT-ON* */ int x, y, last = 0, page; - int button = 0; + int button; int key = 0, fkey; int result = DLG_EXIT_UNKNOWN; WINDOW *dialog = 0; @@ -62,10 +56,18 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, int check; bool show = TRUE; int min_width = (pauseopt == 1 ? 12 : 0); + int save_nocancel = dialog_vars.nocancel; +#ifdef KEY_RESIZE + int req_high; + int req_wide; +#endif + + dialog_vars.nocancel = TRUE; + button = dlg_default_button(); #ifdef KEY_RESIZE - int req_high = height; - int req_wide = width; + req_high = height; + req_wide = width; restart: #endif @@ -95,13 +97,13 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, dlg_mouse_setbase(x, y); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); dlg_draw_title(dialog, title); wattrset(dialog, dialog_attr); if (pauseopt) { - dlg_draw_bottom_box(dialog); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); mouse_mkbutton(height - 2, width / 2 - 4, 6, '\n'); dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width); dlg_draw_helpline(dialog, FALSE); @@ -110,6 +112,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, if (show) { last = dlg_print_scrolled(dialog, prompt, offset, page, width, pauseopt); + dlg_trace_win(dialog); show = FALSE; } key = dlg_mouse_wgetch(dialog, &fkey); @@ -117,7 +120,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, break; if (!fkey && (check = dlg_char_to_button(key, buttons)) >= 0) { - result = check ? DLG_EXIT_HELP : DLG_EXIT_OK; + result = dlg_ok_buttoncode(check); break; } @@ -150,22 +153,21 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, FALSE, width); break; case DLGK_ENTER: - result = button ? DLG_EXIT_HELP : DLG_EXIT_OK; - break; - case DLGK_MOUSE(0): - result = DLG_EXIT_OK; - break; - case DLGK_MOUSE(1): - result = DLG_EXIT_HELP; + result = dlg_ok_buttoncode(button); break; default: - if (dlg_check_scrolled(key, - last, - page, - &show, - &offset) == 0) - break; - beep(); + if (is_DLGK_MOUSE(key)) { + result = dlg_ok_buttoncode(key - M_EVENT); + if (result < 0) + result = DLG_EXIT_OK; + } else if (dlg_check_scrolled(key, + last, + page, + &show, + &offset) == 0) { + } else { + beep(); + } break; } } else { @@ -176,11 +178,15 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width, dlg_print_scrolled(dialog, prompt, offset, page, width, pauseopt); dlg_draw_helpline(dialog, FALSE); wrefresh(dialog); + dlg_trace_win(dialog); result = DLG_EXIT_OK; } dlg_del_window(dialog); dlg_mouse_free_regions(); free(prompt); + + dialog_vars.nocancel = save_nocancel; + return result; } diff --git a/contrib/dialog/package/debian/changelog b/contrib/dialog/package/debian/changelog index 51d497e..62fe5da 100644 --- a/contrib/dialog/package/debian/changelog +++ b/contrib/dialog/package/debian/changelog @@ -1,3 +1,38 @@ +cdialog (20120706) unstable; urgency=high + + * fix regression in msgbox (ArchLinux #30574) + + -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 06 Jul 2012 12:52:46 -0400 + +cdialog (20120703) unstable; urgency=low + + * minor fixes + * add --default-button + + -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 30 Jun 2012 10:41:05 -0400 + +cdialog (20120215) unstable; urgency=low + + * minor fixes + + -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 15 Feb 2012 19:40:32 -0500 + +cdialog (20111020) unstable; urgency=high + + * fix regression in menubox.c logic for inputmenu vs menu. + + -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 19 Oct 2011 19:17:40 -0400 + +cdialog (20111018) unstable; urgency=high + + * improve color configurability + * misc bug-fixes. + * various improvements to tracing. + * remove an incorrect free() call in dlg_free_gauge() + * fix missing trailing null from dlg_align_columns + + -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 07 Sep 2011 20:04:04 -0400 + cdialog (20110707) unstable; urgency=high * fix a regression in dlg_getc() from 20110630 changes. diff --git a/contrib/dialog/package/dialog.spec b/contrib/dialog/package/dialog.spec index f5df494..5037ee6 100644 --- a/contrib/dialog/package/dialog.spec +++ b/contrib/dialog/package/dialog.spec @@ -1,9 +1,9 @@ Summary: dialog - display dialog boxes from shell scripts %define AppProgram dialog %define AppVersion 1.1 -%define AppRelease 20110707 +%define AppRelease 20120706 %define ActualProg c%{AppProgram} -# $XTermId: dialog.spec,v 1.24 2011/07/07 22:10:02 tom Exp $ +# $XTermId: dialog.spec,v 1.38 2012/07/06 16:51:44 tom Exp $ Name: %{ActualProg} Version: %{AppVersion} Release: %{AppRelease} @@ -53,8 +53,11 @@ make [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT make install-full DESTDIR=$RPM_BUILD_ROOT +libtool --finish %{_libdir} strip $RPM_BUILD_ROOT%{_bindir}/%{ActualProg} +chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib%{ActualProg}.so.*.*.* +rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{ActualProg}.la %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -75,5 +78,8 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{ActualProg} %changelog # each patch should add its ChangeLog entries here +* Tue Oct 18 2011 Thomas Dickey +- add executable permissions for shared libraries, discard ".la" file. + * Thu Dec 30 2010 Thomas Dickey - initial version diff --git a/contrib/dialog/pause.c b/contrib/dialog/pause.c index c104a70..acca9b7 100644 --- a/contrib/dialog/pause.c +++ b/contrib/dialog/pause.c @@ -1,9 +1,9 @@ /* - * $Id: pause.c,v 1.29 2011/06/29 09:48:53 tom Exp $ + * $Id: pause.c,v 1.36 2012/07/03 00:01:59 tom Exp $ * * pause.c -- implements the pause dialog * - * Copyright 2004-2010,2011 Thomas E. Dickey + * Copyright 2004-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -55,13 +55,7 @@ dialog_pause(const char *title, static DLG_KEYS_BINDING binding[] = { HELPKEY_BINDINGS, ENTERKEY_BINDINGS, - DLG_KEYS_DATA( DLGK_ENTER, ' ' ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ), + TRAVERSE_BINDINGS, END_KEYS_BINDING }; /* *INDENT-ON* */ @@ -72,21 +66,24 @@ dialog_pause(const char *title, #endif int i, x, y, step; - int button = 0; + int button = dlg_default_button(); int seconds_orig; WINDOW *dialog; const char **buttons = dlg_ok_labels(); bool have_buttons = (dlg_button_count(buttons) != 0); + bool first; int key = 0, fkey; int result = DLG_EXIT_UNKNOWN; int button_high = (have_buttons ? BTN_HIGH : MARGIN); int gauge_y; char *prompt = dlg_strclone(cprompt); + int save_timeout = dialog_vars.timeout_secs; curs_set(0); dlg_tab_correct_str(prompt); + dialog_vars.timeout_secs = 0; seconds_orig = (seconds > 0) ? seconds : 1; #ifdef KEY_RESIZE @@ -120,21 +117,23 @@ dialog_pause(const char *title, dlg_mouse_setbase(x, y); nodelay(dialog, TRUE); + first = TRUE; do { (void) werase(dialog); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); dlg_draw_title(dialog, title); dlg_draw_helpline(dialog, FALSE); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_print_autowrap(dialog, prompt, height, width); - dlg_draw_box(dialog, - gauge_y, 2 + MARGIN, - 2 + MARGIN, width - 2 * (2 + MARGIN), - dialog_attr, - border_attr); + dlg_draw_box2(dialog, + gauge_y, 2 + MARGIN, + 2 + MARGIN, width - 2 * (2 + MARGIN), + dialog_attr, + border_attr, + border2_attr); /* * Clear the area for the progress bar by filling it with spaces @@ -142,7 +141,7 @@ dialog_pause(const char *title, * attribute. */ (void) wmove(dialog, gauge_y + MARGIN, 4); - wattrset(dialog, title_attr); + (void) wattrset(dialog, title_attr); for (i = 0; i < (width - 2 * (3 + MARGIN)); i++) (void) waddch(dialog, ' '); @@ -159,7 +158,7 @@ dialog_pause(const char *title, if ((title_attr & A_REVERSE) != 0) { wattroff(dialog, A_REVERSE); } else { - wattrset(dialog, A_REVERSE); + (void) wattrset(dialog, A_REVERSE); } (void) wmove(dialog, gauge_y + MARGIN, 4); for (i = 0; i < x; i++) { @@ -172,10 +171,14 @@ dialog_pause(const char *title, mouse_mkbutton(height - 2, width / 2 - 4, 6, '\n'); if (have_buttons) { - dlg_draw_bottom_box(dialog); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width); } - (void) wrefresh(dialog); + if (first) { + (void) wrefresh(dialog); + dlg_trace_win(dialog); + first = FALSE; + } for (step = 0; (result == DLG_EXIT_UNKNOWN) && (step < 1000); @@ -219,24 +222,25 @@ dialog_pause(const char *title, case DLGK_ENTER: result = dlg_enter_buttoncode(button); break; - case DLGK_MOUSE(0): - result = DLG_EXIT_OK; - break; - case DLGK_MOUSE(1): - result = DLG_EXIT_CANCEL; - break; case ERR: break; default: + if (is_DLGK_MOUSE(key)) { + result = dlg_ok_buttoncode(key - M_EVENT); + if (result < 0) + result = DLG_EXIT_OK; + } break; } } } while ((result == DLG_EXIT_UNKNOWN) && (seconds-- > 0)); - nodelay(dialog, FALSE); curs_set(1); dlg_mouse_free_regions(); dlg_del_window(dialog); free(prompt); + + dialog_vars.timeout_secs = save_timeout; + return ((result == DLG_EXIT_UNKNOWN) ? DLG_EXIT_OK : result); } diff --git a/contrib/dialog/po/cs.po b/contrib/dialog/po/cs.po index b4a40e9..7986891 100644 --- a/contrib/dialog/po/cs.po +++ b/contrib/dialog/po/cs.po @@ -1,15 +1,23 @@ -# From: Martin Povolny <martin@solnet.cz> +# Czech translations for dialog package. +# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the dialog package. +# +# Martin Povolny <martin@solnet.cz> +# Marek Černocký <marek@manet.cz>, 2011. +# msgid "" msgstr "" -"Project-Id-Version: dialog 0.9a-20010527\n" +"Project-Id-Version: dialog 1.1.20080819\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-06-18 18:26-0400\n" -"PO-Revision-Date: 2004-12-19 20:14-0500\n" -"Last-Translator: Martin Povolny <martin@solnet.cz>\n" -"Language-Team:\n" +"PO-Revision-Date: 2011-11-25 13:18+0100\n" +"Last-Translator: Marek Černocký <marek@manet.cz>\n" +"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: buttons.c:385 msgid "Yes" @@ -21,7 +29,7 @@ msgstr "Ne" #: buttons.c:401 msgid "OK" -msgstr "OK" +msgstr "Budiž" #: buttons.c:409 msgid "Cancel" @@ -33,11 +41,11 @@ msgstr "Konec" #: buttons.c:425 msgid "Extra" -msgstr "" +msgstr "Další" #: buttons.c:433 msgid "Help" -msgstr "" +msgstr "Nápověda" #. Headline "Month" #: calendar.c:273 @@ -51,11 +59,11 @@ msgstr "Rok" #: dialog.c:741 msgid "Rename" -msgstr "" +msgstr "Přejmenovat" #: fselect.c:550 msgid "Directories" -msgstr "Adresáře" +msgstr "Složky" #: fselect.c:551 msgid "Files" @@ -63,46 +71,44 @@ msgstr "Soubory" #: mixedgauge.c:58 msgid "Succeeded" -msgstr "" +msgstr "Úspěšné" #: mixedgauge.c:61 -#, fuzzy msgid "Failed" -msgstr "Soubory" +msgstr "Selhalo" #: mixedgauge.c:64 msgid "Passed" -msgstr "" +msgstr "Pozastaveno" #: mixedgauge.c:67 msgid "Completed" -msgstr "" +msgstr "Dokončeno" #: mixedgauge.c:70 msgid "Checked" -msgstr "" +msgstr "Zkontrolováno" #: mixedgauge.c:73 msgid "Done" -msgstr "" +msgstr "Hotovo" #: mixedgauge.c:76 msgid "Skipped" -msgstr "" +msgstr "Přeskočeno" #: mixedgauge.c:79 msgid "In Progress" -msgstr "" +msgstr "Probíhá" #: mixedgauge.c:85 msgid "N/A" -msgstr "" +msgstr "Není známo" #: mixedgauge.c:193 msgid "Overall Progress" -msgstr "" +msgstr "Celkový průběh" #: textbox.c:489 -#, fuzzy msgid "Search" -msgstr "Search" +msgstr "Hledat" diff --git a/contrib/dialog/po/el.po b/contrib/dialog/po/el.po index 3b87e8e..2fadd9b 100644 --- a/contrib/dialog/po/el.po +++ b/contrib/dialog/po/el.po @@ -1,14 +1,20 @@ +# Greek translation for dialog. +# This file is distributed under the same license as the dialog package. +# Copyright (C) 2008 Free Software Foundation, Inc. +# Savvas Radevic <vicedar@gmail.com>, 2012. +# msgid "" msgstr "" -"Project-Id-Version: Dialog\n" +"Project-Id-Version: dialog 1.1.20080819\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-06-18 18:26-0400\n" -"PO-Revision-Date: 2002-06-05 10:00GMT+2\n" -"Last-Translator: kromJx <kromJx@crosswinds.net>\n" -"Language-Team: <i18ngr@hellug.gr>\n" +"PO-Revision-Date: 2012-03-18 00:54+0100\n" +"Last-Translator: Savvas Radevic <vicedar@gmail.com>\n" +"Language-Team: Greek <team@lists.gnome.gr>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #: buttons.c:385 msgid "Yes" @@ -20,7 +26,7 @@ msgstr "Όχι" #: buttons.c:401 msgid "OK" -msgstr "OK" +msgstr "Εντάξει" #: buttons.c:409 msgid "Cancel" @@ -32,7 +38,7 @@ msgstr "Έξοδος" #: buttons.c:425 msgid "Extra" -msgstr "" +msgstr "Πρόσθετα" #: buttons.c:433 msgid "Help" @@ -50,7 +56,7 @@ msgstr "Έτος" #: dialog.c:741 msgid "Rename" -msgstr "" +msgstr "Μετονομασία" #: fselect.c:550 msgid "Directories" @@ -62,46 +68,44 @@ msgstr "Αρχεία" #: mixedgauge.c:58 msgid "Succeeded" -msgstr "" +msgstr "Επιτυχία" #: mixedgauge.c:61 -#, fuzzy msgid "Failed" -msgstr "Αρχεία" +msgstr "Αποτυχία" #: mixedgauge.c:64 msgid "Passed" -msgstr "" +msgstr "Πέρασε" #: mixedgauge.c:67 msgid "Completed" -msgstr "" +msgstr "Ολοκλήρωση" #: mixedgauge.c:70 msgid "Checked" -msgstr "" +msgstr "Έλεγχος" #: mixedgauge.c:73 msgid "Done" -msgstr "" +msgstr "Τέλος" #: mixedgauge.c:76 msgid "Skipped" -msgstr "" +msgstr "Παράλειψη" #: mixedgauge.c:79 msgid "In Progress" -msgstr "" +msgstr "Σε εξέλιξη" #: mixedgauge.c:85 msgid "N/A" -msgstr "" +msgstr "Μη Διαθέσιμο" #: mixedgauge.c:193 msgid "Overall Progress" -msgstr "" +msgstr "Συνολική πρόοδος" #: textbox.c:489 -#, fuzzy msgid "Search" -msgstr "Search" +msgstr "Αναζήτηση" diff --git a/contrib/dialog/po/hr.po b/contrib/dialog/po/hr.po index 6f3f546..c3661db 100644 --- a/contrib/dialog/po/hr.po +++ b/contrib/dialog/po/hr.po @@ -1,110 +1,112 @@ -# Croatian translation of Dialog. +# Dialog +# Copyright 2003-2007,2008 # Thomas Dickey # This file is distributed under the same license as the dialog package. -# Copyright (C) 2005 Thomas Dickey. +# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: Dialog 1.0-20050116\n" +"Project-Id-Version: dialog 1.1.20080819\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:57-0500\n" -"PO-Revision-Date: 2004-07-25 14:52+0200\n" -"Last-Translator: Krunoslav Gernhard <kruno@linux.hr>\n" +"POT-Creation-Date: 2008-06-18 18:26-0400\n" +"PO-Revision-Date: 2012-03-31 00:10+0200\n" +"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" "Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: buttons.c:387 +#: buttons.c:385 msgid "Yes" msgstr "Da" -#: buttons.c:395 +#: buttons.c:393 msgid "No" msgstr "Ne" -#: buttons.c:403 +#: buttons.c:401 msgid "OK" msgstr "U redu" -#: buttons.c:411 +#: buttons.c:409 msgid "Cancel" msgstr "Otkaži" -#: buttons.c:419 +#: buttons.c:417 msgid "EXIT" -msgstr "" +msgstr "IZLAZ" -#: buttons.c:427 +#: buttons.c:425 msgid "Extra" -msgstr "" +msgstr "Dodatno" -#: buttons.c:435 +#: buttons.c:433 msgid "Help" -msgstr "" +msgstr "Pomoć" #. Headline "Month" -#: calendar.c:298 +#: calendar.c:273 msgid "Month" -msgstr "" +msgstr "Mjesec" #. Headline "Year" -#: calendar.c:318 +#: calendar.c:293 msgid "Year" -msgstr "" +msgstr "Godina" -#: dialog.c:756 +#: dialog.c:741 msgid "Rename" -msgstr "" +msgstr "Preimenuj" -#: fselect.c:571 +#: fselect.c:550 msgid "Directories" -msgstr "" +msgstr "Direktoriji" -#: fselect.c:572 +#: fselect.c:551 msgid "Files" -msgstr "" +msgstr "Datoteke" #: mixedgauge.c:58 msgid "Succeeded" -msgstr "" +msgstr "Uspjeh" #: mixedgauge.c:61 msgid "Failed" -msgstr "" +msgstr "Neuspjeh" #: mixedgauge.c:64 msgid "Passed" -msgstr "" +msgstr "Prošlo" #: mixedgauge.c:67 msgid "Completed" -msgstr "" +msgstr "Dovršeno" #: mixedgauge.c:70 msgid "Checked" -msgstr "" +msgstr "Provjereno" #: mixedgauge.c:73 msgid "Done" -msgstr "" +msgstr "Gotovo" #: mixedgauge.c:76 msgid "Skipped" -msgstr "" +msgstr "Preskočeno" #: mixedgauge.c:79 msgid "In Progress" -msgstr "" +msgstr "U tijeku" #: mixedgauge.c:85 msgid "N/A" -msgstr "" +msgstr "Nedostupno" #: mixedgauge.c:193 msgid "Overall Progress" -msgstr "" +msgstr "Ukupni napredak" -#: textbox.c:468 +#: textbox.c:489 msgid "Search" -msgstr "" +msgstr "Pretraga" diff --git a/contrib/dialog/po/sr.po b/contrib/dialog/po/sr.po index 9414692..46b049d 100644 --- a/contrib/dialog/po/sr.po +++ b/contrib/dialog/po/sr.po @@ -1,18 +1,21 @@ -# Serbian translation of `dialog'. +# Serbian translation of dialog. # Copyright (C) 2005 Free Software Foundation, Inc. -# This file is distributed under the same license as the `dialog' package. +# This file is distributed under the same license as the dialog package. # Aleksandar Jelenak <jelenak@verizon.net>, 2005. +# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011. msgid "" msgstr "" -"Project-Id-Version: dialog 1.0-rel20041222\n" +"Project-Id-Version: dialog-1.1.20080819\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-06-18 18:26-0400\n" -"PO-Revision-Date: 2005-08-21 12:53-0400\n" -"Last-Translator: Aleksandar Jelenak <jelenak@verizon.net>\n" +"PO-Revision-Date: 2011-12-24 21:29+0200\n" +"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <gnu@prevod.org>\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: buttons.c:385 msgid "Yes" @@ -66,44 +69,43 @@ msgstr "Датотеке" #: mixedgauge.c:58 msgid "Succeeded" -msgstr "" +msgstr "Успешно" #: mixedgauge.c:61 -#, fuzzy msgid "Failed" -msgstr "Датотеке" +msgstr "Неуспешно" #: mixedgauge.c:64 msgid "Passed" -msgstr "" +msgstr "Прошло" #: mixedgauge.c:67 msgid "Completed" -msgstr "" +msgstr "Завршено" #: mixedgauge.c:70 msgid "Checked" -msgstr "" +msgstr "Проверено" #: mixedgauge.c:73 msgid "Done" -msgstr "" +msgstr "Урађено" #: mixedgauge.c:76 msgid "Skipped" -msgstr "" +msgstr "Прескочено" #: mixedgauge.c:79 msgid "In Progress" -msgstr "" +msgstr "У току" #: mixedgauge.c:85 msgid "N/A" -msgstr "" +msgstr "Н/Д" #: mixedgauge.c:193 msgid "Overall Progress" -msgstr "" +msgstr "Укупно напредовање" #: textbox.c:489 msgid "Search" diff --git a/contrib/dialog/prgbox.c b/contrib/dialog/prgbox.c index a3b3ea6..cd7bb8c 100644 --- a/contrib/dialog/prgbox.c +++ b/contrib/dialog/prgbox.c @@ -1,5 +1,5 @@ /* - * $Id: prgbox.c,v 1.7 2011/06/30 20:44:13 tom Exp $ + * $Id: prgbox.c,v 1.8 2011/10/20 23:42:32 tom Exp $ * * prgbox.c -- implements the prg box * @@ -31,11 +31,10 @@ dlg_popen(const char *command, const char *type) { FILE *result = 0; int fd[2]; - int pid; const char *argv[4]; if ((*type == 'r' || *type != 'w') && pipe(fd) == 0) { - switch (pid = fork()) { + switch (fork()) { case -1: /* Error. */ (void) close(fd[0]); (void) close(fd[1]); diff --git a/contrib/dialog/progressbox.c b/contrib/dialog/progressbox.c index 024e288..077339c 100644 --- a/contrib/dialog/progressbox.c +++ b/contrib/dialog/progressbox.c @@ -1,5 +1,5 @@ /* - * $Id: progressbox.c,v 1.13 2011/06/27 08:18:20 tom Exp $ + * $Id: progressbox.c,v 1.21 2012/07/03 00:12:52 tom Exp $ * * progressbox.c -- implements the progress box * @@ -99,6 +99,7 @@ print_line(MY_OBJ * obj, WINDOW *win, int row, int width) #endif getyx(win, y, x); + (void) y; /* Clear 'residue' of previous line */ for (i = 0; i < width - x; i++) (void) waddch(win, ' '); @@ -111,54 +112,79 @@ pause_for_ok(WINDOW *dialog, int height, int width) static DLG_KEYS_BINDING binding[] = { HELPKEY_BINDINGS, ENTERKEY_BINDINGS, - DLG_KEYS_DATA( DLGK_ENTER, ' ' ), + TRAVERSE_BINDINGS, END_KEYS_BINDING }; /* *INDENT-ON* */ - int button = 0; + int button; int key = 0, fkey; int result = DLG_EXIT_UNKNOWN; const char **buttons = dlg_ok_label(); int check; + int save_nocancel = dialog_vars.nocancel; + bool redraw = TRUE; + + dialog_vars.nocancel = TRUE; + button = dlg_default_button(); dlg_register_window(dialog, "progressbox", binding); dlg_register_buttons(dialog, "progressbox", buttons); - dlg_draw_bottom_box(dialog); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); mouse_mkbutton(height - 2, width / 2 - 4, 6, '\n'); - dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width); while (result == DLG_EXIT_UNKNOWN) { + if (redraw) { + redraw = FALSE; + if (button < 0) + button = 0; + dlg_draw_buttons(dialog, + height - 2, 0, + buttons, button, + FALSE, width); + } + key = dlg_mouse_wgetch(dialog, &fkey); if (dlg_result_key(key, fkey, &result)) break; if (!fkey && (check = dlg_char_to_button(key, buttons)) >= 0) { - result = check ? DLG_EXIT_HELP : DLG_EXIT_OK; + result = dlg_ok_buttoncode(check); break; } if (fkey) { switch (key) { - case DLGK_ENTER: - result = button ? DLG_EXIT_HELP : DLG_EXIT_OK; + case DLGK_FIELD_NEXT: + button = dlg_next_button(buttons, button); + redraw = TRUE; break; - case DLGK_MOUSE(0): - result = DLG_EXIT_OK; + case DLGK_FIELD_PREV: + button = dlg_prev_button(buttons, button); + redraw = TRUE; break; - case DLGK_MOUSE(1): - result = DLG_EXIT_HELP; + case DLGK_ENTER: + result = dlg_ok_buttoncode(button); break; default: - beep(); + if (is_DLGK_MOUSE(key)) { + result = dlg_ok_buttoncode(key - M_EVENT); + if (result < 0) + result = DLG_EXIT_OK; + } else { + beep(); + } break; } + } else { beep(); } } dlg_unregister_window(dialog); + + dialog_vars.nocancel = save_nocancel; return result; } @@ -188,16 +214,17 @@ dlg_progressbox(const char *title, dialog = dlg_new_window(height, width, y, x); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); dlg_draw_title(dialog, title); dlg_draw_helpline(dialog, FALSE); if (*prompt != '\0') { int y2, x2; - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_print_autowrap(dialog, prompt, height, width); getyx(dialog, y2, x2); + (void) x2; ++y2; wmove(dialog, y2, MARGIN); for (i = 0; i < getmaxx(dialog) - 2 * MARGIN; i++) @@ -236,6 +263,7 @@ dlg_progressbox(const char *title, print_line(obj, text, thigh - 1, width - (2 * MARGIN)); } (void) wrefresh(text); + dlg_trace_win(dialog); if (obj->is_eof) break; } @@ -254,7 +282,7 @@ dlg_progressbox(const char *title, free(prompt); free(obj); - return DLG_EXIT_OK; + return result; } /* diff --git a/contrib/dialog/rc.c b/contrib/dialog/rc.c index 2e2c7e6..cc6af29 100644 --- a/contrib/dialog/rc.c +++ b/contrib/dialog/rc.c @@ -1,5 +1,5 @@ /* - * $Id: rc.c,v 1.47 2011/06/20 22:30:04 tom Exp $ + * $Id: rc.c,v 1.49 2011/10/15 00:56:44 tom Exp $ * * rc.c -- routines for processing the configuration file * @@ -203,9 +203,10 @@ attr_to_str(char *str, int fg, int bg, int hl) /* * Extract the foreground, background and highlight values from an attribute - * represented as a string in this form: + * represented as a string in one of two forms: * * "(foreground,background,highlight)" + " "xxxx_color" */ static int str_to_attr(char *str, int *fg, int *bg, int *hl) @@ -214,8 +215,15 @@ str_to_attr(char *str, int *fg, int *bg, int *hl) unsigned j; char tempstr[MAX_LEN + 1], *part; - if (str[0] != '(' || lastch(str) != ')') + if (str[0] != '(' || lastch(str) != ')') { + if ((i = find_color(str)) >= 0) { + *fg = dlg_color_table[i].fg; + *bg = dlg_color_table[i].bg; + *hl = dlg_color_table[i].hilite; + return 0; + } return -1; /* invalid representation */ + } /* remove the parenthesis */ strcpy(tempstr, str + 1); @@ -424,13 +432,29 @@ dlg_create_rc(const char *filename) #ifdef HAVE_COLOR for (i = 0; i < (unsigned) dlg_color_count(); ++i) { char buffer[MAX_LEN + 1]; + unsigned j; + bool repeat = FALSE; fprintf(rc_file, "\n# %s\n", dlg_color_table[i].comment); - fprintf(rc_file, "%s = %s\n", dlg_color_table[i].name, - attr_to_str(buffer, - dlg_color_table[i].fg, - dlg_color_table[i].bg, - dlg_color_table[i].hilite)); + for (j = 0; j != i; ++j) { + if (dlg_color_table[i].fg == dlg_color_table[j].fg + && dlg_color_table[i].bg == dlg_color_table[j].bg + && dlg_color_table[i].hilite == dlg_color_table[j].hilite) { + fprintf(rc_file, "%s = %s\n", + dlg_color_table[i].name, + dlg_color_table[j].name); + repeat = TRUE; + break; + } + } + + if (!repeat) { + fprintf(rc_file, "%s = %s\n", dlg_color_table[i].name, + attr_to_str(buffer, + dlg_color_table[i].fg, + dlg_color_table[i].bg, + dlg_color_table[i].hilite)); + } } #endif /* HAVE_COLOR */ dlg_dump_keys(rc_file); @@ -507,7 +531,10 @@ dlg_parse_rc(void) lastch(str) = '\0'; if (begins_with(str, "bindkey", ¶ms)) { - dlg_parse_bindkey(params); + if (!dlg_parse_bindkey(params)) { + fprintf(stderr, "\nParse error: line %d of configuration\n", l); + result = -1; + } continue; } parse = parse_line(str, &var, &value); /* parse current line */ diff --git a/contrib/dialog/samples/copifuncs/admin.funcs b/contrib/dialog/samples/copifuncs/admin.funcs index 27800dc..ff1b80d 100755 --- a/contrib/dialog/samples/copifuncs/admin.funcs +++ b/contrib/dialog/samples/copifuncs/admin.funcs @@ -1,5 +1,5 @@ -#!/bin/bash -# $Id: admin.funcs,v 1.2 2001/01/15 22:20:11 tom Exp $ +#!/usr/bin/env bash +# $Id: admin.funcs,v 1.3 2012/02/16 01:29:39 tom Exp $ # # ComeOn Point Functions! v0.9.2 # - usate da vari altri moduli ComeOn Point... diff --git a/contrib/dialog/samples/copifuncs/common.funcs b/contrib/dialog/samples/copifuncs/common.funcs index 04eca9a..63640c4 100755 --- a/contrib/dialog/samples/copifuncs/common.funcs +++ b/contrib/dialog/samples/copifuncs/common.funcs @@ -1,3 +1,5 @@ +#!/usr/bin/env bash +# $Id: common.funcs,v 1.2 2012/06/29 22:33:42 tom Exp $ # # ComeOn Point Functions! v0.9.2 # - usate da vari altri moduli ComeOn Point... diff --git a/contrib/dialog/samples/copifuncs/copi.funcs b/contrib/dialog/samples/copifuncs/copi.funcs index 7be4bdb..87a623c 100755 --- a/contrib/dialog/samples/copifuncs/copi.funcs +++ b/contrib/dialog/samples/copifuncs/copi.funcs @@ -1,5 +1,5 @@ -#!/bin/bash -# $Id: copi.funcs,v 1.3 2001/01/15 22:24:26 tom Exp $ +#!/usr/bin/env bash +# $Id: copi.funcs,v 1.4 2012/02/16 01:29:39 tom Exp $ # ComeOn Point Functions! v0.9.2 # - usate da vari altri moduli ComeOn Point... # @@ -244,7 +244,7 @@ create_innconf_newsfeeds_distrib() { save $INNCONF cat <<EOF >$INNCONF -## $Revision: 1.3 $ +## $Revision: 1.4 $ ## inn.conf -- inn configuration data ## Format: ## <parameter>:<whitespace><value> @@ -350,7 +350,7 @@ create_nnrpaccess() { save $NNRPACCESS cat <<EOF >$NNRPACCESS -## $Revision: 1.3 $ +## $Revision: 1.4 $ ## nnrp.access - access file for on-campus NNTP sites ## Format: ## <host>:<perm>:<user>:<pass>:<groups> @@ -386,7 +386,7 @@ create_hostsnntp() { save $HOSTSNNTP cat <<EOF >$HOSTSNNTP -## $Revision: 1.3 $ +## $Revision: 1.4 $ ## hosts.nntp - names and addresses that feed us news ## Format ## <host>: diff --git a/contrib/dialog/samples/copifuncs/copi.ifman2 b/contrib/dialog/samples/copifuncs/copi.ifman2 index 0b6dbb7..7a111bf 100755 --- a/contrib/dialog/samples/copifuncs/copi.ifman2 +++ b/contrib/dialog/samples/copifuncs/copi.ifman2 @@ -1,3 +1,6 @@ +# vile:perlmode +# $Id: copi.ifman2,v 1.2 2012/06/29 22:33:42 tom Exp $ + if ( getpwuid($<) ne $ifowner ) { print "You must be owner of ifmail\n"; exit 1; } if ( (@ARGV < 3) || $ARGV[0] eq "-?" || $ARGV[0] eq "-h" ) { diff --git a/contrib/dialog/samples/copifuncs/copi.ifpoll2 b/contrib/dialog/samples/copifuncs/copi.ifpoll2 index 216bff0..ea4deb1 100755 --- a/contrib/dialog/samples/copifuncs/copi.ifpoll2 +++ b/contrib/dialog/samples/copifuncs/copi.ifpoll2 @@ -1,3 +1,5 @@ +#!/usr/bin/env bash +# $Id: copi.ifpoll2,v 1.2 2012/06/29 22:33:42 tom Exp $ # Packets backup directory - You have to CREATE this directory BAK=/var/spool/ifmail/BAK diff --git a/contrib/dialog/samples/copifuncs/copi.ifreq2 b/contrib/dialog/samples/copifuncs/copi.ifreq2 index 9ee78ff..19ff08c 100755 --- a/contrib/dialog/samples/copifuncs/copi.ifreq2 +++ b/contrib/dialog/samples/copifuncs/copi.ifreq2 @@ -1,3 +1,6 @@ +#!/usr/bin/perl +# $Id: copi.ifreq2,v 1.2 2012/06/29 22:33:42 tom Exp $ +# # this is the base directory, where the req-files are stored and the # default outbound $flo_path = "/var/spool/ifmail"; diff --git a/contrib/dialog/samples/copifuncs/copi.sendifm1 b/contrib/dialog/samples/copifuncs/copi.sendifm1 index 564b9c6..dcf9c78 100755 --- a/contrib/dialog/samples/copifuncs/copi.sendifm1 +++ b/contrib/dialog/samples/copifuncs/copi.sendifm1 @@ -1,5 +1,5 @@ -#! /bin/sh -## $Revision: 1.1 $ +#!/usr/bin/env bash +# $Id: copi.sendifm1,v 1.2 2012/06/29 22:33:42 tom Exp $ ## SH script to send UUCP batches out. ## =()<. @<_PATH_SHELLVARS>@>()= diff --git a/contrib/dialog/samples/copifuncs/copi.wheel b/contrib/dialog/samples/copifuncs/copi.wheel index 567e559..ecb5061 100755 --- a/contrib/dialog/samples/copifuncs/copi.wheel +++ b/contrib/dialog/samples/copifuncs/copi.wheel @@ -1,5 +1,5 @@ -#!/bin/bash -# $Id: copi.wheel,v 1.2 2001/01/15 22:26:33 tom Exp $ +#!/bin/sh +# $Id: copi.wheel,v 1.4 2012/06/29 10:53:52 tom Exp $ mkstemp size dialog --print-maxsize 2>$tmp_size @@ -9,10 +9,10 @@ rm $tmp_size # Takes an integer, multiplies it for COLS, divides for 132 scalex() { - echo $[$1*$COLS/132] + expr $1 \* $COLS / 132 } scaley() { - echo $[$1*$ROWS/60] + expr $1 \* $ROWS / 60 } dialog --backtitle "$TITLE" --no-shadow \ diff --git a/contrib/dialog/samples/copismall b/contrib/dialog/samples/copismall index 3dfb485..537c4ac 100755 --- a/contrib/dialog/samples/copismall +++ b/contrib/dialog/samples/copismall @@ -1,5 +1,5 @@ -#!/bin/bash -# $Id: copismall,v 1.8 2010/01/13 10:26:52 tom Exp $ +#!/usr/bin/env bash +# $Id: copismall,v 1.9 2012/02/16 01:29:39 Pedro.Giffuni Exp $ # # ComeOn Point Installer! v0.9a.small (small version for cdialog v0.9a) # - installa il point in modo visuale e auto-detecting. Versione light. diff --git a/contrib/dialog/samples/debian.rc b/contrib/dialog/samples/debian.rc index 3b42eb8..195d798 100644 --- a/contrib/dialog/samples/debian.rc +++ b/contrib/dialog/samples/debian.rc @@ -1,4 +1,4 @@ -# $Id: debian.rc,v 1.5 2011/01/17 00:14:53 tom Exp $ +# $Id: debian.rc,v 1.7 2011/10/15 01:00:09 tom Exp $ # vile:confmode # Run-time configuration file for dialog, matches Debian color scheme. # (these are the default values for dialog) @@ -47,10 +47,10 @@ border_color = (WHITE,WHITE,ON) button_active_color = (WHITE,BLUE,ON) # Inactive button color -button_inactive_color = (BLACK,WHITE,OFF) +button_inactive_color = dialog_color # Active button key color -button_key_active_color = (WHITE,BLUE,ON) +button_key_active_color = button_active_color # Inactive button key color button_key_inactive_color = (RED,WHITE,OFF) @@ -62,64 +62,64 @@ button_label_active_color = (YELLOW,BLUE,ON) button_label_inactive_color = (BLACK,WHITE,ON) # Input box color -inputbox_color = (BLACK,WHITE,OFF) +inputbox_color = dialog_color # Input box border color -inputbox_border_color = (BLACK,WHITE,OFF) +inputbox_border_color = dialog_color # Search box color -searchbox_color = (BLACK,WHITE,OFF) +searchbox_color = dialog_color # Search box title color -searchbox_title_color = (BLUE,WHITE,ON) +searchbox_title_color = title_color # Search box border color -searchbox_border_color = (WHITE,WHITE,ON) +searchbox_border_color = border_color # File position indicator color -position_indicator_color = (BLUE,WHITE,ON) +position_indicator_color = title_color # Menu box color -menubox_color = (BLACK,WHITE,OFF) +menubox_color = dialog_color # Menu box border color -menubox_border_color = (WHITE,WHITE,ON) +menubox_border_color = border_color # Item color -item_color = (BLACK,WHITE,OFF) +item_color = dialog_color # Selected item color -item_selected_color = (WHITE,BLUE,ON) +item_selected_color = button_active_color # Tag color -tag_color = (BLUE,WHITE,ON) +tag_color = title_color # Selected tag color -tag_selected_color = (YELLOW,BLUE,ON) +tag_selected_color = button_label_active_color # Tag key color -tag_key_color = (RED,WHITE,OFF) +tag_key_color = button_key_inactive_color # Selected tag key color tag_key_selected_color = (RED,BLUE,ON) # Check box color -check_color = (BLACK,WHITE,OFF) +check_color = dialog_color # Selected check box color -check_selected_color = (WHITE,BLUE,ON) +check_selected_color = button_active_color # Up arrow color uarrow_color = (GREEN,WHITE,ON) # Down arrow color -darrow_color = (GREEN,WHITE,ON) +darrow_color = uarrow_color # Item help-text color itemhelp_color = (WHITE,BLACK,OFF) # Active form text color -form_active_text_color = (WHITE,BLUE,ON) +form_active_text_color = button_active_color # Form text color form_text_color = (WHITE,CYAN,ON) @@ -128,4 +128,16 @@ form_text_color = (WHITE,CYAN,ON) form_item_readonly_color = (CYAN,WHITE,ON) # Dialog box gauge color -gauge_color = (BLUE,WHITE,ON) +gauge_color = title_color + +# Dialog box border2 color +border2_color = dialog_color + +# Input box border2 color +inputbox_border2_color = dialog_color + +# Search box border2 color +searchbox_border2_color = dialog_color + +# Menu box border2 color +menubox_border2_color = dialog_color diff --git a/contrib/dialog/samples/dft-cancel b/contrib/dialog/samples/dft-cancel new file mode 100755 index 0000000..2b317fc --- /dev/null +++ b/contrib/dialog/samples/dft-cancel @@ -0,0 +1,3 @@ +#!/bin/sh +# $Id: dft-cancel,v 1.2 2012/07/03 09:44:02 tom Exp $ +DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button cancel" "$@" diff --git a/contrib/dialog/samples/dft-extra b/contrib/dialog/samples/dft-extra new file mode 100755 index 0000000..de08cd7 --- /dev/null +++ b/contrib/dialog/samples/dft-extra @@ -0,0 +1,3 @@ +#!/bin/sh +# $Id: dft-extra,v 1.2 2012/07/03 09:44:02 tom Exp $ +DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button extra" "$@" diff --git a/contrib/dialog/samples/dft-help b/contrib/dialog/samples/dft-help new file mode 100755 index 0000000..cade8a7 --- /dev/null +++ b/contrib/dialog/samples/dft-help @@ -0,0 +1,3 @@ +#!/bin/sh +# $Id: dft-help,v 1.2 2012/07/03 09:44:02 tom Exp $ +DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --default-button help" "$@" diff --git a/contrib/dialog/samples/dft-no b/contrib/dialog/samples/dft-no new file mode 100755 index 0000000..172bcb2 --- /dev/null +++ b/contrib/dialog/samples/dft-no @@ -0,0 +1,3 @@ +#!/bin/sh +# $Id: dft-no,v 1.2 2012/07/03 09:44:02 tom Exp $ +DIALOGOPTS="$DIALOGOPTS --extra-button --help-button --defaultno" "$@" diff --git a/contrib/dialog/samples/dialog.py b/contrib/dialog/samples/dialog.py index db66fd7..5286b41 100644 --- a/contrib/dialog/samples/dialog.py +++ b/contrib/dialog/samples/dialog.py @@ -1,4 +1,5 @@ -# $Id: dialog.py,v 1.3 2004/09/21 00:52:15 tom Exp $ +#!/usr/bin/python +# $Id: dialog.py,v 1.4 2012/06/29 09:33:18 tom Exp $ # Module: dialog.py # Copyright (c) 2000 Robb Shecter <robb@acm.org> # All rights reserved. diff --git a/contrib/dialog/samples/dselect b/contrib/dialog/samples/dselect deleted file mode 100755 index 22995b4..0000000 --- a/contrib/dialog/samples/dselect +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# $Id: dselect,v 1.6 2010/01/13 10:20:03 tom Exp $ - -. ./setup-vars - -exec 3>&1 -RESULT=`$DIALOG --title "Please choose a directory" "$@" --dselect $HOME/ 14 48 2>&1 1>&3` -retval=$? -exec 3>&- - -. ./report-string diff --git a/contrib/dialog/samples/form1 b/contrib/dialog/samples/form1 index cfa8a4a..38e2364 100755 --- a/contrib/dialog/samples/form1 +++ b/contrib/dialog/samples/form1 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: form1,v 1.14 2010/01/13 10:53:11 tom Exp $ +# $Id: form1,v 1.15 2011/10/04 23:36:53 tom Exp $ . ./setup-vars @@ -63,8 +63,8 @@ $show" 10 40 echo "Button 3 (Extra) pressed." exit ;; - $DIALOG_ERR) - echo "ERROR!" + $DIALOG_ERROR) + echo "ERROR!$value" exit ;; $DIALOG_ESC) diff --git a/contrib/dialog/samples/fselect0 b/contrib/dialog/samples/fselect0 new file mode 100755 index 0000000..3bd5b6d --- /dev/null +++ b/contrib/dialog/samples/fselect0 @@ -0,0 +1,11 @@ +#!/bin/sh +# $Id: fselect0,v 1.1 2011/10/14 08:32:48 tom Exp $ + +. ./setup-vars + +exec 3>&1 +RESULT=`$DIALOG --title "Please choose a file" "$@" --fselect '' 14 48 2>&1 1>&3` +retval=$? +exec 3>&- + +. ./report-string diff --git a/contrib/dialog/samples/inputmenu b/contrib/dialog/samples/inputmenu index 5053cda..3c80811 100755 --- a/contrib/dialog/samples/inputmenu +++ b/contrib/dialog/samples/inputmenu @@ -1,60 +1,65 @@ -#! /bin/bash -# $Id: inputmenu,v 1.10 2010/01/13 10:29:22 tom Exp $ +#! /bin/sh +# $Id: inputmenu,v 1.15 2012/07/06 18:11:21 tom Exp $ # 2002 - written by Tobias Rittweiler <tobrit@freebits.de> . ./setup-vars -user="$USER" ; uid="$UID" ; -gid="$GROUPS" ; home="$HOME" ; +user="$USER" +uid=`id|sed -e 's/^uid=//' -e 's/(.*//'` +gid=`id|sed -e 's/^.*gid=//' -e 's/(.*//'` +home="$HOME" while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do - exec 3>&1 - value=$("$DIALOG" --clear --ok-label "Create" \ - --backtitle "An Example for the use of --inputmenu:" "$@" \ - --inputmenu "Originally I designed --inputmenu for a \ + exec 3>&1 + value=`$DIALOG \ + --clear --ok-label "Create" \ + --backtitle "An Example for the use of --inputmenu:" "$@" \ + --inputmenu "Originally I designed --inputmenu for a \ configuration purpose. Here is a possible piece of a configuration program. \ " 20 50 10 \ "Username:" "$user" \ "UID:" "$uid" \ "GID:" "$gid" \ "HOME:" "$home" \ -2>&1 1>&3 ) - returncode=$? - exec 3>&- - case $returncode in - $DIALOG_CANCEL) - "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \ - --yesno "Really quit?" 10 30 - case $? in - $DIALOG_OK) break;; - $DIALOG_CANCEL) returncode=99;; - esac - ;; - $DIALOG_OK) - "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \ +2>&1 1>&3 ` + returncode=$? + exec 3>&- + case $returncode in + $DIALOG_CANCEL) + "$DIALOG" \ + --clear --backtitle "An Example for the use of --inputmenu:" \ + --yesno "Really quit?" 10 30 + case $? in + $DIALOG_OK) break;; + $DIALOG_CANCEL) returncode=99;; + esac + ;; + $DIALOG_OK) + "$DIALOG" \ + --clear --backtitle "An Example for the use of --inputmenu:" \ --msgbox "useradd \n\ -d $home \n\ -u $uid \n\ -g $gid \n\ $user" 10 40 - ;; - $DIALOG_EXTRA) - value="${value:8:${#value}}" - tag="${value%:*}" - item="${value#*: }" + ;; + $DIALOG_EXTRA) + value=`echo "$value" | sed -e 's/^RENAMED //'` + tag=`echo "$value" | sed -e 's/:.*//'` + item=`echo "$value" | sed -e 's/^[^:]*:[ ][ ]*//'` - case "$tag" in - Username) user="$item";; - UID) uid="$item";; - GID) gid="$item";; - HOME) home="$item";; - esac - ;; + case "$tag" in + Username) user="$item" ;; + UID) uid="$item" ;; + GID) gid="$item" ;; + HOME) home="$item" ;; + esac + ;; - $DIALOG_ESC) - echo "ESC pressed." - break - ;; + $DIALOG_ESC) + echo "ESC pressed." + break + ;; - esac + esac done diff --git a/contrib/dialog/samples/inputmenu-stdout b/contrib/dialog/samples/inputmenu-stdout index 22fce04..a778226 100755 --- a/contrib/dialog/samples/inputmenu-stdout +++ b/contrib/dialog/samples/inputmenu-stdout @@ -1,53 +1,63 @@ -#! /bin/bash -# $Id: inputmenu-stdout,v 1.8 2010/01/13 10:30:14 tom Exp $ +#! /bin/sh +# $Id: inputmenu-stdout,v 1.13 2012/07/06 18:11:12 tom Exp $ # 2002 - written by Tobias Rittweiler <tobrit@freebits.de> . ./setup-vars -user="$USER" ; uid="$UID" ; -gid="$GROUPS" ; home="$HOME" ; +user="$USER" +uid=`id|sed -e 's/^uid=//' -e 's/(.*//'` +gid=`id|sed -e 's/^.*gid=//' -e 's/(.*//'` +home="$HOME" while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do - value="$("$DIALOG" --stdout --clear --ok-label "Create" \ - --backtitle "An Example for the use of --inputmenu:" "$@" \ - --inputmenu "Originally I designed --inputmenu for a \ -configuration purpose. Here is a possible piece of a configuration program. -" 20 50 10 "Username:" "$user" "UID:" "$uid" "GID:" "$gid" "HOME:" "$home")" - returncode=$? - case $returncode in - $DIALOG_CANCEL) - "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \ - --yesno "Really quit?" 10 30 - case $? in - $DIALOG_OK) break;; - $DIALOG_CANCEL) returncode=99;; - esac - ;; - $DIALOG_OK) - "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:" \ + value=`$DIALOG \ + --stdout --clear --ok-label "Create" \ + --backtitle "An Example for the use of --inputmenu:" "$@" \ + --inputmenu "Originally I designed --inputmenu for a \ +configuration purpose. Here is a possible piece of a configuration program. \ +" 20 50 10 \ +"Username:" "$user" \ +"UID:" "$uid" \ +"GID:" "$gid" \ +"HOME:" "$home" \ +` + returncode=$? + case $returncode in + $DIALOG_CANCEL) + "$DIALOG" \ + --clear --backtitle "An Example for the use of --inputmenu:" \ + --yesno "Really quit?" 10 30 + case $? in + $DIALOG_OK) break;; + $DIALOG_CANCEL) returncode=99;; + esac + ;; + $DIALOG_OK) + "$DIALOG" \ + --clear --backtitle "An Example for the use of --inputmenu:" \ --msgbox "useradd \n\ -d $home \n\ -u $uid \n\ -g $gid \n\ $user" 10 40 - ;; - $DIALOG_EXTRA) - value="${value:8:${#value}}" - tag="${value%:*}" - item="${value#*: }" + ;; + $DIALOG_EXTRA) + value=`echo "$value" | sed -e 's/^RENAMED //'` + tag=`echo "$value" | sed -e 's/:.*//'` + item=`echo "$value" | sed -e 's/^[^:]*:[ ][ ]*//'` - case "$tag" in - Username) user="$item";; - UID) uid="$item";; - GID) gid="$item";; - HOME) home="$item";; - esac - ;; + case "$tag" in + Username) user="$item" ;; + UID) uid="$item" ;; + GID) gid="$item" ;; + HOME) home="$item" ;; + esac + ;; - $DIALOG_ESC) - echo "ESC pressed." - break - ;; + $DIALOG_ESC) + echo "ESC pressed." + break + ;; - esac + esac done diff --git a/contrib/dialog/samples/inputmenu1 b/contrib/dialog/samples/inputmenu1 index 4e9bae2..905c292 100755 --- a/contrib/dialog/samples/inputmenu1 +++ b/contrib/dialog/samples/inputmenu1 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: inputmenu1,v 1.8 2010/01/13 10:31:02 tom Exp $ +# $Id: inputmenu1,v 1.9 2012/07/01 00:59:54 tom Exp $ # # "inputmenu" rewritten into Bourne shell. @@ -58,7 +58,7 @@ exec 3>&- ;; $DIALOG_EXTRA) tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'` - item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'` + item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'` case "$tag" in Username) diff --git a/contrib/dialog/samples/inputmenu2 b/contrib/dialog/samples/inputmenu2 index f560aba..ecef674 100755 --- a/contrib/dialog/samples/inputmenu2 +++ b/contrib/dialog/samples/inputmenu2 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: inputmenu2,v 1.8 2010/01/13 10:32:04 tom Exp $ +# $Id: inputmenu2,v 1.9 2012/07/01 01:00:34 tom Exp $ # # "inputmenu1" with defaultitem, help-button. @@ -66,7 +66,7 @@ exec 3>&- ;; $DIALOG_EXTRA) tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'` - item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'` + item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'` case "$tag" in Username:) diff --git a/contrib/dialog/samples/inputmenu3 b/contrib/dialog/samples/inputmenu3 index e3250d8..4b9d522 100755 --- a/contrib/dialog/samples/inputmenu3 +++ b/contrib/dialog/samples/inputmenu3 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: inputmenu3,v 1.10 2010/01/13 10:32:51 tom Exp $ +# $Id: inputmenu3,v 1.11 2012/07/01 01:00:34 tom Exp $ # # "inputmenu1" with defaultitem, help-button and item-help. @@ -75,7 +75,7 @@ exec 3>&- ;; $DIALOG_EXTRA) tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'` - item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'` + item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'` case "$tag" in Username:) diff --git a/contrib/dialog/samples/inputmenu4 b/contrib/dialog/samples/inputmenu4 index a872527..6688c9c 100755 --- a/contrib/dialog/samples/inputmenu4 +++ b/contrib/dialog/samples/inputmenu4 @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: inputmenu4,v 1.8 2010/01/13 10:33:35 tom Exp $ +# $Id: inputmenu4,v 1.9 2012/07/01 01:00:34 tom Exp $ # # "inputmenu1" with a different label for the extra-button @@ -59,7 +59,7 @@ exec 3>&- ;; $DIALOG_EXTRA) tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'` - item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'` + item=`echo "$value" |sed -e 's/^[^:]*:[ ]*//' -e 's/[ ]*$//'` case "$tag" in Username) diff --git a/contrib/dialog/samples/killall b/contrib/dialog/samples/killall index 9d233f0..7030fe2 100755 --- a/contrib/dialog/samples/killall +++ b/contrib/dialog/samples/killall @@ -1,13 +1,16 @@ #! /bin/sh -# $Id: killall,v 1.2 2004/09/17 19:56:18 tom Exp $ +# $Id: killall,v 1.3 2012/06/29 09:39:19 tom Exp $ # Linux has a program that does this correctly. + +. ./setup-vars + for prog in $* do pid=`ps -a |fgrep $prog |fgrep -v fgrep|sed -e 's/^[ ]*//' -e 's/ .*//' ` if test -n "$pid" ; then echo killing pid=$pid, $prog - kill -1 $pid || \ - kill -15 $pid || \ - kill -9 $pid + kill -$SIG_HUP $pid || \ + kill -$SIG_TERM $pid || \ + kill -$SIG_KILL $pid fi done diff --git a/contrib/dialog/samples/prgbox b/contrib/dialog/samples/prgbox index 9170a36..c06a630 100755 --- a/contrib/dialog/samples/prgbox +++ b/contrib/dialog/samples/prgbox @@ -1,6 +1,9 @@ #!/bin/sh -# $Id: prgbox,v 1.1 2011/03/02 00:10:54 tom Exp $ +# $Id: prgbox,v 1.2 2012/07/02 09:46:24 tom Exp $ . ./setup-vars $DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist" 20 70 + +retval=$? +. ./report-button diff --git a/contrib/dialog/samples/prgbox2 b/contrib/dialog/samples/prgbox2 index 53f3daa..ba94622 100755 --- a/contrib/dialog/samples/prgbox2 +++ b/contrib/dialog/samples/prgbox2 @@ -1,6 +1,9 @@ #!/bin/sh -# $Id: prgbox2,v 1.1 2011/03/02 01:25:54 tom Exp $ +# $Id: prgbox2,v 1.2 2012/07/02 09:46:24 tom Exp $ . ./setup-vars $DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist 3" 20 70 + +retval=$? +. ./report-button diff --git a/contrib/dialog/samples/report-button b/contrib/dialog/samples/report-button index e13b03a..c6a1730 100644 --- a/contrib/dialog/samples/report-button +++ b/contrib/dialog/samples/report-button @@ -1,4 +1,5 @@ -# $Id: report-button,v 1.2 2010/01/13 09:59:14 tom Exp $ +#!/bin/sh +# $Id: report-button,v 1.3 2012/06/29 09:29:36 tom Exp $ # Report button-only, no $RESULT # vile:shmode diff --git a/contrib/dialog/samples/report-edit b/contrib/dialog/samples/report-edit index f17b6d3..37e3eb0 100644 --- a/contrib/dialog/samples/report-edit +++ b/contrib/dialog/samples/report-edit @@ -1,4 +1,5 @@ -# $Id: report-edit,v 1.3 2010/01/13 09:59:43 tom Exp $ +#!/bin/sh +# $Id: report-edit,v 1.4 2012/06/29 09:29:41 tom Exp $ # Report results from editing. # vile:shmode diff --git a/contrib/dialog/samples/report-string b/contrib/dialog/samples/report-string index a674517..dc96c2f 100644 --- a/contrib/dialog/samples/report-string +++ b/contrib/dialog/samples/report-string @@ -1,4 +1,5 @@ -# $Id: report-string,v 1.2 2010/01/13 10:00:11 tom Exp $ +#!/bin/sh +# $Id: report-string,v 1.3 2012/06/29 09:32:17 tom Exp $ # Report result passed in a string $RESULT # vile:shmode diff --git a/contrib/dialog/samples/report-tempfile b/contrib/dialog/samples/report-tempfile index 5a88d44..32c04e0 100644 --- a/contrib/dialog/samples/report-tempfile +++ b/contrib/dialog/samples/report-tempfile @@ -1,4 +1,5 @@ -# $Id: report-tempfile,v 1.3 2010/01/13 09:59:05 tom Exp $ +#!/bin/sh +# $Id: report-tempfile,v 1.4 2012/06/29 09:29:47 tom Exp $ # Report results in a temporary-file. # vile:shmode diff --git a/contrib/dialog/samples/report-yesno b/contrib/dialog/samples/report-yesno index 81da89b..d22ebe4 100644 --- a/contrib/dialog/samples/report-yesno +++ b/contrib/dialog/samples/report-yesno @@ -1,4 +1,5 @@ -# $Id: report-yesno,v 1.1 2010/01/13 10:40:14 tom Exp $ +#!/bin/sh +# $Id: report-yesno,v 1.2 2012/06/29 09:32:12 tom Exp $ # Report button-only, no $RESULT # vile:shmode diff --git a/contrib/dialog/samples/setup-edit b/contrib/dialog/samples/setup-edit index df86297..8f9d284 100644 --- a/contrib/dialog/samples/setup-edit +++ b/contrib/dialog/samples/setup-edit @@ -1,6 +1,7 @@ -# $Id: setup-edit,v 1.1 2010/01/13 01:56:07 tom Exp $ +#!/bin/sh +# $Id: setup-edit,v 1.2 2012/06/29 09:31:49 tom Exp $ # vile:shmode input=`tempfile 2>/dev/null` || input=/tmp/input$$ output=`tempfile 2>/dev/null` || output=/tmp/test$$ -trap "rm -f $input $output" 0 1 2 5 15 +trap "rm -f $input $output" $SIG_NONE $SIG_HUP $SIG_INT $SIG_TRAP $SIG_TERM diff --git a/contrib/dialog/samples/setup-tempfile b/contrib/dialog/samples/setup-tempfile index 6db551f..3a67ea6 100644 --- a/contrib/dialog/samples/setup-tempfile +++ b/contrib/dialog/samples/setup-tempfile @@ -1,5 +1,6 @@ -# $Id: setup-tempfile,v 1.1 2010/01/13 01:41:02 tom Exp $ +#!/bin/sh +# $Id: setup-tempfile,v 1.3 2012/07/06 17:51:56 tom Exp $ # vile:shmode -tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$ -trap "rm -f $tempfile" 0 1 2 5 15 +tempfile=`(tempfile) 2>/dev/null` || tempfile=/tmp/test$$ +trap "rm -f $tempfile" 0 $SIG_NONE $SIG_HUP $SIG_INT $SIG_TRAP $SIG_TERM diff --git a/contrib/dialog/samples/setup-utf8 b/contrib/dialog/samples/setup-utf8 index 2fd70d4..07cff39 100644 --- a/contrib/dialog/samples/setup-utf8 +++ b/contrib/dialog/samples/setup-utf8 @@ -1,4 +1,5 @@ -# $Id: setup-utf8,v 1.1 2010/01/13 01:51:44 tom Exp $ +#!/bin/sh +# $Id: setup-utf8,v 1.2 2012/06/29 09:50:32 tom Exp $ # vile:shmode case none"$LANG$LC_ALL$LC_CTYPE" in diff --git a/contrib/dialog/samples/setup-vars b/contrib/dialog/samples/setup-vars index ae5e725..f0ea779 100644 --- a/contrib/dialog/samples/setup-vars +++ b/contrib/dialog/samples/setup-vars @@ -1,4 +1,5 @@ -# $Id: setup-vars,v 1.2 2011/01/04 00:21:43 tom Exp $ +#!/bin/sh +# $Id: setup-vars,v 1.3 2012/06/29 09:52:26 tom Exp $ # vile:shmode # These symbols are defined to use in the sample shell scripts to make them @@ -13,3 +14,10 @@ : ${DIALOG_EXTRA=3} : ${DIALOG_ITEM_HELP=4} : ${DIALOG_ESC=255} + +: ${SIG_NONE=0} +: ${SIG_HUP=1} +: ${SIG_INT=2} +: ${SIG_QUIT=3} +: ${SIG_KILL=9} +: ${SIG_TERM=15} diff --git a/contrib/dialog/samples/slackware.rc b/contrib/dialog/samples/slackware.rc index 967147e..f12d27b 100644 --- a/contrib/dialog/samples/slackware.rc +++ b/contrib/dialog/samples/slackware.rc @@ -1,4 +1,4 @@ -# $Id: slackware.rc,v 1.7 2011/01/17 00:14:41 tom Exp $ +# $Id: slackware.rc,v 1.9 2011/10/15 01:00:25 tom Exp $ # vile:confmode # Run-time configuration file for dialog, matches Slackware color scheme. # @@ -46,16 +46,16 @@ border_color = (CYAN,CYAN,ON) button_active_color = (WHITE,BLUE,ON) # Inactive button color -button_inactive_color = (BLACK,CYAN,OFF) +button_inactive_color = dialog_color # Active button key color -button_key_active_color = (WHITE,BLUE,ON) +button_key_active_color = button_active_color # Inactive button key color button_key_inactive_color = (RED,CYAN,OFF) # Active button label color -button_label_active_color = (WHITE,BLUE,ON) +button_label_active_color = button_active_color # Inactive button label color button_label_inactive_color = (BLACK,CYAN,ON) @@ -64,47 +64,46 @@ button_label_inactive_color = (BLACK,CYAN,ON) inputbox_color = (BLUE,WHITE,OFF) # Input box border color -inputbox_border_color = (CYAN,CYAN,ON) +inputbox_border_color = border_color # Search box color searchbox_color = (YELLOW,WHITE,ON) # Search box title color -# FIXME searchbox_title_color = (WHITE,WHITE,ON) # Search box border color searchbox_border_color = (RED,WHITE,OFF) # File position indicator color -position_indicator_color = (RED,CYAN,OFF) +position_indicator_color = button_key_inactive_color # Menu box color -menubox_color = (BLACK,CYAN,OFF) +menubox_color = dialog_color # Menu box border color -menubox_border_color = (CYAN,CYAN,ON) +menubox_border_color = border_color # Item color -item_color = (BLACK,CYAN,OFF) +item_color = dialog_color # Selected item color -item_selected_color = (WHITE,BLUE,OFF) +item_selected_color = screen_color # Tag color -tag_color = (YELLOW,CYAN,ON) +tag_color = title_color # Selected tag color -tag_selected_color = (WHITE,BLUE,OFF) +tag_selected_color = screen_color # Tag key color -tag_key_color = (RED,CYAN,OFF) +tag_key_color = button_key_inactive_color # Selected tag key color tag_key_selected_color = (RED,BLUE,ON) # Check box color -check_color = (BLACK,CYAN,OFF) +check_color = dialog_color # Selected check box color check_selected_color = (WHITE,CYAN,ON) @@ -113,13 +112,13 @@ check_selected_color = (WHITE,CYAN,ON) uarrow_color = (GREEN,CYAN,ON) # Down arrow color -darrow_color = (GREEN,CYAN,ON) +darrow_color = uarrow_color # Item help-text color -itemhelp_color = (WHITE,BLACK,OFF) +itemhelp_color = shadow_color # Active form text color -form_active_text_color = (BLUE,WHITE,OFF) +form_active_text_color = inputbox_color # Form text color form_text_color = (CYAN,BLUE,ON) @@ -129,3 +128,15 @@ form_item_readonly_color = (CYAN,WHITE,ON) # Dialog box gauge color gauge_color = (BLUE,WHITE,ON) + +# Dialog box border2 color +border2_color = (BLACK,WHITE,OFF) + +# Input box border2 color +inputbox_border2_color = border2_color + +# Search box border2 color +searchbox_border2_color = border2_color + +# Menu box border2 color +menubox_border2_color = border2_color diff --git a/contrib/dialog/samples/sourcemage.rc b/contrib/dialog/samples/sourcemage.rc index 1ba826f..9384798 100644 --- a/contrib/dialog/samples/sourcemage.rc +++ b/contrib/dialog/samples/sourcemage.rc @@ -1,4 +1,4 @@ -# $Id: sourcemage.rc,v 1.4 2011/01/17 00:14:25 tom Exp $ +# $Id: sourcemage.rc,v 1.6 2011/10/15 01:00:41 tom Exp $ # vile:confmode # Run-time configuration file for dialog, matches SourceMage color scheme. # @@ -46,10 +46,10 @@ border_color = (WHITE,WHITE,ON) button_active_color = (WHITE,RED,ON) # Inactive button color -button_inactive_color = (BLACK,WHITE,OFF) +button_inactive_color = dialog_color # Active button key color -button_key_active_color = (WHITE,RED,ON) +button_key_active_color = button_active_color # Inactive button key color button_key_inactive_color = (RED,WHITE,OFF) @@ -61,70 +61,82 @@ button_label_active_color = (RED,RED,ON) button_label_inactive_color = (BLACK,WHITE,ON) # Input box color -inputbox_color = (BLACK,WHITE,OFF) +inputbox_color = dialog_color # Input box border color -inputbox_border_color = (BLACK,WHITE,OFF) +inputbox_border_color = dialog_color # Search box color -searchbox_color = (BLACK,WHITE,OFF) +searchbox_color = dialog_color # Search box title color -searchbox_title_color = (RED,WHITE,ON) +searchbox_title_color = title_color # Search box border color -searchbox_border_color = (WHITE,WHITE,ON) +searchbox_border_color = border_color # File position indicator color -position_indicator_color = (RED,WHITE,ON) +position_indicator_color = title_color # Menu box color -menubox_color = (BLACK,WHITE,OFF) +menubox_color = dialog_color # Menu box border color -menubox_border_color = (WHITE,WHITE,ON) +menubox_border_color = border_color # Item color -item_color = (BLACK,WHITE,OFF) +item_color = dialog_color # Selected item color -item_selected_color = (WHITE,RED,ON) +item_selected_color = button_active_color # Tag color -tag_color = (RED,WHITE,ON) +tag_color = title_color # Selected tag color -tag_selected_color = (RED,RED,ON) +tag_selected_color = button_label_active_color # Tag key color -tag_key_color = (RED,WHITE,ON) +tag_key_color = title_color # Selected tag key color -tag_key_selected_color = (WHITE,RED,ON) +tag_key_selected_color = button_active_color # Check box color -check_color = (BLACK,WHITE,OFF) +check_color = dialog_color # Selected check box color -check_selected_color = (WHITE,RED,ON) +check_selected_color = button_active_color # Up arrow color -uarrow_color = (RED,WHITE,ON) +uarrow_color = title_color # Down arrow color -darrow_color = (RED,WHITE,ON) +darrow_color = title_color # Item help-text color itemhelp_color = (WHITE,BLACK,OFF) # Active form text color -form_active_text_color = (BLACK,WHITE,OFF) +form_active_text_color = dialog_color # Form text color -form_text_color = (RED,BLACK,ON) +form_text_color = screen_color # Readonly form item color form_item_readonly_color = (CYAN,WHITE,ON) # Dialog box gauge color gauge_color = (BLUE,WHITE,ON) + +# Dialog box border2 color +border2_color = dialog_color + +# Input box border2 color +inputbox_border2_color = dialog_color + +# Search box border2 color +searchbox_border2_color = dialog_color + +# Menu box border2 color +menubox_border2_color = dialog_color diff --git a/contrib/dialog/samples/suse.rc b/contrib/dialog/samples/suse.rc index f2417b2..c8ff099 100644 --- a/contrib/dialog/samples/suse.rc +++ b/contrib/dialog/samples/suse.rc @@ -1,4 +1,4 @@ -# $Id: suse.rc,v 1.3 2011/01/17 00:15:27 tom Exp $ +# $Id: suse.rc,v 1.5 2011/10/15 01:01:00 tom Exp $ # vile:confmode # Run-time configuration file for dialog, matches SuSE color scheme. # @@ -46,10 +46,10 @@ border_color = (WHITE,WHITE,ON) button_active_color = (WHITE,BLUE,ON) # Inactive button color -button_inactive_color = (BLACK,WHITE,OFF) +button_inactive_color = dialog_color # Active button key color -button_key_active_color = (WHITE,BLUE,ON) +button_key_active_color = button_active_color # Inactive button key color button_key_inactive_color = (RED,WHITE,OFF) @@ -61,64 +61,64 @@ button_label_active_color = (YELLOW,BLUE,ON) button_label_inactive_color = (BLACK,WHITE,ON) # Input box color -inputbox_color = (BLACK,WHITE,OFF) +inputbox_color = dialog_color # Input box border color -inputbox_border_color = (BLACK,WHITE,OFF) +inputbox_border_color = dialog_color # Search box color -searchbox_color = (BLACK,WHITE,OFF) +searchbox_color = dialog_color # Search box title color -searchbox_title_color = (YELLOW,WHITE,ON) +searchbox_title_color = title_color # Search box border color -searchbox_border_color = (WHITE,WHITE,ON) +searchbox_border_color = border_color # File position indicator color -position_indicator_color = (YELLOW,WHITE,ON) +position_indicator_color = title_color # Menu box color -menubox_color = (BLACK,WHITE,OFF) +menubox_color = dialog_color # Menu box border color -menubox_border_color = (WHITE,WHITE,ON) +menubox_border_color = border_color # Item color -item_color = (BLACK,WHITE,OFF) +item_color = dialog_color # Selected item color -item_selected_color = (WHITE,BLUE,ON) +item_selected_color = button_active_color # Tag color -tag_color = (YELLOW,WHITE,ON) +tag_color = title_color # Selected tag color -tag_selected_color = (YELLOW,BLUE,ON) +tag_selected_color = button_label_active_color # Tag key color -tag_key_color = (RED,WHITE,OFF) +tag_key_color = button_key_inactive_color # Selected tag key color tag_key_selected_color = (RED,BLUE,ON) # Check box color -check_color = (BLACK,WHITE,OFF) +check_color = dialog_color # Selected check box color -check_selected_color = (WHITE,BLUE,ON) +check_selected_color = button_active_color # Up arrow color uarrow_color = (GREEN,WHITE,ON) # Down arrow color -darrow_color = (GREEN,WHITE,ON) +darrow_color = uarrow_color # Item help-text color itemhelp_color = (WHITE,BLACK,OFF) # Active form text color -form_active_text_color = (WHITE,BLUE,ON) +form_active_text_color = button_active_color # Form text color form_text_color = (WHITE,CYAN,ON) @@ -128,3 +128,15 @@ form_item_readonly_color = (CYAN,WHITE,ON) # Dialog box gauge color gauge_color = (BLUE,WHITE,ON) + +# Dialog box border2 color +border2_color = dialog_color + +# Input box border2 color +inputbox_border2_color = dialog_color + +# Search box border2 color +searchbox_border2_color = dialog_color + +# Menu box border2 color +menubox_border2_color = dialog_color diff --git a/contrib/dialog/samples/tailboxbg b/contrib/dialog/samples/tailboxbg index 957d774..bcc3434 100755 --- a/contrib/dialog/samples/tailboxbg +++ b/contrib/dialog/samples/tailboxbg @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: tailboxbg,v 1.9 2010/01/13 10:20:03 tom Exp $ +# $Id: tailboxbg,v 1.10 2012/06/29 09:48:28 tom Exp $ . ./setup-vars @@ -16,7 +16,7 @@ $DIALOG --title "TAIL BOX" \ sleep 10 # now kill it -kill -3 `cat $tempfile` 2>&1 >/dev/null 2>/dev/null +kill -$SIG_QUIT `cat $tempfile` 2>&1 >/dev/null 2>/dev/null # ...and the process that is making the listing ./killall listing diff --git a/contrib/dialog/samples/tailboxbg1 b/contrib/dialog/samples/tailboxbg1 index 2955ad0..f04567a 100755 --- a/contrib/dialog/samples/tailboxbg1 +++ b/contrib/dialog/samples/tailboxbg1 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: tailboxbg1,v 1.9 2010/01/13 10:20:03 tom Exp $ +# $Id: tailboxbg1,v 1.10 2012/06/29 09:51:46 tom Exp $ . ./setup-vars @@ -24,7 +24,7 @@ if test -n "$pid" ; then sleep 10 # now kill it -kill -3 $pid 2>&1 >/dev/null 2>/dev/null +kill -$SIG_QUIT $pid 2>&1 >/dev/null 2>/dev/null echo "killed [$pid]" fi diff --git a/contrib/dialog/samples/tailboxbg2 b/contrib/dialog/samples/tailboxbg2 index 0617708..628cb05 100755 --- a/contrib/dialog/samples/tailboxbg2 +++ b/contrib/dialog/samples/tailboxbg2 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: tailboxbg2,v 1.9 2010/01/13 10:20:03 tom Exp $ +# $Id: tailboxbg2,v 1.10 2012/06/29 09:51:11 tom Exp $ . ./setup-vars @@ -25,7 +25,7 @@ if test -n "$pid" ; then sleep 10 # now kill it -kill -3 $pid 2>&1 >/dev/null 2>/dev/null +kill -$SIG_QUIT $pid 2>&1 >/dev/null 2>/dev/null echo "killed [$pid]" fi diff --git a/contrib/dialog/samples/testdata-8bit b/contrib/dialog/samples/testdata-8bit index 7810f9e..f09021d 100755 --- a/contrib/dialog/samples/testdata-8bit +++ b/contrib/dialog/samples/testdata-8bit @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: testdata-8bit,v 1.1 2004/12/19 16:19:12 tom Exp $ +# $Id: testdata-8bit,v 1.2 2011/10/16 23:26:32 tom Exp $ # Select one of the "SAMPLE=" lines, to test handling of characters which # are nonprinting in a POSIX locale: @@ -37,3 +37,12 @@ case .$1 in SAMPLE=" " ;; esac + +# This script is source'd from other scripts, and uses the parameter list from +# those explicitly. But they may use the parameter list later, to set options +# specially for dialog. Work around the conflicting uses by removing the +# parameter which we just used to select a set of data. +if test $# != 0 +then + shift 1 +fi diff --git a/contrib/dialog/samples/valgrind.log b/contrib/dialog/samples/valgrind.log deleted file mode 100644 index f33b862..0000000 --- a/contrib/dialog/samples/valgrind.log +++ /dev/null @@ -1,847 +0,0 @@ -==23273== Memcheck, a memory error detector. -==23273== Copyright (C) 2002-2007, and GNU GPL'd, by Julian Seward et al. -==23273== Using LibVEX rev 1854, a library for dynamic binary translation. -==23273== Copyright (C) 2004-2007, and GNU GPL'd, by OpenWorks LLP. -==23273== Using valgrind-3.3.1-Debian, a dynamic binary instrumentation framework. -==23273== Copyright (C) 2000-2007, and GNU GPL'd, by Julian Seward et al. -==23273== ---23273-- Command line ---23273-- /usr/build/dialog/dialog-1.1-20110707/dialog ---23273-- --title ---23273-- YES/NO BOX ---23273-- --clear ---23273-- --yesno ---23273-- Hi, this is a yes/no dialog box. You can use this to ask questions that have an answer of either yes or no. BTW, do you notice that long lines will be automatically wrapped around so that they can fit in the box? You can also control line breaking explicitly by inserting 'backslash n' at any place you like, but in this case, auto wrap around will be disabled and you will have to control line breaking yourself. ---23273-- 15 ---23273-- 61 ---23273-- Startup, with flags: ---23273-- --suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp ---23273-- -v ---23273-- --num-callers=10 ---23273-- --error-limit=no ---23273-- --show-reachable=yes ---23273-- --leak-resolution=high ---23273-- --leak-check=yes ---23273-- --show-reachable=yes ---23273-- --log-fd=2 ---23273-- Contents of /proc/version: ---23273-- Linux version 2.6.26-2-686 (Debian 2.6.26-26lenny3) (dannf@debian.org) (gcc version 4.1.3 20080704 (prerelease) (Debian 4.1.2-25)) #1 SMP Sat Jun 11 14:54:10 UTC 2011 ---23273-- Arch and hwcaps: X86, x86-sse1-sse2 ---23273-- Page sizes: currently 4096, max supported 4096 ---23273-- Valgrind library directory: /usr/lib/valgrind ---23273-- Reading syms from /lib/ld-2.7.so (0x4000000) ---23273-- Reading debug info from /lib/ld-2.7.so... ---23273-- ... CRC mismatch (computed 0f4d8d49 wanted a869dbba) ---23273-- Reading debug info from /usr/lib/debug/lib/ld-2.7.so... ---23273-- Reading syms from /usr/build/dialog/dialog-1.1-20110707/dialog (0x8048000) ---23273-- Reading syms from /usr/lib/valgrind/x86-linux/memcheck (0x38000000) ---23273-- object doesn't have a dynamic symbol table ---23273-- Reading suppressions file: /usr/lib/valgrind/debian-libc6-dbg.supp ---23273-- Reading suppressions file: /usr/lib/valgrind/default.supp ---23273-- REDIR: 0x4015500 (index) redirected to 0x3802cf43 (vgPlain_x86_linux_REDIR_FOR_index) ---23273-- Reading syms from /usr/lib/valgrind/x86-linux/vgpreload_core.so (0x401E000) ---23273-- Reading syms from /usr/lib/valgrind/x86-linux/vgpreload_memcheck.so (0x4020000) -==23273== WARNING: new redirection conflicts with existing -- ignoring it ---23273-- new: 0x04015500 (index ) R-> 0x040241e0 index ---23273-- REDIR: 0x40156f0 (strlen) redirected to 0x4024490 (strlen) ---23273-- Reading syms from /usr/lib/debug/libm-2.7.so (0x4027000) ---23273-- Reading syms from /usr/lib/debug/libc-2.7.so (0x404D000) ---23273-- REDIR: 0x40beaf0 (rindex) redirected to 0x40240c0 (rindex) ---23273-- REDIR: 0x40bf760 (memset) redirected to 0x4025380 (memset) ---23273-- REDIR: 0x40be160 (strcmp) redirected to 0x4024770 (strcmp) ---23273-- REDIR: 0x40be700 (strlen) redirected to 0x4024470 (strlen) ---23273-- REDIR: 0x40be910 (strncmp) redirected to 0x40246e0 (strncmp) ---23273-- REDIR: 0x40bdff0 (index) redirected to 0x40241b0 (index) ---23273-- REDIR: 0x40b9740 (free) redirected to 0x4022ad0 (free) ---23273-- REDIR: 0x40bb2c0 (calloc) redirected to 0x4021d60 (calloc) ---23273-- REDIR: 0x40c07e0 (strchrnul) redirected to 0x4025450 (strchrnul) ---23273-- REDIR: 0x40bb5e0 (malloc) redirected to 0x4023cb0 (malloc) ---23273-- REDIR: 0x40bfc80 (memcpy) redirected to 0x40248e0 (memcpy) ---23273-- REDIR: 0x40be7b0 (strnlen) redirected to 0x4024430 (strnlen) ---23273-- REDIR: 0x40bf7c0 (mempcpy) redirected to 0x40254b0 (mempcpy) ---23273-- REDIR: 0x40be1f0 (strcpy) redirected to 0x40244d0 (strcpy) ---23273-- REDIR: 0x40bba60 (realloc) redirected to 0x4023dc0 (realloc) ---23273-- REDIR: 0x40bea20 (strncpy) redirected to 0x40245a0 (strncpy) ---23273-- REDIR: 0x40bf690 (bcmp) redirected to 0x4025070 (bcmp) ---23273-- REDIR: 0x40bde40 (strcat) redirected to 0x4024240 (strcat) -==23273== -==23273== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 14 from 1) ---23273-- ---23273-- supp: 14 dl-hack3-cond-1 -==23273== malloc/free: in use at exit: 72,482 bytes in 382 blocks. -==23273== malloc/free: 419 allocs, 37 frees, 79,695 bytes allocated. -==23273== -==23273== searching for pointers to 382 not-freed blocks. -==23273== checked 149,580 bytes. -==23273== -==23273== 6 bytes in 1 blocks are still reachable in loss record 1 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FEE7: dlg_index_wchars (inputstr.c:342) -==23273== by 0x8059BBE: print_button (buttons.c:97) -==23273== by 0x805A265: dlg_draw_buttons (buttons.c:297) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 6 bytes in 1 blocks are still reachable in loss record 2 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x805A1F3: dlg_draw_buttons (buttons.c:296) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 7 bytes in 2 blocks are still reachable in loss record 3 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8059E3A: dlg_button_sizes (buttons.c:179) -==23273== by 0x8059F04: dlg_button_x_step (buttons.c:209) -==23273== by 0x805A02F: dlg_button_layout (buttons.c:234) -==23273== by 0x806A11F: dialog_yesno (yesno.c:71) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 11 bytes in 1 blocks are still reachable in loss record 4 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8067711: real_auto_size (util.c:1101) -==23273== by 0x8067A1F: dlg_auto_size (util.c:1167) -==23273== by 0x806A14E: dialog_yesno (yesno.c:72) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 12 bytes in 1 blocks are still reachable in loss record 5 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x807F18F: _nc_add_to_try (add_tries.c:90) -==23273== by 0x80885C6: _nc_init_keytry (init_keytry.c:74) -==23273== by 0x80807F4: _nc_keypad (lib_options.c:262) -==23273== by 0x808035F: keypad (lib_options.c:129) -==23273== by 0x8066340: init_dialog (util.c:330) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 16 bytes in 1 blocks are still reachable in loss record 6 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8066FD3: dlg_print_scrolled (util.c:886) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 16 bytes in 1 blocks are still reachable in loss record 7 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FECD: dlg_index_wchars (inputstr.c:341) -==23273== by 0x8059BBE: print_button (buttons.c:97) -==23273== by 0x805A265: dlg_draw_buttons (buttons.c:297) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 16 bytes in 1 blocks are still reachable in loss record 8 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x805A1F3: dlg_draw_buttons (buttons.c:296) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 16 bytes in 1 blocks are still reachable in loss record 9 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8067711: real_auto_size (util.c:1101) -==23273== by 0x8067A1F: dlg_auto_size (util.c:1167) -==23273== by 0x806A14E: dialog_yesno (yesno.c:72) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 16 bytes in 1 blocks are still reachable in loss record 10 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x807F2D5: _nc_doalloc (doalloc.c:55) -==23273== by 0x8086167: _nc_trace_alloc (trace_buf.c:55) -==23273== by 0x8086261: _nc_trace_buf (trace_buf.c:90) -==23273== by 0x80864A7: _nc_visbuf2n (visbuf.c:94) -==23273== by 0x8086538: _nc_visbuf2 (visbuf.c:114) -==23273== by 0x8086553: _nc_visbuf (visbuf.c:120) -==23273== by 0x8088693: recur_tries (trace_tries.c:55) -==23273== by 0x80886D7: recur_tries (trace_tries.c:59) -==23273== by 0x80886D7: recur_tries (trace_tries.c:59) -==23273== -==23273== -==23273== 21 bytes in 1 blocks are still reachable in loss record 11 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x40BE45F: strdup (strdup.c:43) -==23273== by 0x8081EE0: setupterm (lib_setup.c:471) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 23 bytes in 1 blocks are still reachable in loss record 12 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8088526: _nc_home_terminfo (home_terminfo.c:57) -==23273== by 0x8085E1B: _nc_read_entry (read_entry.c:492) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 24 bytes in 1 blocks are still reachable in loss record 13 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FEE7: dlg_index_wchars (inputstr.c:342) -==23273== by 0x8059BBE: print_button (buttons.c:97) -==23273== by 0x805A265: dlg_draw_buttons (buttons.c:297) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 24 bytes in 1 blocks are still reachable in loss record 14 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x805A1F3: dlg_draw_buttons (buttons.c:296) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 28 bytes in 1 blocks are still reachable in loss record 15 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8066FD3: dlg_print_scrolled (util.c:886) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 28 bytes in 1 blocks are still reachable in loss record 16 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FECD: dlg_index_wchars (inputstr.c:341) -==23273== by 0x8059BBE: print_button (buttons.c:97) -==23273== by 0x805A265: dlg_draw_buttons (buttons.c:297) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 28 bytes in 1 blocks are still reachable in loss record 17 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x805A1F3: dlg_draw_buttons (buttons.c:296) -==23273== by 0x806A2D0: dialog_yesno (yesno.c:98) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 28 bytes in 1 blocks are still reachable in loss record 18 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8067711: real_auto_size (util.c:1101) -==23273== by 0x8067A1F: dlg_auto_size (util.c:1167) -==23273== by 0x806A14E: dialog_yesno (yesno.c:72) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 28 bytes in 2 blocks are still reachable in loss record 19 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8059E3A: dlg_button_sizes (buttons.c:179) -==23273== by 0x8059F04: dlg_button_x_step (buttons.c:209) -==23273== by 0x805A02F: dlg_button_layout (buttons.c:234) -==23273== by 0x806A11F: dialog_yesno (yesno.c:71) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 32 bytes in 2 blocks are still reachable in loss record 20 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8059E3A: dlg_button_sizes (buttons.c:179) -==23273== by 0x8059F04: dlg_button_x_step (buttons.c:209) -==23273== by 0x805A02F: dlg_button_layout (buttons.c:234) -==23273== by 0x806A11F: dialog_yesno (yesno.c:71) -==23273== -==23273== -==23273== 33 bytes in 1 blocks are still reachable in loss record 21 of 62 -==23273== at 0x4023E8C: realloc (vg_replace_malloc.c:429) -==23273== by 0x807F2A9: _nc_doalloc (doalloc.c:50) -==23273== by 0x808620A: _nc_trace_alloc (trace_buf.c:63) -==23273== by 0x8086261: _nc_trace_buf (trace_buf.c:90) -==23273== by 0x80864A7: _nc_visbuf2n (visbuf.c:94) -==23273== by 0x8086538: _nc_visbuf2 (visbuf.c:114) -==23273== by 0x8086553: _nc_visbuf (visbuf.c:120) -==23273== by 0x8088693: recur_tries (trace_tries.c:55) -==23273== by 0x80886D7: recur_tries (trace_tries.c:59) -==23273== by 0x80886D7: recur_tries (trace_tries.c:59) -==23273== -==23273== -==23273== 44 bytes in 1 blocks are still reachable in loss record 22 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8067711: real_auto_size (util.c:1101) -==23273== by 0x8067A1F: dlg_auto_size (util.c:1167) -==23273== by 0x806A14E: dialog_yesno (yesno.c:72) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 47 bytes in 1 blocks are still reachable in loss record 23 of 62 -==23273== at 0x4023E8C: realloc (vg_replace_malloc.c:429) -==23273== by 0x807F2A9: _nc_doalloc (doalloc.c:50) -==23273== by 0x8085368: read_termtype (read_entry.c:283) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== -==23273== -==23273== 55 bytes in 1 blocks are still reachable in loss record 24 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8084EC3: read_termtype (read_entry.c:207) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== -==23273== -==23273== 56 bytes in 2 blocks are still reachable in loss record 25 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8059E3A: dlg_button_sizes (buttons.c:179) -==23273== by 0x8059F04: dlg_button_x_step (buttons.c:209) -==23273== by 0x805A02F: dlg_button_layout (buttons.c:234) -==23273== by 0x806A11F: dialog_yesno (yesno.c:71) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 66 bytes in 1 blocks are still reachable in loss record 26 of 62 -==23273== at 0x4023E8C: realloc (vg_replace_malloc.c:429) -==23273== by 0x807F2A9: _nc_doalloc (doalloc.c:50) -==23273== by 0x808238C: get_space (lib_tparm.c:155) -==23273== by 0x8082443: save_number (lib_tparm.c:180) -==23273== by 0x8082D8B: tparam_internal (lib_tparm.c:564) -==23273== by 0x80833C4: tparm (lib_tparm.c:788) -==23273== by 0x80704CF: _nc_mvcur_init (lib_mvcur.c:358) -==23273== by 0x8072684: newterm (lib_newterm.c:191) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== -==23273== -==23273== 80 bytes in 1 blocks are still reachable in loss record 27 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8072E08: _nc_makenew (lib_newwin.c:218) -==23273== by 0x807299B: newwin (lib_newwin.c:126) -==23273== by 0x8074F9A: _nc_setupscreen (lib_set_term.c:459) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 80 bytes in 1 blocks are still reachable in loss record 28 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8072E08: _nc_makenew (lib_newwin.c:218) -==23273== by 0x807299B: newwin (lib_newwin.c:126) -==23273== by 0x8074CB3: _nc_setupscreen (lib_set_term.c:414) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 80 bytes in 1 blocks are still reachable in loss record 29 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8072E08: _nc_makenew (lib_newwin.c:218) -==23273== by 0x807299B: newwin (lib_newwin.c:126) -==23273== by 0x8074C55: _nc_setupscreen (lib_set_term.c:410) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 80 bytes in 1 blocks are still reachable in loss record 30 of 62 -==23273== at 0x4023E8C: realloc (vg_replace_malloc.c:429) -==23273== by 0x807F2A9: _nc_doalloc (doalloc.c:50) -==23273== by 0x808538F: read_termtype (read_entry.c:284) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== -==23273== -==23273== 112 bytes in 7 blocks are still reachable in loss record 31 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8066A0A: dlg_print_line (util.c:668) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== -==23273== -==23273== 118 bytes in 1 blocks are still reachable in loss record 32 of 62 -==23273== at 0x4023E8C: realloc (vg_replace_malloc.c:429) -==23273== by 0x807F2A9: _nc_doalloc (doalloc.c:50) -==23273== by 0x8082957: _nc_tparm_analyze (lib_tparm.c:374) -==23273== by 0x8082B5E: tparam_internal (lib_tparm.c:502) -==23273== by 0x80833C4: tparm (lib_tparm.c:788) -==23273== by 0x80782E6: vidputs (lib_vidattr.c:187) -==23273== by 0x8078B59: vidattr (lib_vidattr.c:270) -==23273== by 0x807ACE8: ClrToEOS (tty_update.c:957) -==23273== by 0x807AF54: ClrBottom (tty_update.c:1006) -==23273== by 0x807AB1C: ClrUpdate (tty_update.c:897) -==23273== -==23273== -==23273== 128 bytes in 8 blocks are still reachable in loss record 33 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x41165D0: tsearch (tsearch.c:281) -==23273== by 0x805FC92: make_cache (inputstr.c:149) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FECD: dlg_index_wchars (inputstr.c:341) -==23273== by 0x8066A18: dlg_print_line (util.c:669) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== -==23273== -==23273== 128 bytes in 1 blocks are still reachable in loss record 34 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x806BDE0: start_color (lib_color.c:238) -==23273== by 0x80663B1: dlg_color_setup (util.c:360) -==23273== by 0x806638E: init_dialog (util.c:342) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 128 bytes in 1 blocks are still reachable in loss record 35 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x806BDA7: start_color (lib_color.c:236) -==23273== by 0x80663B1: dlg_color_setup (util.c:360) -==23273== by 0x806638E: init_dialog (util.c:342) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 160 bytes in 1 blocks are still reachable in loss record 36 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8087176: _nc_hash_map (hashmap.c:299) -==23273== by 0x80865F4: _nc_scroll_optimize (hardscroll.c:199) -==23273== by 0x807A762: doupdate (tty_update.c:778) -==23273== by 0x8073C0A: wrefresh (lib_refresh.c:58) -==23273== by 0x806D95D: _nc_wgetch (lib_getch.c:295) -==23273== by 0x806DD0D: wgetch (lib_getch.c:467) -==23273== by 0x80654FC: really_getch (ui_getc.c:352) -==23273== by 0x806566B: dlg_getc (ui_getc.c:423) -==23273== by 0x80627C4: mouse_wgetch (mousewget.c:35) -==23273== -==23273== -==23273== 160 bytes in 1 blocks are still reachable in loss record 37 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8087141: _nc_hash_map (hashmap.c:297) -==23273== by 0x80865F4: _nc_scroll_optimize (hardscroll.c:199) -==23273== by 0x807A762: doupdate (tty_update.c:778) -==23273== by 0x8073C0A: wrefresh (lib_refresh.c:58) -==23273== by 0x806D95D: _nc_wgetch (lib_getch.c:295) -==23273== by 0x806DD0D: wgetch (lib_getch.c:467) -==23273== by 0x80654FC: really_getch (ui_getc.c:352) -==23273== by 0x806566B: dlg_getc (ui_getc.c:423) -==23273== by 0x80627C4: mouse_wgetch (mousewget.c:35) -==23273== -==23273== -==23273== 160 bytes in 1 blocks are still reachable in loss record 38 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x807F2D5: _nc_doalloc (doalloc.c:55) -==23273== by 0x80865CB: _nc_scroll_optimize (hardscroll.c:192) -==23273== by 0x807A762: doupdate (tty_update.c:778) -==23273== by 0x8073C0A: wrefresh (lib_refresh.c:58) -==23273== by 0x806D95D: _nc_wgetch (lib_getch.c:295) -==23273== by 0x806DD0D: wgetch (lib_getch.c:467) -==23273== by 0x80654FC: really_getch (ui_getc.c:352) -==23273== by 0x806566B: dlg_getc (ui_getc.c:423) -==23273== by 0x80627C4: mouse_wgetch (mousewget.c:35) -==23273== -==23273== -==23273== 172 bytes in 1 blocks are still reachable in loss record 39 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8081CD7: setupterm (lib_setup.c:431) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 196 bytes in 7 blocks are still reachable in loss record 40 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FFB4: dlg_index_columns (inputstr.c:396) -==23273== by 0x8066A0A: dlg_print_line (util.c:668) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 224 bytes in 8 blocks are still reachable in loss record 41 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x805FC0F: make_cache (inputstr.c:139) -==23273== by 0x805FCF7: load_cache (inputstr.c:161) -==23273== by 0x805FECD: dlg_index_wchars (inputstr.c:341) -==23273== by 0x8066A18: dlg_print_line (util.c:669) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 252 bytes in 1 blocks are still reachable in loss record 42 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x80858B3: read_termtype (read_entry.c:345) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== -==23273== -==23273== 421 bytes in 1 blocks are still reachable in loss record 43 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8066FD3: dlg_print_scrolled (util.c:886) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 480 bytes in 1 blocks are still reachable in loss record 44 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8072E36: _nc_makenew (lib_newwin.c:223) -==23273== by 0x807299B: newwin (lib_newwin.c:126) -==23273== by 0x8074F9A: _nc_setupscreen (lib_set_term.c:459) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 480 bytes in 1 blocks are still reachable in loss record 45 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8072E36: _nc_makenew (lib_newwin.c:223) -==23273== by 0x807299B: newwin (lib_newwin.c:126) -==23273== by 0x8074CB3: _nc_setupscreen (lib_set_term.c:414) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 480 bytes in 1 blocks are still reachable in loss record 46 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x8072E36: _nc_makenew (lib_newwin.c:223) -==23273== by 0x807299B: newwin (lib_newwin.c:126) -==23273== by 0x8074C55: _nc_setupscreen (lib_set_term.c:410) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 689 bytes in 1 blocks are still reachable in loss record 47 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8085659: read_termtype (read_entry.c:318) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== -==23273== -==23273== 780 bytes in 65 blocks are still reachable in loss record 48 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x807F1FF: _nc_add_to_try (add_tries.c:104) -==23273== by 0x80885C6: _nc_init_keytry (init_keytry.c:74) -==23273== by 0x80807F4: _nc_keypad (lib_options.c:262) -==23273== by 0x808035F: keypad (lib_options.c:129) -==23273== by 0x8066340: init_dialog (util.c:330) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 1,008 bytes in 84 blocks are still reachable in loss record 49 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x807F119: _nc_add_to_try (add_tries.c:77) -==23273== by 0x80885C6: _nc_init_keytry (init_keytry.c:74) -==23273== by 0x80807F4: _nc_keypad (lib_options.c:262) -==23273== by 0x808035F: keypad (lib_options.c:129) -==23273== by 0x8066340: init_dialog (util.c:330) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 1,338 bytes in 1 blocks are still reachable in loss record 50 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8084DF7: read_termtype (read_entry.c:193) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== -==23273== -==23273== 1,382 bytes in 7 blocks are still reachable in loss record 51 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8066A0A: dlg_print_line (util.c:668) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 1,520 bytes in 1 blocks are still reachable in loss record 52 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x80747CF: _nc_setupscreen (lib_set_term.c:221) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 1,640 bytes in 1 blocks are still reachable in loss record 53 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8087007: _nc_hash_map (hashmap.c:277) -==23273== by 0x80865F4: _nc_scroll_optimize (hardscroll.c:199) -==23273== by 0x807A762: doupdate (tty_update.c:778) -==23273== by 0x8073C0A: wrefresh (lib_refresh.c:58) -==23273== by 0x806D95D: _nc_wgetch (lib_getch.c:295) -==23273== by 0x806DD0D: wgetch (lib_getch.c:467) -==23273== by 0x80654FC: really_getch (ui_getc.c:352) -==23273== by 0x806566B: dlg_getc (ui_getc.c:423) -==23273== by 0x80627C4: mouse_wgetch (mousewget.c:35) -==23273== -==23273== -==23273== 1,684 bytes in 1 blocks are still reachable in loss record 54 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8060166: dlg_count_columns (inputstr.c:473) -==23273== by 0x8066FD3: dlg_print_scrolled (util.c:886) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 1,803 bytes in 8 blocks are still reachable in loss record 55 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8068E64: dlg_strclone (util.c:1740) -==23273== by 0x805FE72: same_cache2 (inputstr.c:212) -==23273== by 0x805FEE7: dlg_index_wchars (inputstr.c:342) -==23273== by 0x8066A18: dlg_print_line (util.c:669) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== -==23273== -==23273== 1,892 bytes in 1 blocks are still reachable in loss record 56 of 62 -==23273== at 0x4023E8C: realloc (vg_replace_malloc.c:429) -==23273== by 0x807F2A9: _nc_doalloc (doalloc.c:50) -==23273== by 0x80853BA: read_termtype (read_entry.c:285) -==23273== by 0x8085B64: _nc_read_file_entry (read_entry.c:392) -==23273== by 0x8085BF5: _nc_read_tic_entry (read_entry.c:413) -==23273== by 0x8085C8A: _nc_read_terminfo_dirs (read_entry.c:438) -==23273== by 0x8085E90: _nc_read_entry (read_entry.c:500) -==23273== by 0x8081834: grab_entry (lib_setup.c:255) -==23273== by 0x8081D46: setupterm (lib_setup.c:438) -==23273== by 0x8072292: newterm (lib_newterm.c:115) -==23273== -==23273== -==23273== 2,800 bytes in 1 blocks are still reachable in loss record 57 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x8085F59: _nc_set_buffer (setbuf.c:119) -==23273== by 0x807481F: _nc_setupscreen (lib_set_term.c:232) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 5,528 bytes in 7 blocks are still reachable in loss record 58 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FFCE: dlg_index_columns (inputstr.c:397) -==23273== by 0x8066A0A: dlg_print_line (util.c:668) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 7,212 bytes in 8 blocks are still reachable in loss record 59 of 62 -==23273== at 0x4023D6E: malloc (vg_replace_malloc.c:207) -==23273== by 0x805FDE1: same_cache2 (inputstr.c:201) -==23273== by 0x805FEE7: dlg_index_wchars (inputstr.c:342) -==23273== by 0x8066A18: dlg_print_line (util.c:669) -==23273== by 0x8066E40: justify_text (util.c:813) -==23273== by 0x8066F5E: dlg_print_autowrap (util.c:843) -==23273== by 0x806703E: dlg_print_scrolled (util.c:892) -==23273== by 0x806A30C: dialog_yesno (yesno.c:104) -==23273== by 0x804A728: call_yesno (dialog.c:600) -==23273== by 0x804CC56: main (dialog.c:1679) -==23273== -==23273== -==23273== 12,800 bytes in 40 blocks are still reachable in loss record 60 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x80729EC: newwin (lib_newwin.c:130) -==23273== by 0x8074F9A: _nc_setupscreen (lib_set_term.c:459) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 12,800 bytes in 40 blocks are still reachable in loss record 61 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x80729EC: newwin (lib_newwin.c:130) -==23273== by 0x8074CB3: _nc_setupscreen (lib_set_term.c:414) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== -==23273== 12,800 bytes in 40 blocks are still reachable in loss record 62 of 62 -==23273== at 0x4021E22: calloc (vg_replace_malloc.c:397) -==23273== by 0x80729EC: newwin (lib_newwin.c:130) -==23273== by 0x8074C55: _nc_setupscreen (lib_set_term.c:410) -==23273== by 0x80723F1: newterm (lib_newterm.c:146) -==23273== by 0x806E82C: initscr (lib_initscr.c:83) -==23273== by 0x8066211: init_dialog (util.c:292) -==23273== by 0x804C880: main (dialog.c:1604) -==23273== -==23273== LEAK SUMMARY: -==23273== definitely lost: 0 bytes in 0 blocks. -==23273== possibly lost: 0 bytes in 0 blocks. -==23273== still reachable: 72,482 bytes in 382 blocks. -==23273== suppressed: 0 bytes in 0 blocks. ---23273-- memcheck: sanity checks: 8 cheap, 2 expensive ---23273-- memcheck: auxmaps: 0 auxmap entries (0k, 0M) in use ---23273-- memcheck: auxmaps_L1: 0 searches, 0 cmps, ratio 0:10 ---23273-- memcheck: auxmaps_L2: 0 searches, 0 nodes ---23273-- memcheck: SMs: n_issued = 11 (176k, 0M) ---23273-- memcheck: SMs: n_deissued = 0 (0k, 0M) ---23273-- memcheck: SMs: max_noaccess = 65535 (1048560k, 1023M) ---23273-- memcheck: SMs: max_undefined = 0 (0k, 0M) ---23273-- memcheck: SMs: max_defined = 25 (400k, 0M) ---23273-- memcheck: SMs: max_non_DSM = 11 (176k, 0M) ---23273-- memcheck: max sec V bit nodes: 21 (1k, 0M) ---23273-- memcheck: set_sec_vbits8 calls: 130 (new: 21, updates: 109) ---23273-- memcheck: max shadow mem size: 481k, 0M ---23273-- translate: fast SP updates identified: 4,767 ( 83.0%) ---23273-- translate: generic_known SP updates identified: 612 ( 10.6%) ---23273-- translate: generic_unknown SP updates identified: 358 ( 6.2%) ---23273-- tt/tc: 11,509 tt lookups requiring 11,938 probes ---23273-- tt/tc: 11,509 fast-cache updates, 3 flushes ---23273-- transtab: new 5,099 (117,852 -> 1,563,594; ratio 132:10) [0 scs] ---23273-- transtab: dumped 0 (0 -> ??) ---23273-- transtab: discarded 9 (222 -> ??) ---23273-- scheduler: 864,676 jumps (bb entries). ---23273-- scheduler: 8/7,086 major/minor sched events. ---23273-- sanity: 9 cheap, 2 expensive checks. ---23273-- exectx: 769 lists, 102 contexts (avg 0 per list) ---23273-- exectx: 470 searches, 372 full compares (791 per 1000) ---23273-- exectx: 0 cmp2, 36 cmp4, 2,470 cmpAll ---23273-- errormgr: 69 supplist searches, 5,672 comparisons during search ---23273-- errormgr: 14 errlist searches, 36 comparisons during search diff --git a/contrib/dialog/samples/wheel b/contrib/dialog/samples/wheel index ff75f71..4adef26 100755 --- a/contrib/dialog/samples/wheel +++ b/contrib/dialog/samples/wheel @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: wheel,v 1.7 2010/01/13 01:44:12 tom Exp $ +# $Id: wheel,v 1.8 2012/06/29 09:59:40 tom Exp $ . ./setup-vars @@ -17,10 +17,10 @@ COLS=`expr $COLS - 30` # Takes an integer, multiplies it for COLS, divides for 132 scalex() { - echo $[$1*$COLS/132] + expr $1 \* $COLS / 132 } scaley() { - echo $[$1*$ROWS/60] + expr $1 \* $ROWS / 60 } $DIALOG --backtitle "$TITLE" --no-shadow \ diff --git a/contrib/dialog/samples/whiptail.rc b/contrib/dialog/samples/whiptail.rc index 8515012..b12e687 100644 --- a/contrib/dialog/samples/whiptail.rc +++ b/contrib/dialog/samples/whiptail.rc @@ -1,4 +1,4 @@ -# $Id: whiptail.rc,v 1.3 2011/01/17 00:15:54 tom Exp $ +# $Id: whiptail.rc,v 1.5 2011/10/15 01:01:16 tom Exp $ # vile:confmode # Run-time configuration file for dialog, matches whiptail's color scheme. # @@ -46,79 +46,79 @@ border_color = (WHITE,WHITE,ON) button_active_color = (WHITE,RED,ON) # Inactive button color -button_inactive_color = (BLACK,WHITE,OFF) +button_inactive_color = dialog_color # Active button key color -button_key_active_color = (WHITE,RED,ON) +button_key_active_color = button_active_color # Inactive button key color -button_key_inactive_color = (BLACK,WHITE,OFF) +button_key_inactive_color = dialog_color # Active button label color -button_label_active_color = (WHITE,RED,ON) +button_label_active_color = button_active_color # Inactive button label color button_label_inactive_color = (BLACK,WHITE,ON) # Input box color -inputbox_color = (BLACK,WHITE,OFF) +inputbox_color = dialog_color # Input box border color -inputbox_border_color = (BLACK,WHITE,OFF) +inputbox_border_color = dialog_color # Search box color -searchbox_color = (BLACK,WHITE,OFF) +searchbox_color = dialog_color # Search box title color -searchbox_title_color = (RED,WHITE,ON) +searchbox_title_color = title_color # Search box border color -searchbox_border_color = (WHITE,WHITE,ON) +searchbox_border_color = border_color # File position indicator color -position_indicator_color = (RED,WHITE,ON) +position_indicator_color = title_color # Menu box color menubox_color = (YELLOW,BLUE,OFF) # Menu box border color -menubox_border_color = (YELLOW,BLUE,ON) +menubox_border_color = screen_color # Item color -item_color = (YELLOW,BLUE,OFF) +item_color = menubox_color # Selected item color -item_selected_color = (YELLOW,BLUE,ON) +item_selected_color = screen_color # Tag color -tag_color = (YELLOW,BLUE,ON) +tag_color = screen_color # Selected tag color -tag_selected_color = (YELLOW,BLUE,ON) +tag_selected_color = screen_color # Tag key color -tag_key_color = (YELLOW,BLUE,OFF) +tag_key_color = menubox_color # Selected tag key color tag_key_selected_color = (WHITE,BLUE,ON) # Check box color -check_color = (YELLOW,BLUE,OFF) +check_color = menubox_color # Selected check box color -check_selected_color = (YELLOW,BLUE,ON) +check_selected_color = screen_color # Up arrow color -uarrow_color = (YELLOW,BLUE,ON) +uarrow_color = screen_color # Down arrow color -darrow_color = (YELLOW,BLUE,ON) +darrow_color = screen_color # Item help-text color itemhelp_color = (WHITE,BLACK,OFF) # Active form text color -form_active_text_color = (WHITE,BLUE,ON) +form_active_text_color = tag_key_selected_color # Form text color form_text_color = (WHITE,CYAN,ON) @@ -128,3 +128,15 @@ form_item_readonly_color = (CYAN,WHITE,ON) # Dialog box gauge color gauge_color = (BLUE,WHITE,ON) + +# Dialog box border2 color +border2_color = dialog_color + +# Input box border2 color +inputbox_border2_color = dialog_color + +# Search box border2 color +searchbox_border2_color = dialog_color + +# Menu box border2 color +menubox_border2_color = dialog_color diff --git a/contrib/dialog/samples/with-dquotes b/contrib/dialog/samples/with-dquotes new file mode 100755 index 0000000..604f51b --- /dev/null +++ b/contrib/dialog/samples/with-dquotes @@ -0,0 +1,3 @@ +#!/bin/sh +# $Id: with-dquotes,v 1.1 2012/07/03 09:40:19 tom Exp $ +DIALOGOPTS="$DIALOGOPTS --quoted" "$@" diff --git a/contrib/dialog/samples/with-squotes b/contrib/dialog/samples/with-squotes new file mode 100755 index 0000000..6a08f9f --- /dev/null +++ b/contrib/dialog/samples/with-squotes @@ -0,0 +1,3 @@ +#!/bin/sh +# $Id: with-squotes,v 1.1 2012/07/03 09:40:29 tom Exp $ +DIALOGOPTS="$DIALOGOPTS --single-quoted" "$@" diff --git a/contrib/dialog/tailbox.c b/contrib/dialog/tailbox.c index c111f64..0324009 100644 --- a/contrib/dialog/tailbox.c +++ b/contrib/dialog/tailbox.c @@ -1,5 +1,5 @@ /* - * $Id: tailbox.c,v 1.63 2011/06/27 08:19:43 tom Exp $ + * $Id: tailbox.c,v 1.67 2011/10/15 12:43:07 tom Exp $ * * tailbox.c -- implements the tail box * @@ -96,6 +96,7 @@ print_line(MY_OBJ * obj, WINDOW *win, int row, int width) #endif getyx(win, y, x); + (void) y; /* Clear 'residue' of previous line */ for (i = 0; i < width - x; i++) (void) waddch(win, ' '); @@ -336,8 +337,8 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b y + MARGIN, x + MARGIN); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); dlg_draw_helpline(dialog, FALSE); @@ -371,6 +372,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b dlg_attr_clear(text, thigh, getmaxx(text), dialog_attr); repaint_text(obj); + dlg_trace_win(dialog); if (bg_task) { result = DLG_EXIT_OK; } else { diff --git a/contrib/dialog/textbox.c b/contrib/dialog/textbox.c index 72a9b11..bf89ca5 100644 --- a/contrib/dialog/textbox.c +++ b/contrib/dialog/textbox.c @@ -1,9 +1,9 @@ /* - * $Id: textbox.c,v 1.101 2011/06/29 09:53:03 tom Exp $ + * $Id: textbox.c,v 1.107 2012/07/01 18:13:24 Zoltan.Kelemen Exp $ * * textbox.c -- implements the text box * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -414,6 +414,7 @@ print_page(MY_OBJ * obj, int height, int width) passed_end = 1; } (void) wnoutrefresh(obj->text); + dlg_trace_win(obj->text); } /* @@ -488,9 +489,10 @@ get_search_term(WINDOW *dialog, char *input, int height, int width) keypad(widget, TRUE); dlg_register_window(widget, "searchbox", binding); - dlg_draw_box(widget, 0, 0, box_height, box_width, - searchbox_attr, - searchbox_border_attr); + dlg_draw_box2(widget, 0, 0, box_height, box_width, + searchbox_attr, + searchbox_border_attr, + searchbox_border2_attr); wattrset(widget, searchbox_title_attr); (void) wmove(widget, 0, (box_width - len_caption) / 2); @@ -498,8 +500,6 @@ get_search_term(WINDOW *dialog, char *input, int height, int width) limit = dlg_limit_columns(caption, len_caption, 0); (void) waddnstr(widget, caption + indx[0], indx[limit] - indx[0]); - box_y++; - box_x++; box_width -= 2; offset = dlg_count_columns(input); @@ -581,7 +581,6 @@ perform_search(MY_OBJ * obj, int height, int width, int key, char *search_term) back_lines(obj, (dir ? obj->page_length - 1 : obj->page_length + 1)); - found = FALSE; if (dir) { /* Forward search */ while ((found = match_string(obj, search_term)) == FALSE) { if (obj->end_reached) @@ -675,7 +674,7 @@ dialog_textbox(const char *title, const char *file, int height, int width) WINDOW *dialog; bool moved; int result = DLG_EXIT_UNKNOWN; - int button = dialog_vars.extra_button ? dlg_defaultno_button() : 0; + int button = dlg_default_button(); int min_width = 12; search_term[0] = '\0'; /* no search term entered yet */ @@ -725,8 +724,8 @@ dialog_textbox(const char *title, const char *file, int height, int width) /* register the new window, along with its borders */ dlg_mouse_mkbigregion(0, 0, PAGE_LENGTH + 2, width, KEY_MAX, 1, 1, 1 /* lines */ ); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); dlg_draw_buttons(dialog, PAGE_LENGTH + 2, 0, obj.buttons, button, FALSE, width); @@ -915,7 +914,6 @@ dialog_textbox(const char *title, const char *file, int height, int width) height = old_height; width = old_width; back_lines(&obj, obj.page_length); - moved = TRUE; /* repaint */ dlg_clear(); dlg_del_window(dialog); diff --git a/contrib/dialog/timebox.c b/contrib/dialog/timebox.c index 5a6be3e..439120b 100644 --- a/contrib/dialog/timebox.c +++ b/contrib/dialog/timebox.c @@ -1,9 +1,9 @@ /* - * $Id: timebox.c,v 1.45 2011/06/27 08:20:22 tom Exp $ + * $Id: timebox.c,v 1.52 2012/07/02 09:34:04 tom Exp $ * * timebox.c -- implements the timebox dialog * - * Copyright 2001-2010,2011 Thomas E. Dickey + * Copyright 2001-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -82,9 +82,9 @@ draw_cell(BOX * data) dlg_draw_box(data->parent, data->y - MARGIN, data->x - MARGIN, data->height + (2 * MARGIN), data->width + (2 * MARGIN), - menubox_border_attr, menubox_attr); + menubox_border_attr, menubox_border2_attr); - wattrset(data->window, item_attr); + (void) wattrset(data->window, item_attr); wprintw(data->window, "%02d", data->value); return 0; } @@ -184,7 +184,7 @@ dialog_timebox(const char *title, WINDOW *dialog; time_t now_time = time((time_t *) 0); struct tm current; - int state = dlg_defaultno_button(); + int state = dlg_default_button(); const char **buttons = dlg_ok_labels(); char *prompt = dlg_strclone(subtitle); char buffer[MAX_LEN]; @@ -221,12 +221,12 @@ dialog_timebox(const char *title, dlg_register_window(dialog, "timebox", binding); dlg_register_buttons(dialog, "timebox", buttons); - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); dlg_draw_helpline(dialog, FALSE); - wattrset(dialog, dialog_attr); + (void) wattrset(dialog, dialog_attr); dlg_print_autowrap(dialog, prompt, height, width); /* compute positions of hour, month and year boxes */ @@ -275,6 +275,7 @@ dialog_timebox(const char *title, return CleanupResult(DLG_EXIT_ERROR, dialog, prompt, &save_vars); } + dlg_trace_win(dialog); while (result == DLG_EXIT_UNKNOWN) { BOX *obj = (state == sHR ? &hr_box : (state == sMN ? &mn_box : @@ -295,12 +296,6 @@ dialog_timebox(const char *title, /* handle function-keys */ if (fkey) { switch (key) { - case DLGK_MOUSE(0): - result = DLG_EXIT_OK; - break; - case DLGK_MOUSE(1): - result = DLG_EXIT_CANCEL; - break; case DLGK_MOUSE('H'): state = sHR; break; @@ -311,7 +306,7 @@ dialog_timebox(const char *title, state = sSC; break; case DLGK_ENTER: - result = button; + result = dlg_ok_buttoncode(button); break; case DLGK_FIELD_PREV: state = dlg_prev_ok_buttonindex(state, sHR); @@ -361,7 +356,11 @@ dialog_timebox(const char *title, goto retry; #endif default: - if (obj != 0) { + if (is_DLGK_MOUSE(key)) { + result = dlg_ok_buttoncode(key - M_EVENT); + if (result < 0) + result = DLG_EXIT_OK; + } else if (obj != 0) { int step = next_or_previous(key); if (step != 0) { obj->value += step; diff --git a/contrib/dialog/trace.c b/contrib/dialog/trace.c index a742ae8..50ccfac 100644 --- a/contrib/dialog/trace.c +++ b/contrib/dialog/trace.c @@ -1,5 +1,5 @@ /* - * $Id: trace.c,v 1.14 2011/06/21 21:12:56 tom Exp $ + * $Id: trace.c,v 1.20 2011/10/18 10:47:26 tom Exp $ * * trace.c -- implements screen-dump and keystroke-logging * @@ -24,6 +24,10 @@ #ifdef HAVE_DLG_TRACE +#ifdef NEED_WCHAR_H +#include <wchar.h> +#endif + #include <dlg_keys.h> #include <time.h> @@ -54,38 +58,94 @@ dlg_trace_win(WINDOW *win) if (myFP != 0) { int y, x; int j, k; - int rc = getmaxy(win); - int cc = getmaxx(win); - chtype ch, c2; - - fprintf(myFP, "window %dx%d at %d,%d\n", - rc, cc, getbegy(win), getbegx(win)); - - getyx(win, y, x); - for (j = 0; j < rc; ++j) { - fprintf(myFP, "%3d:", j); - for (k = 0; k < cc; ++k) { - ch = mvwinch(win, j, k) & (A_CHARTEXT | A_ALTCHARSET); - c2 = dlg_asciibox(ch); - if (c2 != 0) { - ch = c2; - } else if (unctrl(ch) == 0 || strlen(unctrl(ch)) > 1) { - ch = '.'; + WINDOW *top = wgetparent(win); + + while (top != 0 && top != stdscr) { + win = top; + top = wgetparent(win); + } + + if (win != 0) { + int rc = getmaxy(win); + int cc = getmaxx(win); + chtype ch, c2; + + fprintf(myFP, "window %dx%d at %d,%d\n", + rc, cc, getbegy(win), getbegx(win)); + + getyx(win, y, x); + for (j = 0; j < rc; ++j) { + fprintf(myFP, "%3d:", j); + for (k = 0; k < cc; ++k) { +#ifdef USE_WIDE_CURSES + char buffer[80]; + + ch = mvwinch(win, j, k) & (A_CHARTEXT | A_ALTCHARSET); + if (ch & A_ALTCHARSET) { + c2 = dlg_asciibox(ch); + if (c2 != 0) { + ch = c2; + } + buffer[0] = (char) ch; + buffer[1] = '\0'; + } else { + cchar_t cch; + wchar_t *uc; + + if (win_wch(win, &cch) == ERR + || (uc = wunctrl(&cch)) == 0 + || uc[1] != 0 + || wcwidth(uc[0]) <= 0) { + buffer[0] = '.'; + buffer[1] = '\0'; + } else { + mbstate_t state; + const wchar_t *ucp = uc; + + memset(&state, 0, sizeof(state)); + wcsrtombs(buffer, &ucp, sizeof(buffer), &state); + k += wcwidth(uc[0]) - 1; + } + } + fputs(buffer, myFP); +#else + ch = mvwinch(win, j, k) & (A_CHARTEXT | A_ALTCHARSET); + c2 = dlg_asciibox(ch); + if (c2 != 0) { + ch = c2; + } else if (unctrl(ch) == 0 || strlen(unctrl(ch)) > 1) { + ch = '.'; + } + fputc((int) (ch & 0xff), myFP); +#endif } - fputc((int) (ch & 0xff), myFP); + fputc('\n', myFP); } - fputc('\n', myFP); + wmove(win, y, x); + fflush(myFP); } - wmove(win, y, x); - fflush(myFP); } } void dlg_trace_chr(int ch, int fkey) { - if (myFP != 0) { + static int last_err = 0; + + /* + * Do not bother to trace ERR's indefinitely, since those are usually due + * to relatively short polling timeouts. + */ + if (last_err && !fkey && ch == ERR) { + ++last_err; + } else if (myFP != 0) { const char *fkey_name = "?"; + + if (last_err) { + fprintf(myFP, "skipped %d ERR's\n", last_err); + last_err = 0; + } + if (fkey) { if (fkey > KEY_MAX || (fkey_name = keyname(fkey)) == 0) { #define CASE(name) case name: fkey_name = #name; break @@ -108,6 +168,10 @@ dlg_trace_chr(int ch, int fkey) CASE(DLGK_FIELD_LAST); CASE(DLGK_FIELD_NEXT); CASE(DLGK_FIELD_PREV); + CASE(DLGK_FORM_FIRST); + CASE(DLGK_FORM_LAST); + CASE(DLGK_FORM_NEXT); + CASE(DLGK_FORM_PREV); CASE(DLGK_GRID_UP); CASE(DLGK_GRID_DOWN); CASE(DLGK_GRID_LEFT); @@ -125,6 +189,7 @@ dlg_trace_chr(int ch, int fkey) } } else if (ch == ERR) { fkey_name = "ERR"; + last_err = 1; } else { fkey_name = unctrl((chtype) ch); if (fkey_name == 0) diff --git a/contrib/dialog/ui_getc.c b/contrib/dialog/ui_getc.c index d9d5a93..b0ff15b 100644 --- a/contrib/dialog/ui_getc.c +++ b/contrib/dialog/ui_getc.c @@ -1,5 +1,5 @@ /* - * $Id: ui_getc.c,v 1.63 2011/07/07 22:05:58 tom Exp $ + * $Id: ui_getc.c,v 1.65 2011/10/20 23:45:48 tom Exp $ * * ui_getc.c - user interface glue for getc() * @@ -294,8 +294,7 @@ valid_file(FILE *fp) int fd = fileno(fp); if (fd >= 0) { - long result = 0; - if ((result = fcntl(fd, F_GETFL, 0)) >= 0) { + if (fcntl(fd, F_GETFL, 0) >= 0) { code = TRUE; } } @@ -530,6 +529,7 @@ dlg_getc(WINDOW *win, int *fkey) if (handle_others) { if ((p = dialog_state.getc_redirect) != 0) { if (!(p->handle_getc(p, ch, *fkey, &result))) { + done = (p->win == save_win) && (!p->keep_win); dlg_remove_callback(p); dialog_state.getc_redirect = 0; win = save_win; diff --git a/contrib/dialog/util.c b/contrib/dialog/util.c index 82ef4fa..ab9c47c 100644 --- a/contrib/dialog/util.c +++ b/contrib/dialog/util.c @@ -1,9 +1,9 @@ /* - * $Id: util.c,v 1.227 2011/07/07 23:42:30 tom Exp $ + * $Id: util.c,v 1.243 2012/06/30 12:58:04 tom Exp $ * * util.c -- miscellaneous utilities for dialog * - * Copyright 2000-2010,2011 Thomas E. Dickey + * Copyright 2000-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -27,6 +27,14 @@ #include <dialog.h> #include <dlg_keys.h> +#ifdef HAVE_SETLOCALE +#include <locale.h> +#endif + +#ifdef NEED_WCHAR_H +#include <wchar.h> +#endif + #ifdef NCURSES_VERSION #if defined(HAVE_NCURSESW_TERM_H) #include <ncursesw/term.h> @@ -55,6 +63,12 @@ DIALOG_STATE dialog_state; DIALOG_VARS dialog_vars; +#if !(defined(HAVE_WGETPARENT) && defined(HAVE_WINDOW__PARENT)) +#define NEED_WGETPARENT 1 +#else +#undef NEED_WGETPARENT +#endif + #define concat(a,b) a##b #ifdef HAVE_RC_FILE @@ -79,6 +93,7 @@ DIALOG_VARS dialog_vars; /* * Table of color and attribute values, default is for mono display. + * The order matches the DIALOG_ATR() values. */ /* *INDENT-OFF* */ DIALOG_COLORS dlg_color_table[] = @@ -116,11 +131,57 @@ DIALOG_COLORS dlg_color_table[] = DATA(A_BOLD, FORM_ACTIVE_TEXT, form_active_text, "Active form text"), DATA(A_REVERSE, FORM_TEXT, form_text, "Form text"), DATA(A_NORMAL, FORM_ITEM_READONLY, form_item_readonly, "Readonly form item"), - DATA(A_REVERSE, GAUGE, gauge, "Dialog box gauge") + DATA(A_REVERSE, GAUGE, gauge, "Dialog box gauge"), + DATA(A_REVERSE, BORDER2, border2, "Dialog box border2"), + DATA(A_REVERSE, INPUTBOX_BORDER2, inputbox_border2, "Input box border2"), + DATA(A_REVERSE, SEARCHBOX_BORDER2, searchbox_border2, "Search box border2"), + DATA(A_REVERSE, MENUBOX_BORDER2, menubox_border2, "Menu box border2") }; /* *INDENT-ON* */ /* + * Maintain a list of subwindows so that we can delete them to cleanup. + * More important, this provides a fallback when wgetparent() is not available. + */ +static void +add_subwindow(WINDOW *parent, WINDOW *child) +{ + DIALOG_WINDOWS *p = dlg_calloc(DIALOG_WINDOWS, 1); + + if (p != 0) { + p->normal = parent; + p->shadow = child; + p->next = dialog_state.all_subwindows; + dialog_state.all_subwindows = p; + } +} + +static void +del_subwindows(WINDOW *parent) +{ + DIALOG_WINDOWS *p = dialog_state.all_subwindows; + DIALOG_WINDOWS *q = 0; + DIALOG_WINDOWS *r; + + while (p != 0) { + if (p->normal == parent) { + delwin(p->shadow); + r = p->next; + if (q == 0) { + dialog_state.all_subwindows = r; + } else { + q->next = r; + } + free(p); + p = r; + } else { + q = p; + p = p->next; + } + } +} + +/* * Display background title if it exists ... */ void @@ -226,6 +287,8 @@ init_dialog(FILE *input, FILE *output) int fd1, fd2; char *device = 0; + setlocale(LC_ALL, ""); + dialog_state.output = output; dialog_state.tab_len = TAB_LEN; dialog_state.aspect_ratio = DEFAULT_ASPECT_RATIO; @@ -252,7 +315,7 @@ init_dialog(FILE *input, FILE *output) */ dialog_state.pipe_input = stdin; if (fileno(input) != fileno(stdin)) { - if ((fd1 = dup(fileno(input))) >= 0 + if (dup(fileno(input)) >= 0 && (fd2 = dup(fileno(stdin))) >= 0) { (void) dup2(fileno(input), fileno(stdin)); dialog_state.pipe_input = fdopen(fd2, "r"); @@ -261,7 +324,7 @@ init_dialog(FILE *input, FILE *output) } else dlg_exiterr("cannot open tty-input"); } else if (!isatty(fileno(stdin))) { - if ((fd1 = open_terminal(&device, O_RDONLY)) >= 0 + if (open_terminal(&device, O_RDONLY) >= 0 && (fd2 = dup(fileno(stdin))) >= 0) { dialog_state.pipe_input = fdopen(fd2, "r"); if (freopen(device, "r", stdin) == 0) @@ -506,22 +569,32 @@ end_dialog(void) #define ESCAPE_LEN 3 #define isOurEscape(p) (((p)[0] == '\\') && ((p)[1] == 'Z') && ((p)[2] != 0)) +int +dlg_count_real_columns(const char *text) +{ + int result = dlg_count_columns(text); + if (result && dialog_vars.colors) { + int hidden = 0; + while (*text) { + if (dialog_vars.colors && isOurEscape(text)) { + hidden += ESCAPE_LEN; + text += ESCAPE_LEN; + } else { + ++text; + } + } + result -= hidden; + } + return result; +} + static int centered(int width, const char *string) { - int len = dlg_count_columns(string); + int need = dlg_count_real_columns(string); int left; - int hide = 0; - int n; - if (dialog_vars.colors) { - for (n = 0; n < len; ++n) { - if (isOurEscape(string + n)) { - hide += ESCAPE_LEN; - } - } - } - left = (width - (len - hide)) / 2 - 1; + left = (width - need) / 2 - 1; if (left < 0) left = 0; return left; @@ -647,8 +720,10 @@ dlg_print_text(WINDOW *win, const char *txt, int cols, chtype *attr) * more blanks. */ thisTab = (CharOf(*txt) == TAB); - if (thisTab) + if (thisTab) { getyx(win, y_before, x_before); + (void) y_before; + } (void) waddch(win, CharOf(*txt++) | useattr); getyx(win, y_after, x_after); if (thisTab && (y_after == y_origin)) @@ -704,7 +779,7 @@ dlg_print_line(WINDOW *win, } else if (*test_ptr == ' ' && n != 0 && prompt[indx[n - 1]] != ' ') { wrap_inx = n; *x = cur_x; - } else if (isOurEscape(test_ptr)) { + } else if (dialog_vars.colors && isOurEscape(test_ptr)) { hide_ptr = test_ptr; hidden += ESCAPE_LEN; n += (ESCAPE_LEN - 1); @@ -751,7 +826,7 @@ dlg_print_line(WINDOW *win, hidden -= ESCAPE_LEN; test_ptr = wrap_ptr; while (test_ptr < wrap_ptr) { - if (isOurEscape(test_ptr)) { + if (dialog_vars.colors && isOurEscape(test_ptr)) { hidden -= ESCAPE_LEN; test_ptr += ESCAPE_LEN; } else { @@ -911,6 +986,7 @@ dlg_print_scrolled(WINDOW *win, werase(dummy); dlg_print_autowrap(dummy, prompt, high, width); getyx(dummy, y, x); + (void) x; copywin(dummy, /* srcwin */ win, /* dstwin */ @@ -1081,25 +1157,6 @@ longest_word(const char *string) return result; } -static int -count_real_columns(const char *text) -{ - int result = dlg_count_columns(text); - if (result && dialog_vars.colors) { - int hidden = 0; - while (*text) { - if (isOurEscape(text)) { - hidden += ESCAPE_LEN; - text += ESCAPE_LEN; - } else { - ++text; - } - } - result -= hidden; - } - return result; -} - /* * if (height or width == -1) Maximize() * if (height or width == 0), justify and return actual limits. @@ -1132,23 +1189,24 @@ real_auto_size(const char *title, high = SLINES - y; } - if (*width > 0) { - wide = *width; - } else if (prompt != 0) { - wide = MAX(title_length, mincols); - if (strchr(prompt, '\n') == 0) { - double val = dialog_state.aspect_ratio * count_real_columns(prompt); - double xxx = sqrt(val); - int tmp = (int) xxx; - wide = MAX(wide, tmp); - wide = MAX(wide, longest_word(prompt)); - justify_text((WINDOW *) 0, prompt, high, wide, height, width); + if (*width <= 0) { + if (prompt != 0) { + wide = MAX(title_length, mincols); + if (strchr(prompt, '\n') == 0) { + double val = (dialog_state.aspect_ratio * + dlg_count_real_columns(prompt)); + double xxx = sqrt(val); + int tmp = (int) xxx; + wide = MAX(wide, tmp); + wide = MAX(wide, longest_word(prompt)); + justify_text((WINDOW *) 0, prompt, high, wide, height, width); + } else { + auto_size_preformatted(prompt, height, width); + } } else { - auto_size_preformatted(prompt, height, width); + wide = SCOLS - x; + justify_text((WINDOW *) 0, prompt, high, wide, height, width); } - } else { - wide = SCOLS - x; - justify_text((WINDOW *) 0, prompt, high, wide, height, width); } if (*width < title_length) { @@ -1291,8 +1349,8 @@ dlg_get_cell_attrs(WINDOW *win) * reverse this choice. */ void -dlg_draw_box(WINDOW *win, int y, int x, int height, int width, - chtype boxchar, chtype borderchar) +dlg_draw_box2(WINDOW *win, int y, int x, int height, int width, + chtype boxchar, chtype borderchar, chtype borderchar2) { int i, j; chtype save = dlg_get_attrs(win); @@ -1306,23 +1364,30 @@ dlg_draw_box(WINDOW *win, int y, int x, int height, int width, else if (i == height - 1 && !j) (void) waddch(win, borderchar | dlg_boxchar(ACS_LLCORNER)); else if (!i && j == width - 1) - (void) waddch(win, boxchar | dlg_boxchar(ACS_URCORNER)); + (void) waddch(win, borderchar2 | dlg_boxchar(ACS_URCORNER)); else if (i == height - 1 && j == width - 1) - (void) waddch(win, boxchar | dlg_boxchar(ACS_LRCORNER)); + (void) waddch(win, borderchar2 | dlg_boxchar(ACS_LRCORNER)); else if (!i) (void) waddch(win, borderchar | dlg_boxchar(ACS_HLINE)); else if (i == height - 1) - (void) waddch(win, boxchar | dlg_boxchar(ACS_HLINE)); + (void) waddch(win, borderchar2 | dlg_boxchar(ACS_HLINE)); else if (!j) (void) waddch(win, borderchar | dlg_boxchar(ACS_VLINE)); else if (j == width - 1) - (void) waddch(win, boxchar | dlg_boxchar(ACS_VLINE)); + (void) waddch(win, borderchar2 | dlg_boxchar(ACS_VLINE)); else (void) waddch(win, boxchar | ' '); } wattrset(win, save); } +void +dlg_draw_box(WINDOW *win, int y, int x, int height, int width, + chtype boxchar, chtype borderchar) +{ + dlg_draw_box2(win, y, x, height, width, boxchar, borderchar, boxchar); +} + static DIALOG_WINDOWS * find_window(WINDOW *win) { @@ -1454,7 +1519,7 @@ repaint_cell(DIALOG_WINDOWS * dw, bool draw, int y, int x) #if USE_WCHGAT wchgat(cellwin, 1, the_attr & (chtype) (~A_COLOR), - PAIR_NUMBER(the_attr), + (short) PAIR_NUMBER(the_attr), NULL); #else { @@ -1844,24 +1909,31 @@ dlg_draw_title(WINDOW *win, const char *title) } void -dlg_draw_bottom_box(WINDOW *win) +dlg_draw_bottom_box2(WINDOW *win, chtype on_left, chtype on_right, chtype on_inside) { int width = getmaxx(win); int height = getmaxy(win); int i; - wattrset(win, border_attr); + wattrset(win, on_left); (void) wmove(win, height - 3, 0); (void) waddch(win, dlg_boxchar(ACS_LTEE)); for (i = 0; i < width - 2; i++) (void) waddch(win, dlg_boxchar(ACS_HLINE)); - wattrset(win, dialog_attr); + wattrset(win, on_right); (void) waddch(win, dlg_boxchar(ACS_RTEE)); + wattrset(win, on_inside); (void) wmove(win, height - 2, 1); for (i = 0; i < width - 2; i++) (void) waddch(win, ' '); } +void +dlg_draw_bottom_box(WINDOW *win) +{ + dlg_draw_bottom_box2(win, border_attr, dialog_attr, dialog_attr); +} + /* * Remove a window, repainting everything else. This would be simpler if we * used the panel library, but that is not _always_ available. @@ -1907,6 +1979,7 @@ dlg_del_window(WINDOW *win) if (q) { if (dialog_state.all_windows != 0) erase_childs_shadow(q); + del_subwindows(q->normal); delwin(q->normal); dlg_unregister_window(q->normal); free(q); @@ -1996,6 +2069,7 @@ dlg_sub_window(WINDOW *parent, int height, int width, int y, int x) y, x, height, width); } + add_subwindow(parent, win); (void) keypad(win, TRUE); return win; } @@ -2057,6 +2131,7 @@ dlg_item_help(const char *txt) if (itemhelp_attr & A_COLOR) { /* fill the remainder of the line with the window's attributes */ getyx(stdscr, y, x); + (void) y; while (x < COLS) { (void) addch(' '); ++x; @@ -2340,7 +2415,7 @@ dlg_add_quoted(char *string) ? FIX_SINGLE : FIX_DOUBLE); - if (dialog_vars.quoted || must_quote(string)) { + if (must_quote(string)) { temp[1] = '\0'; dlg_add_result(my_quote); while (*string != '\0') { @@ -2432,14 +2507,14 @@ dlg_does_output(void) */ #if !(defined(HAVE_GETBEGX) && defined(HAVE_GETBEGY)) int -getbegx(WINDOW *win) +dlg_getbegx(WINDOW *win) { int y, x; getbegyx(win, y, x); return x; } int -getbegy(WINDOW *win) +dlg_getbegy(WINDOW *win) { int y, x; getbegyx(win, y, x); @@ -2449,14 +2524,14 @@ getbegy(WINDOW *win) #if !(defined(HAVE_GETCURX) && defined(HAVE_GETCURY)) int -getcurx(WINDOW *win) +dlg_getcurx(WINDOW *win) { int y, x; getyx(win, y, x); return x; } int -getcury(WINDOW *win) +dlg_getcury(WINDOW *win) { int y, x; getyx(win, y, x); @@ -2466,14 +2541,14 @@ getcury(WINDOW *win) #if !(defined(HAVE_GETMAXX) && defined(HAVE_GETMAXY)) int -getmaxx(WINDOW *win) +dlg_getmaxx(WINDOW *win) { int y, x; getmaxyx(win, y, x); return x; } int -getmaxy(WINDOW *win) +dlg_getmaxy(WINDOW *win) { int y, x; getmaxyx(win, y, x); @@ -2483,17 +2558,35 @@ getmaxy(WINDOW *win) #if !(defined(HAVE_GETPARX) && defined(HAVE_GETPARY)) int -getparx(WINDOW *win) +dlg_getparx(WINDOW *win) { int y, x; getparyx(win, y, x); return x; } int -getpary(WINDOW *win) +dlg_getpary(WINDOW *win) { int y, x; getparyx(win, y, x); return y; } #endif + +#ifdef NEED_WGETPARENT +WINDOW * +dlg_wgetparent(WINDOW *win) +{ +#undef wgetparent + WINDOW *result = 0; + DIALOG_WINDOWS *p; + + for (p = dialog_state.all_subwindows; p != 0; p = p->next) { + if (p->shadow == win) { + result = p->normal; + break; + } + } + return result; +} +#endif diff --git a/contrib/dialog/yesno.c b/contrib/dialog/yesno.c index 4efb073..e97d760 100644 --- a/contrib/dialog/yesno.c +++ b/contrib/dialog/yesno.c @@ -1,9 +1,9 @@ /* - * $Id: yesno.c,v 1.51 2011/06/27 08:20:57 tom Exp $ + * $Id: yesno.c,v 1.56 2012/07/02 23:58:08 tom Exp $ * * yesno.c -- implements the yes/no box * - * Copyright 1999-2010,2011 Thomas E. Dickey + * Copyright 1999-2011,2012 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -37,13 +37,7 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width) static DLG_KEYS_BINDING binding[] = { HELPKEY_BINDINGS, ENTERKEY_BINDINGS, - DLG_KEYS_DATA( DLGK_ENTER, ' ' ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), - DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_UP ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), - DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ), + TRAVERSE_BINDINGS, SCROLLKEY_BINDINGS, END_KEYS_BINDING }; @@ -52,7 +46,7 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width) int x, y; int key = 0, fkey; int code; - int button = dlg_defaultno_button(); + int button = dlg_default_button(); WINDOW *dialog = 0; int result = DLG_EXIT_UNKNOWN; char *prompt = dlg_strclone(cprompt); @@ -87,8 +81,8 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width) dlg_register_buttons(dialog, "yesno", buttons); } - dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr); - dlg_draw_bottom_box(dialog); + dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr); + dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr); dlg_draw_title(dialog, title); dlg_draw_helpline(dialog, FALSE); @@ -103,6 +97,7 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width) if (show) { last = dlg_print_scrolled(dialog, prompt, offset, page, width, TRUE); + dlg_trace_win(dialog); show = FALSE; } key = dlg_mouse_wgetch(dialog, &fkey); diff --git a/gnu/lib/libdialog/dlg_config.h b/gnu/lib/libdialog/dlg_config.h index 4dd6ab4..3c73213 100644 --- a/gnu/lib/libdialog/dlg_config.h +++ b/gnu/lib/libdialog/dlg_config.h @@ -5,9 +5,11 @@ * $FreeBSD$ */ -#define DIALOG_PATCHDATE 20100428 +#define CURSES_WACS_ARRAY _nc_wacs +#define DIALOG_PATCHDATE 20120706 #define DIALOG_VERSION "1.1" #define HAVE_ALLOCA 1 +#define HAVE_BTOWC 1 #define HAVE_COLOR 1 #define HAVE_DIRENT_H 1 #define HAVE_DLG_FORMBOX 1 @@ -18,6 +20,7 @@ #define HAVE_FEOF_UNLOCKED 1 #define HAVE_FLUSHINP 1 #define HAVE_FSEEKO 1 +#define HAVE_GETATTRS 1 #define HAVE_GETBEGX 1 #define HAVE_GETBEGY 1 #define HAVE_GETBEGYX 1 @@ -39,14 +42,18 @@ #define HAVE_INTTYPES_H 1 #define HAVE_LANGINFO_CODESET 1 #define HAVE_LC_MESSAGES 1 -#define HAVE_LIBNCURSESW 1 #define HAVE_LIMITS_H 1 #define HAVE_LOCALE_H 1 +#define HAVE_MBLEN 1 +#define HAVE_MBRLEN 1 +#define HAVE_MBRTOWC 1 #define HAVE_MBSTATE_T 1 +#define HAVE_MBTOWC 1 #define HAVE_MEMORY_H 1 #define HAVE_MIXEDGAUGE 1 #define HAVE_MMAP 1 #define HAVE_MUNMAP 1 +#define HAVE_NCURSES_H 1 #define HAVE_NL_TYPES_H 1 #define HAVE_PUTENV 1 #define HAVE_RC_FILE 1 @@ -75,7 +82,12 @@ #define HAVE_UNISTD_H 1 #define HAVE_USE_DEFAULT_COLORS 1 #define HAVE_WAITPID 1 -#define HAVE_WGET_WCH 1 +#define HAVE_WCHGAT 1 +#define HAVE_WCSRTOMBS 1 +#define HAVE_WCSTOMBS 1 +#define HAVE_WCTOB 1 +#define HAVE_WCTOMB 1 +#define HAVE_WGETPARENT 1 #define HAVE_XDIALOG 1 #define HAVE__NC_FREE_AND_EXIT 1 #define ICONV_CONST const @@ -85,7 +97,6 @@ #define PACKAGE "dialog" #define RETSIGTYPE void #define STDC_HEADERS 1 -#define SYSTEM_NAME "freebsd9.0" +#define SYSTEM_NAME "freebsd10.0" #define TIME_WITH_SYS_TIME 1 #define TYPE_CHTYPE_IS_SCALAR 1 -#define USE_WIDE_CURSES 1 |
