aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-07-14 13:57:13 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-07-14 13:57:13 +0000
commit72147526307e3b98341f67058a9e8da8256f08eb (patch)
treea7a2aa04609d71dbb272a5004b5901d78d39dafb
parentd9bc2c28cdecd831822f6fc6d2e813a789481d0d (diff)
downloadsrc-72147526307e3b98341f67058a9e8da8256f08eb.tar.gz
src-72147526307e3b98341f67058a9e8da8256f08eb.zip
Import dialog 1.1-20110707. This adds support for several features (e.g.vendor/dialog/1.1-20110707
--hline) found in the old FreeBSD dialog.
Notes
Notes: svn path=/vendor/dialog/dist/; revision=224012 svn path=/vendor/dialog/dialog-1.1-20110707/; revision=224013; tag=vendor/dialog/1.1-20110707
-rw-r--r--CHANGES89
-rw-r--r--VERSION2
-rw-r--r--aclocal.m4199
-rw-r--r--arrows.c42
-rw-r--r--buttons.c23
-rw-r--r--calendar.c5
-rw-r--r--checklist.c26
-rw-r--r--columns.c4
-rwxr-xr-xconfig.guess37
-rwxr-xr-xconfig.sub75
-rwxr-xr-xconfigure2189
-rw-r--r--configure.in3
-rw-r--r--dialog.133
-rw-r--r--dialog.3541
-rw-r--r--dialog.c60
-rw-r--r--dialog.h26
-rw-r--r--dlg_keys.h12
-rw-r--r--editbox.c6
-rw-r--r--formbox.c8
-rw-r--r--fselect.c6
-rw-r--r--guage.c210
-rw-r--r--help.c43
-rw-r--r--inputbox.c11
-rw-r--r--makefile.in3
-rw-r--r--menubox.c6
-rw-r--r--mixedgauge.c3
-rw-r--r--msgbox.c7
-rw-r--r--package/debian/changelog12
-rw-r--r--package/debian/control4
-rw-r--r--package/dialog.spec4
-rw-r--r--pause.c6
-rw-r--r--po/sk.po111
-rw-r--r--prgbox.c7
-rw-r--r--progressbox.c4
-rw-r--r--rc.c15
-rw-r--r--samples/valgrind.log847
-rw-r--r--tailbox.c4
-rw-r--r--textbox.c9
-rw-r--r--timebox.c4
-rw-r--r--trace.c4
-rw-r--r--ui_getc.c168
-rw-r--r--util.c429
-rw-r--r--yesno.c6
43 files changed, 3754 insertions, 1549 deletions
diff --git a/CHANGES b/CHANGES
index f35790b6faab..b8390882b757 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,94 @@
--- $Id: CHANGES,v 1.333 2011/03/02 10:06:37 tom Exp $
+-- $Id: CHANGES,v 1.360 2011/07/07 23:35:10 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:
+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
+ for simple shadow manipulation used here in 2011/06/30 (report
+ by xDog Walker).
+ + add a null-pointer check in dlg_print_scrolled()
+ + fix a regression in dlg_getc() introduced by changes to intercept
+ F1 for help-popup (report by xDog Walker).
+
+2011/06/30
+ + correct license statement for prgbox.c (Debian #632198).
+ + correct layout when "--colors" is used, by discounting characters in
+ the escape sequences from the column counts (report by xDog Walker).
+ + modify dlg_checklist() so that only one item in the list can
+ initially be selected (report by xDog Walker).
+ + add/use macro dlg_enter_buttoncode() to improve implementation of
+ "--nook" option (report by xDog Walker).
+ + add option "--no-nl-expand" to suppress the conversion of "\n"
+ strings into newlines (request by xDog Walker).
+ + modify LIB_CREATE symbol in makefile.in to include the library
+ dependencies such as ncurses. This is needed when dynamically
+ loading the library (report/analysis by xDog Walker).
+ + modify dlg_exit_label() to suppress the Cancel button, for
+ consistency.
+ + modify dlg_exit_label() to honor the --nook option, except when there
+ is no other button, e.g., the help-button.
+ + modify dlg_exit_buttoncode() so that it returns the proper code for
+ help-button (report by xDog Walker).
+ + correct loop limit when processing "--column-separator" (report by
+ xDog Walker).
+ + modify handling of "--version" and "--help" to ensure that they are
+ processed, and exit before widgets. Separate "--print-version"
+ from "--version", allowing its output to be interspersed with
+ widget output (report by xDog Walker).
+ + correct a few places where "--version" or "--help" options went
+ always to stdout rather than allowing redirection with the "--stderr"
+ option (report by xDog Walker).
+ + improve repainting after erasing a widget and its shadow.
+ + add "--hline" and "--hfile" options for compatibility with FreeBSD
+ dialog (request by Devin Teske).
+ + add dialog version message when opening a trace file (request by
+ xDog Walker).
+ + show filename of rc-file in traces.
+ + add piped-in data for gauge widget to traces.
+ + add entrypoints to gauge widget, for allocating, updating and freeing
+ the widget (adapted from patch by Stephen Hurd).
+ + fix a reference to freed memory in the gauge widget.
+ + fix --no-mouse option by actually closing the mouse (report by
+ xDog Walker).
+ + add sk.po from
+ http://translationproject.org/latest/dialog/
+ + limit Solaris xpg4 portability fix for redefinition of ERR to cover
+ the specific value found in <sys/regset.h>, in case an application
+ includes dialog.h after curses.h (FreeBSD #156601, report by Jaakko
+ Heinonen, Stephen Hurd).
+ + updated configure macros:
+ + CF_CURSES_CPPFLAGS,
+ + CF_CURSES_LIBS, make checks for special libraries on hpux10 and
+ sunos4 optional
+ + CF_CURSES_FUNCS, workaround for bug in gcc 4.2.1 (FreeBSD 8.1)
+ which caused part of test program to be omitted, i.e., when it saw
+ two return-statements in a row it omitted the _first_ one. Also
+ add expression to pointer check to help FreeBSD's linker decide it
+ should be validated. Just an assignment was not enough. Also, add
+ check for unctrl.h
+ + CF_CURSES_HEADER, change order for curses.h / ncurses.h pairs to
+ put ncurses.h first, which will tend to provide the same #define's
+ as in CF_NCURSES_HEADER (report by Dennis Preiser).
+ + CF_CURSES_TERM_H, modify to avoid spurious check for
+ <curses.hterm.h> if there is no ncurses version. Look for
+ ncurses's term.h anyway, to work around breakage by packagers who
+ separate ncurses' header files.
+ + CF_DISABLE_RPATH_HACK, fix garbled message
+ + CF_LD_RPATH_OPT, add mirbsd
+ + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages.
+ This only appeared when using the macro in a dpkg script, though it
+ should have in other cases.
+ + CF_RPATH_HACK, add a check for libraries not found, e.g., from
+ suppressed functionality of gcc in linking from /usr/local/lib, and
+ add a -L option to help work around this.
+ + 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
+
2011/03/02
+ add --prgbox and --programbox (adapted from patch by David Boyd).
+ add sl.po from
@@ -649,7 +734,7 @@ to it:
colors to be the same, provided that bold attribute is set.
Also improved the logic for choosing a background color when the
foreground and background are the same (report by Erika Pacholleck).
- + update configure script macro CF_XOPEN_SOURCE, ensuring that the
+ + updated configure script macro CF_XOPEN_SOURCE, ensuring that the
_POSIX_C_SOURCE value is defined with a specific value (bug report
originally for lynx).
+ fix configure script so that po/makefile is generated properly when
diff --git a/VERSION b/VERSION
index 0cc90f574258..046245588a11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9:0:0 1.1 20110302
+10:0:0 1.1 20110707
diff --git a/aclocal.m4 b/aclocal.m4
index 20e0fa921897..159b12f8ac59 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
dnl macros used for DIALOG configure script
-dnl $Id: aclocal.m4,v 1.80 2011/01/18 23:17:01 tom Exp $
+dnl $Id: aclocal.m4,v 1.82 2011/06/28 22:48:31 tom Exp $
dnl ---------------------------------------------------------------------------
dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
dnl
@@ -1128,7 +1128,7 @@ CF_NCURSES_VERSION
CF_CURSES_LIBS
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11
+dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08
dnl ------------------
dnl Look for the curses headers.
AC_DEFUN([CF_CURSES_CPPFLAGS],[
@@ -1137,13 +1137,19 @@ AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
cf_cv_curses_incdir=no
case $host_os in #(vi
hpux10.*) #(vi
- test -d /usr/include/curses_colr && \
- cf_cv_curses_incdir="-I/usr/include/curses_colr"
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+ test -d /usr/include/curses_colr && \
+ cf_cv_curses_incdir="-I/usr/include/curses_colr"
+ fi
;;
sunos3*|sunos4*)
- test -d /usr/5lib && \
- test -d /usr/5include && \
- cf_cv_curses_incdir="-I/usr/5include"
+ if test "x$cf_cv_screen" = "xcurses_5lib"
+ then
+ test -d /usr/5lib && \
+ test -d /usr/5include && \
+ cf_cv_curses_incdir="-I/usr/5include"
+ fi
;;
esac
])
@@ -1153,7 +1159,7 @@ CF_CURSES_HEADER
CF_TERM_HEADER
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32
+dnl CF_CURSES_FUNCS version: 17 updated: 2011/05/14 16:07:29
dnl ---------------
dnl Curses-functions are a little complicated, since a lot of them are macros.
AC_DEFUN([CF_CURSES_FUNCS],
@@ -1161,6 +1167,7 @@ AC_DEFUN([CF_CURSES_FUNCS],
AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
AC_REQUIRE([CF_XOPEN_CURSES])
AC_REQUIRE([CF_CURSES_TERM_H])
+AC_REQUIRE([CF_CURSES_UNCTRL_H])
for cf_func in $1
do
CF_UPPER(cf_tr_func,$cf_func)
@@ -1173,7 +1180,8 @@ do
[
#ifndef ${cf_func}
long foo = (long)(&${cf_func});
-${cf_cv_main_return:-return}(foo == 0);
+if (foo + 1234 > 5678)
+ ${cf_cv_main_return:-return}(foo);
#endif
],
[cf_result=yes],
@@ -1190,7 +1198,7 @@ ${cf_cv_main_return:-return}(foo == 0);
done
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
+dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45
dnl ----------------
dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
dnl variations of ncurses' installs.
@@ -1200,10 +1208,10 @@ AC_DEFUN([CF_CURSES_HEADER],[
AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
cf_cv_ncurses_header=none
for cf_header in ifelse($1,,,[ \
- $1/curses.h \
- $1/ncurses.h]) \
- curses.h \
- ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h])
+ $1/ncurses.h \
+ $1/curses.h]) \
+ ncurses.h \
+ curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h])
do
AC_TRY_COMPILE([#include <${cf_header}>],
[initscr(); tgoto("?", 0,0)],
@@ -1219,7 +1227,7 @@ fi
AC_CHECK_HEADERS($cf_cv_ncurses_header)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 32 updated: 2011/01/16 17:43:15
+dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08
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.
@@ -1239,19 +1247,26 @@ freebsd*) #(vi
AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
;;
hpux10.*) #(vi
- AC_CHECK_LIB(cur_colr,initscr,[
- CF_ADD_LIBS(-lcur_colr)
- ac_cv_func_initscr=yes
- ],[
- AC_CHECK_LIB(Hcurses,initscr,[
- # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
- CF_ADD_LIBS(-lHcurses)
- CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
- ac_cv_func_initscr=yes
- ])])
+ # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
+ # next (1998), and xcurses "newer" (2000). There is no header file for
+ # Hcurses; the subdirectory curses_colr has the headers (curses.h and
+ # term.h) for cur_colr
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+ AC_CHECK_LIB(cur_colr,initscr,[
+ CF_ADD_LIBS(-lcur_colr)
+ ac_cv_func_initscr=yes
+ ],[
+ AC_CHECK_LIB(Hcurses,initscr,[
+ # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+ CF_ADD_LIBS(-lHcurses)
+ CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+ ac_cv_func_initscr=yes
+ ])])
+ fi
;;
linux*)
- case `arch` in
+ case `arch 2>/dev/null` in
x86_64)
if test -d /lib64
then
@@ -1266,9 +1281,12 @@ linux*)
esac
;;
sunos3*|sunos4*)
- if test -d /usr/5lib ; then
- CF_ADD_LIBDIR(/usr/5lib)
- CF_ADD_LIBS(-lcurses -ltermcap)
+ if test "x$cf_cv_screen" = "xcurses_5lib"
+ then
+ if test -d /usr/5lib ; then
+ CF_ADD_LIBDIR(/usr/5lib)
+ CF_ADD_LIBS(-lcurses -ltermcap)
+ fi
fi
ac_cv_func_initscr=yes
;;
@@ -1333,7 +1351,7 @@ fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49
+dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55
dnl ----------------
dnl SVr4 curses should have term.h as well (where it puts the definitions of
dnl the low-level interface). This may not be true in old/broken implementations,
@@ -1347,9 +1365,17 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
# for <term.h> if we do not find the variant.
-for cf_header in \
- `echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
- term.h
+
+cf_header_list="term.h ncurses/term.h ncursesw/term.h"
+
+case ${cf_cv_ncurses_header:-curses.h} in #(vi
+*/*)
+ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
+ cf_header_list="$cf_header_item $cf_header_list"
+ ;;
+esac
+
+for cf_header in $cf_header_list
do
AC_TRY_COMPILE([
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -1395,6 +1421,61 @@ ncursesw/term.h)
esac
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55
+dnl ------------------
+dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
+dnl may put it in a subdirectory (along with ncurses' other headers, of
+dnl course). Packages which put the headers in inconsistent locations are
+dnl broken).
+AC_DEFUN([CF_CURSES_UNCTRL_H],
+[
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+
+AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[
+
+# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look
+# for <unctrl.h> if we do not find the variant.
+
+cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
+
+case ${cf_cv_ncurses_header:-curses.h} in #(vi
+*/*)
+ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
+ cf_header_list="$cf_header_item $cf_header_list"
+ ;;
+esac
+
+for cf_header in $cf_header_list
+do
+ AC_TRY_COMPILE([
+#include <${cf_cv_ncurses_header:-curses.h}>
+#include <${cf_header}>],
+ [WINDOW *x],
+ [cf_cv_unctrl_header=$cf_header
+ break],
+ [cf_cv_unctrl_header=no])
+done
+
+case $cf_cv_unctrl_header in #(vi
+no)
+ AC_MSG_WARN(unctrl.h header not found)
+ ;;
+esac
+])
+
+case $cf_cv_unctrl_header in #(vi
+unctrl.h) #(vi
+ AC_DEFINE(HAVE_UNCTRL_H)
+ ;;
+ncurses/unctrl.h) #(vi
+ AC_DEFINE(HAVE_NCURSES_UNCTRL_H)
+ ;;
+ncursesw/unctrl.h)
+ AC_DEFINE(HAVE_NCURSESW_UNCTRL_H)
+ ;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
dnl ------------------
dnl Check for likely values of wacs_map[].
@@ -1518,7 +1599,7 @@ fi
AC_SUBST(LIBTOOL_VERSION)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00
+dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
dnl ---------------------
dnl The rpath-hack makes it simpler to build programs, particularly with the
dnl *BSD ports which may have essential libraries in unusual places. But it
@@ -1526,7 +1607,7 @@ dnl can interfere with building an executable for the base system. Use this
dnl option in that case.
AC_DEFUN([CF_DISABLE_RPATH_HACK],
[
-AC_MSG_CHECKING(if rpath should be not be set)
+AC_MSG_CHECKING(if rpath-hack should be disabled)
CF_ARG_DISABLE(rpath-hack,
[ --disable-rpath-hack don't add rpath options for additional libraries],
[cf_disable_rpath_hack=yes],
@@ -2256,7 +2337,7 @@ ifdef([AC_FUNC_FSEEKO],[
])
])
dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05
+dnl CF_LD_RPATH_OPT version: 4 updated: 2011/06/04 20:09:13
dnl ---------------
dnl For the given system and compiler, find the compiler flags to pass to the
dnl loader to use the "rpath" feature.
@@ -2277,7 +2358,7 @@ irix*) #(vi
linux*|gnu*|k*bsd*-gnu) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
-openbsd[[2-9]].*) #(vi
+openbsd[[2-9]].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
freebsd*) #(vi
@@ -2356,7 +2437,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32
+dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
dnl ------------
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
dnl options to lower-levels. It's very useful for "make -n" -- if we have it.
@@ -2373,7 +2454,7 @@ SHELL = /bin/sh
all :
@ echo '.$cf_option'
CF_EOF
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ ]]*$,,'`
+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'`
case "$cf_result" in
.*k)
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
@@ -3107,7 +3188,7 @@ $1=`echo "$2" | \
-e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 8 updated: 2010/04/17 15:38:58
+dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
dnl -------------
AC_DEFUN([CF_RPATH_HACK],
[
@@ -3120,9 +3201,36 @@ if test -n "$LD_RPATH_OPT" ; then
cf_rpath_list="/usr/lib /lib"
if test "$cf_ldd_prog" != no
then
+ cf_rpath_oops=
+
AC_TRY_LINK([#include <stdio.h>],
[printf("Hello");],
- [cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+ [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`])
+
+ # If we passed the link-test, but get a "not found" on a given library,
+ # this could be due to inept reconfiguration of gcc to make it only
+ # partly honor /usr/local/lib (or whatever). Sometimes this behavior
+ # is intentional, e.g., installing gcc in /usr/bin and suppressing the
+ # /usr/local libraries.
+ if test -n "$cf_rpath_oops"
+ then
+ for cf_rpath_src in $cf_rpath_oops
+ do
+ for cf_rpath_dir in \
+ /usr/local \
+ /usr/pkg \
+ /opt/sfw
+ do
+ if test -f $cf_rpath_dir/lib/$cf_rpath_src
+ then
+ CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+ fi
+ done
+ done
+ fi
fi
CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
@@ -3572,7 +3680,7 @@ if test "$with_dmalloc" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24
+dnl CF_WITH_LIBTOOL version: 27 updated: 2011/06/28 18:45:38
dnl ---------------
dnl Provide a configure option to incorporate libtool. Define several useful
dnl symbols for the makefile rules.
@@ -3648,7 +3756,7 @@ ifdef([AC_PROG_LIBTOOL],[
AC_MSG_ERROR(Cannot find libtool)
fi
])dnl
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
@@ -3842,7 +3950,7 @@ AC_TRY_LINK([
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 34 updated: 2010/05/26 05:38:42
+dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
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,
@@ -3861,6 +3969,9 @@ case $host_os in #(vi
aix[[456]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
+cygwin) #(vi
+ cf_XOPEN_SOURCE=600
+ ;;
darwin[[0-8]].*) #(vi
cf_xopen_source="-D_APPLE_C_SOURCE"
;;
diff --git a/arrows.c b/arrows.c
index 65af804b3f9d..6a25fd94f825 100644
--- a/arrows.c
+++ b/arrows.c
@@ -1,5 +1,5 @@
/*
- * $Id: arrows.c,v 1.33 2011/01/19 00:27:53 tom Exp $
+ * $Id: arrows.c,v 1.36 2011/06/27 09:13:56 tom Exp $
*
* arrows.c -- draw arrows to indicate end-of-range for lists
*
@@ -36,6 +36,10 @@
#define add_acs(win, code) waddch(win, dlg_boxchar(code))
#endif
+/* size of decorations */
+#define ON_LEFT 4
+#define ON_RIGHT 3
+
#ifdef HAVE_COLOR
static chtype
merge_colors(chtype foreground, chtype background)
@@ -59,6 +63,36 @@ merge_colors(chtype foreground, chtype background)
#define merge_colors(f,b) (f)
#endif
+/*
+ * If we have help-line text, e.g., from "--hline", draw it between the other
+ * decorations at the bottom of the dialog window.
+ */
+void
+dlg_draw_helpline(WINDOW *win, bool decorations)
+{
+ int cur_x, cur_y;
+ int bottom;
+
+ if (dialog_vars.help_line != 0
+ && (bottom = getmaxy(win) - 1) > 0) {
+ chtype attr = A_NORMAL;
+ 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);
+
+ if (limit > 0) {
+ getyx(win, cur_y, cur_x);
+ other = decorations ? ON_LEFT : 0;
+ (void) wmove(win, bottom, other + (avail - limit) / 2);
+ waddch(win, '[');
+ dlg_print_text(win, dialog_vars.help_line, cols[limit], &attr);
+ waddch(win, ']');
+ wmove(win, cur_y, cur_x);
+ }
+ }
+}
+
void
dlg_draw_arrows2(WINDOW *win,
int top_arrow,
@@ -94,7 +128,7 @@ dlg_draw_arrows2(WINDOW *win,
(void) waddstr(win, "(-)");
} else {
wattrset(win, attr);
- (void) whline(win, dlg_boxchar(ACS_HLINE), 4);
+ (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT);
}
}
mouse_mkbutton(top, x - 1, 6, KEY_PPAGE);
@@ -106,7 +140,7 @@ dlg_draw_arrows2(WINDOW *win,
(void) waddstr(win, "(+)");
} else {
wattrset(win, borderattr);
- (void) whline(win, dlg_boxchar(ACS_HLINE), 4);
+ (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT);
}
mouse_mkbutton(bottom, x - 1, 6, KEY_NPAGE);
@@ -141,6 +175,7 @@ dlg_draw_scrollbar(WINDOW *win,
getyx(win, oldy, oldx);
getmaxyx(win, maxy, maxx);
+ dlg_draw_helpline(win, TRUE);
if (bottom_arrow || top_arrow || dialog_state.use_scrollbar) {
percent = (!total_data
? 100
@@ -213,6 +248,7 @@ dlg_draw_arrows(WINDOW *win,
int top,
int bottom)
{
+ dlg_draw_helpline(win, TRUE);
dlg_draw_arrows2(win,
top_arrow,
bottom_arrow,
diff --git a/buttons.c b/buttons.c
index d82c4558d7ce..0241060819f4 100644
--- a/buttons.c
+++ b/buttons.c
@@ -1,5 +1,5 @@
/*
- * $Id: buttons.c,v 1.84 2011/01/19 00:27:53 tom Exp $
+ * $Id: buttons.c,v 1.86 2011/06/28 10:46:46 tom Exp $
*
* buttons.c -- draw buttons, e.g., OK/Cancel
*
@@ -442,16 +442,23 @@ const char **
dlg_exit_label(void)
{
const char **result;
+ DIALOG_VARS save;
if (dialog_vars.extra_button) {
+ dlg_save_vars(&save);
+ dialog_vars.nocancel = TRUE;
result = dlg_ok_labels();
+ dlg_restore_vars(&save);
} else {
static const char *labels[3];
int n = 0;
- labels[n++] = my_exit_label();
+ if (!dialog_vars.nook)
+ labels[n++] = my_exit_label();
if (dialog_vars.help_button)
labels[n++] = my_help_label();
+ if (n == 0)
+ labels[n++] = my_exit_label();
labels[n] = 0;
result = labels;
@@ -465,7 +472,17 @@ dlg_exit_label(void)
int
dlg_exit_buttoncode(int button)
{
- return dlg_ok_buttoncode(button);
+ int result;
+ DIALOG_VARS save;
+
+ dlg_save_vars(&save);
+ dialog_vars.nocancel = TRUE;
+
+ result = dlg_ok_buttoncode(button);
+
+ dlg_restore_vars(&save);
+
+ return result;
}
const char **
diff --git a/calendar.c b/calendar.c
index 3958145adc66..45a40ab09bdc 100644
--- a/calendar.c
+++ b/calendar.c
@@ -1,5 +1,5 @@
/*
- * $Id: calendar.c,v 1.60 2011/01/03 23:29:51 tom Exp $
+ * $Id: calendar.c,v 1.62 2011/06/29 09:47:06 tom Exp $
*
* calendar.c -- implements the calendar box
*
@@ -388,6 +388,7 @@ dialog_calendar(const char *title,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
@@ -571,7 +572,7 @@ dialog_calendar(const char *title,
state = sYEAR;
break;
case DLGK_ENTER:
- result = dlg_ok_buttoncode(button);
+ result = dlg_enter_buttoncode(button);
break;
case DLGK_FIELD_PREV:
state = dlg_prev_ok_buttonindex(state, sMONTH);
diff --git a/checklist.c b/checklist.c
index cdefe77a64ef..4b73cebdd90d 100644
--- a/checklist.c
+++ b/checklist.c
@@ -1,5 +1,5 @@
/*
- * $Id: checklist.c,v 1.124 2011/01/19 00:27:53 tom Exp $
+ * $Id: checklist.c,v 1.127 2011/06/29 23:04:09 tom Exp $
*
* checklist.c -- implements the checklist box
*
@@ -149,6 +149,7 @@ dlg_checklist(const char *title,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
@@ -193,6 +194,24 @@ dlg_checklist(const char *title,
dlg_does_output();
dlg_tab_correct_str(prompt);
+ /*
+ * If this is a radiobutton list, ensure that no more than one item is
+ * selected initially. Allow none to be selected, since some users may
+ * wish to provide this flavor.
+ */
+ if (flag == FLAG_RADIO) {
+ bool first = TRUE;
+
+ for (i = 0; i < item_no; i++) {
+ if (items[i].state) {
+ if (first) {
+ first = FALSE;
+ } else {
+ items[i].state = 0;
+ }
+ }
+ }
+ }
#ifdef KEY_RESIZE
retry:
#endif
@@ -291,11 +310,12 @@ dlg_checklist(const char *title,
choice = max_choice - 1;
}
/* Print the list */
- for (i = 0; i < max_choice; i++)
+ for (i = 0; i < max_choice; i++) {
print_item(list,
&items[i + scrollamt],
states,
i, i == choice);
+ }
(void) wnoutrefresh(list);
/* register the new window, along with its borders */
@@ -565,7 +585,7 @@ dlg_checklist(const char *title,
if (fkey) {
switch (key) {
case DLGK_ENTER:
- result = dlg_ok_buttoncode(button);
+ result = dlg_enter_buttoncode(button);
break;
case DLGK_FIELD_PREV:
button = dlg_prev_button(buttons, button);
diff --git a/columns.c b/columns.c
index 2ca5be4a97c2..8e5620c4e7e0 100644
--- a/columns.c
+++ b/columns.c
@@ -1,5 +1,5 @@
/*
- * $Id: columns.c,v 1.7 2011/01/16 21:51:44 tom Exp $
+ * $Id: columns.c,v 1.8 2011/06/28 09:26:23 tom Exp $
*
* columns.c -- implements column-alignment
*
@@ -25,7 +25,7 @@
#define each(row, data) \
row = 0, data = target; \
- row < num_rows - 1; \
+ row < num_rows; \
++row, data = next_row(data, per_row)
static char *
diff --git a/config.guess b/config.guess
index bec935b96fca..e4b69669fd22 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2911 Free Software Foundation, Inc.
-timestamp='2010-09-24'
+timestamp='2011-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,8 +57,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -92,7 +92,7 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' HUP INT TERM
+trap 'exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -326,8 +329,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -495,7 +498,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -820,8 +823,8 @@ EOF
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -934,14 +937,14 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
+ echo or32-unknown-linux-gnu
+ exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit ;;
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
diff --git a/config.sub b/config.sub
index de11910f0b15..7c62c346acfb 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2011 Free Software Foundation, Inc.
-timestamp='2010-09-11'
+timestamp='2011-04-01'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -76,8 +76,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -175,10 +175,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -283,12 +283,13 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
- | nds32 | nds32le | nds32be\
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
@@ -296,12 +297,12 @@ case $basic_machine in
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
@@ -324,7 +325,15 @@ case $basic_machine in
ms1)
basic_machine=mt-unknown
;;
-
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -382,24 +391,25 @@ case $basic_machine in
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -539,7 +549,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -826,10 +836,10 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
- -nextstep* )
+ -nextstep*)
;;
-ns2*)
os=-nextstep2
@@ -948,11 +958,14 @@ case $basic_machine in
pn)
basic_machine=pn-gould
;;
- power) basic_machine=power-ibm
+ power)
+ basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe)
+ basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -960,9 +973,11 @@ case $basic_machine in
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64) basic_machine=powerpc64-unknown
+ ppc64)
+ basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*)
+ basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1046,6 +1061,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1178,6 +1196,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1400,7 +1421,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1597,7 +1618,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
diff --git a/configure b/configure
index 2d90644e2a8e..44eaeb44f8dd 100755
--- a/configure
+++ b/configure
@@ -2462,7 +2462,7 @@ SHELL = /bin/sh
all :
@ echo '.$cf_option'
CF_EOF
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ ]*$,,'`
+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'`
case "$cf_result" in
.*k)
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
@@ -2832,6 +2832,9 @@ case $host_os in #(vi
aix[456]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
+cygwin) #(vi
+ cf_XOPEN_SOURCE=600
+ ;;
darwin[0-8].*) #(vi
cf_xopen_source="-D_APPLE_C_SOURCE"
;;
@@ -2857,14 +2860,14 @@ irix[56].*) #(vi
;;
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
-echo "$as_me:2860: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2863: 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 2867 "configure"
+#line 2870 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2879,16 +2882,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2885: \$? = $ac_status" >&5
+ echo "$as_me:2888: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2888: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2891: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2891: \$? = $ac_status" >&5
+ echo "$as_me:2894: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -2897,7 +2900,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 2900 "configure"
+#line 2903 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2912,16 +2915,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2918: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2918: \$? = $ac_status" >&5
+ echo "$as_me:2921: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2921: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2924: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2924: \$? = $ac_status" >&5
+ echo "$as_me:2927: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -2936,7 +2939,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2939: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2942: 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"
@@ -2966,14 +2969,14 @@ solaris2.[1-9]) #(vi
cf_xopen_source="-D__EXTENSIONS__"
;;
*)
- echo "$as_me:2969: checking if we should define _XOPEN_SOURCE" >&5
+ echo "$as_me:2972: 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 2976 "configure"
+#line 2979 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2988,16 +2991,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2994: \$? = $ac_status" >&5
+ echo "$as_me:2997: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2997: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3000: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3000: \$? = $ac_status" >&5
+ echo "$as_me:3003: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3006,7 +3009,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 3009 "configure"
+#line 3012 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3021,16 +3024,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3027: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3027: \$? = $ac_status" >&5
+ echo "$as_me:3030: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3030: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3033: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3033: \$? = $ac_status" >&5
+ echo "$as_me:3036: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3045,7 +3048,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3048: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3051: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -3152,16 +3155,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:3155: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3158: 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}:3161: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3164: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3164 "configure"
+#line 3167 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3176,16 +3179,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3182: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3182: \$? = $ac_status" >&5
+ echo "$as_me:3185: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3185: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3188: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3188: \$? = $ac_status" >&5
+ echo "$as_me:3191: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -3206,7 +3209,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 3209 "configure"
+#line 3212 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3221,16 +3224,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3227: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3227: \$? = $ac_status" >&5
+ echo "$as_me:3230: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3230: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3233: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3233: \$? = $ac_status" >&5
+ echo "$as_me:3236: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3241,15 +3244,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:3244: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3247: 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}:3249: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3252: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3252 "configure"
+#line 3255 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3264,16 +3267,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3270: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3270: \$? = $ac_status" >&5
+ echo "$as_me:3273: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3273: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3276: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3276: \$? = $ac_status" >&5
+ echo "$as_me:3279: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3289,7 +3292,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3292: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3295: 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
@@ -3468,7 +3471,7 @@ if test "${enable_largefile+set}" = set; then
fi;
if test "$enable_largefile" != no; then
- echo "$as_me:3471: checking for special C compiler options needed for large files" >&5
+ echo "$as_me:3474: 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
@@ -3480,7 +3483,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 3483 "configure"
+#line 3486 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -3500,16 +3503,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3506: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3506: \$? = $ac_status" >&5
+ echo "$as_me:3509: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3509: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3512: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3512: \$? = $ac_status" >&5
+ echo "$as_me:3515: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3519,16 +3522,16 @@ fi
rm -f conftest.$ac_objext
CC="$CC -n32"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3525: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3525: \$? = $ac_status" >&5
+ echo "$as_me:3528: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3528: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3531: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3531: \$? = $ac_status" >&5
+ echo "$as_me:3534: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_CC=' -n32'; break
else
@@ -3542,13 +3545,13 @@ rm -f conftest.$ac_objext
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:3545: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:3548: 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:3551: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo "$as_me:3554: 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
@@ -3556,7 +3559,7 @@ else
while :; do
ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
-#line 3559 "configure"
+#line 3562 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -3576,16 +3579,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3582: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3582: \$? = $ac_status" >&5
+ echo "$as_me:3585: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3585: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3588: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3588: \$? = $ac_status" >&5
+ echo "$as_me:3591: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3594,7 +3597,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 3597 "configure"
+#line 3600 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -3615,16 +3618,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3621: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3621: \$? = $ac_status" >&5
+ echo "$as_me:3624: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3624: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3627: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3627: \$? = $ac_status" >&5
+ echo "$as_me:3630: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_file_offset_bits=64; break
else
@@ -3635,7 +3638,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:3638: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:3641: 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
@@ -3645,7 +3648,7 @@ EOF
fi
rm -rf conftest*
- echo "$as_me:3648: checking for _LARGE_FILES value needed for large files" >&5
+ echo "$as_me:3651: 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
@@ -3653,7 +3656,7 @@ else
while :; do
ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
-#line 3656 "configure"
+#line 3659 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -3673,16 +3676,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3679: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3679: \$? = $ac_status" >&5
+ echo "$as_me:3682: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3682: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3685: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3685: \$? = $ac_status" >&5
+ echo "$as_me:3688: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3691,7 +3694,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 3694 "configure"
+#line 3697 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -3712,16 +3715,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3718: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3718: \$? = $ac_status" >&5
+ echo "$as_me:3721: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3721: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3724: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3724: \$? = $ac_status" >&5
+ echo "$as_me:3727: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_large_files=1; break
else
@@ -3732,7 +3735,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:3735: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:3738: 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
@@ -3745,7 +3748,7 @@ rm -rf conftest*
fi
if test "$enable_largefile" != no ; then
- echo "$as_me:3748: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo "$as_me:3751: 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
@@ -3753,7 +3756,7 @@ else
while :; do
ac_cv_sys_largefile_source=no
cat >conftest.$ac_ext <<_ACEOF
-#line 3756 "configure"
+#line 3759 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -3765,16 +3768,16 @@ return !fseeko;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3771: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3771: \$? = $ac_status" >&5
+ echo "$as_me:3774: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3774: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3777: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3777: \$? = $ac_status" >&5
+ echo "$as_me:3780: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3783,7 +3786,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 3786 "configure"
+#line 3789 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -3796,16 +3799,16 @@ return !fseeko;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3802: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3802: \$? = $ac_status" >&5
+ echo "$as_me:3805: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3805: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3808: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3808: \$? = $ac_status" >&5
+ echo "$as_me:3811: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_source=1; break
else
@@ -3816,7 +3819,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:3819: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:3822: 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
@@ -3830,13 +3833,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:3833: checking for fseeko" >&5
+echo "$as_me:3836: 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 3839 "configure"
+#line 3842 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -3848,16 +3851,16 @@ return fseeko && fseeko (stdin, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3854: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3854: \$? = $ac_status" >&5
+ echo "$as_me:3857: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3857: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3860: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3860: \$? = $ac_status" >&5
+ echo "$as_me:3863: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fseeko=yes
else
@@ -3867,7 +3870,7 @@ ac_cv_func_fseeko=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3870: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:3873: result: $ac_cv_func_fseeko" >&5
echo "${ECHO_T}$ac_cv_func_fseeko" >&6
if test $ac_cv_func_fseeko = yes; then
@@ -3888,14 +3891,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:3891: checking whether to use struct dirent64" >&5
+ echo "$as_me:3894: 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 3898 "configure"
+#line 3901 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3916,16 +3919,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3922: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3922: \$? = $ac_status" >&5
+ echo "$as_me:3925: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3925: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3928: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3928: \$? = $ac_status" >&5
+ echo "$as_me:3931: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_struct_dirent64=yes
else
@@ -3936,7 +3939,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3939: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:3942: 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
@@ -3946,17 +3949,17 @@ EOF
GCC_VERSION=none
if test "$GCC" = yes ; then
- echo "$as_me:3949: checking version of $CC" >&5
+ echo "$as_me:3952: 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:3953: result: $GCC_VERSION" >&5
+ echo "$as_me:3956: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6
fi
if ( test "$GCC" = yes || test "$GXX" = yes )
then
-echo "$as_me:3959: checking if you want to check for gcc warnings" >&5
+echo "$as_me:3962: 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.
@@ -3966,7 +3969,7 @@ if test "${with_warnings+set}" = set; then
else
cf_opt_with_warnings=no
fi;
-echo "$as_me:3969: result: $cf_opt_with_warnings" >&5
+echo "$as_me:3972: result: $cf_opt_with_warnings" >&5
echo "${ECHO_T}$cf_opt_with_warnings" >&6
if test "$cf_opt_with_warnings" != no ; then
@@ -3988,10 +3991,10 @@ cat > conftest.i <<EOF
EOF
if test "$GCC" = yes
then
- { echo "$as_me:3991: checking for $CC __attribute__ directives..." >&5
+ { echo "$as_me:3994: checking for $CC __attribute__ directives..." >&5
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
cat > conftest.$ac_ext <<EOF
-#line 3994 "${as_me:-configure}"
+#line 3997 "${as_me:-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -4040,12 +4043,12 @@ EOF
;;
esac
- if { (eval echo "$as_me:4043: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4046: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4046: \$? = $ac_status" >&5
+ echo "$as_me:4049: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:4048: result: ... $cf_attribute" >&5
+ test -n "$verbose" && echo "$as_me:4051: result: ... $cf_attribute" >&5
echo "${ECHO_T}... $cf_attribute" >&6
cat conftest.h >>confdefs.h
case $cf_attribute in #(vi
@@ -4085,12 +4088,12 @@ INTEL_COMPILER=no
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:4088: checking if this is really Intel C compiler" >&5
+ echo "$as_me:4091: 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 4093 "configure"
+#line 4096 "configure"
#include "confdefs.h"
int
@@ -4107,16 +4110,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4113: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4113: \$? = $ac_status" >&5
+ echo "$as_me:4116: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4116: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4119: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4119: \$? = $ac_status" >&5
+ echo "$as_me:4122: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -4127,14 +4130,14 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:4130: result: $INTEL_COMPILER" >&5
+ echo "$as_me:4133: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
fi
cat > conftest.$ac_ext <<EOF
-#line 4137 "${as_me:-configure}"
+#line 4140 "${as_me:-configure}"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -4151,7 +4154,7 @@ then
# remark #981: operands are evaluated in unspecified order
# warning #279: controlling expression is constant
- { echo "$as_me:4154: checking for $CC warning options..." >&5
+ { echo "$as_me:4157: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
@@ -4167,12 +4170,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:4170: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4173: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4173: \$? = $ac_status" >&5
+ echo "$as_me:4176: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:4175: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:4178: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -4181,7 +4184,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
elif test "$GCC" = yes
then
- { echo "$as_me:4184: checking for $CC warning options..." >&5
+ { echo "$as_me:4187: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS=
@@ -4201,12 +4204,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:4204: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4207: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4207: \$? = $ac_status" >&5
+ echo "$as_me:4210: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:4209: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:4212: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@@ -4217,7 +4220,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}:4220: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:4223: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
continue;;
esac
@@ -4242,7 +4245,7 @@ else
fi;
if test -f $srcdir/VERSION ; then
- echo "$as_me:4245: checking for package version" >&5
+ echo "$as_me:4248: 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...
@@ -4254,39 +4257,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:4257: error: missing major-version" >&5
+ test -z "$VERSION_MAJOR" && { { echo "$as_me:4260: 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:4262: error: missing minor-version" >&5
+ test -z "$VERSION_MINOR" && { { echo "$as_me:4265: error: missing minor-version" >&5
echo "$as_me: error: missing minor-version" >&2;}
{ (exit 1); exit 1; }; }
- echo "$as_me:4266: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "$as_me:4269: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
- echo "$as_me:4269: checking for package patch date" >&5
+ echo "$as_me:4272: 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:4274: error: missing patch-date $VERSION_PATCH" >&5
+ { { echo "$as_me:4277: 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:4281: error: illegal patch-date $VERSION_PATCH" >&5
+ { { echo "$as_me:4284: 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:4286: result: $VERSION_PATCH" >&5
+ echo "$as_me:4289: result: $VERSION_PATCH" >&5
echo "${ECHO_T}$VERSION_PATCH" >&6
else
- { { echo "$as_me:4289: error: did not find $srcdir/VERSION" >&5
+ { { echo "$as_me:4292: error: did not find $srcdir/VERSION" >&5
echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4294,19 +4297,19 @@ fi
# show the actual data that we have for versions:
test -n "$verbose" && echo " VERSION $VERSION" 1>&6
-echo "${as_me:-configure}:4297: testing VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:4300: testing VERSION $VERSION ..." 1>&5
test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6
-echo "${as_me:-configure}:4301: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:4304: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6
-echo "${as_me:-configure}:4305: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:4308: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6
-echo "${as_me:-configure}:4309: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:4312: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
cf_PACKAGE=dialog
PACKAGE=$PACKAGE
@@ -4333,13 +4336,13 @@ else
fi;
EXTRAOBJS=""
-echo "$as_me:4336: checking for ANSI C header files" >&5
+echo "$as_me:4339: 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 4342 "configure"
+#line 4345 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -4347,13 +4350,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:4350: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4353: \"$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:4356: \$? = $ac_status" >&5
+ echo "$as_me:4359: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4375,7 +4378,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 4378 "configure"
+#line 4381 "configure"
#include "confdefs.h"
#include <string.h>
@@ -4393,7 +4396,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 4396 "configure"
+#line 4399 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -4414,7 +4417,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4417 "configure"
+#line 4420 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -4440,15 +4443,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4446: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4446: \$? = $ac_status" >&5
+ echo "$as_me:4449: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4448: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4451: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4451: \$? = $ac_status" >&5
+ echo "$as_me:4454: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -4461,7 +4464,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:4464: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4467: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -4471,7 +4474,7 @@ EOF
fi
-echo "$as_me:4474: checking for inline" >&5
+echo "$as_me:4477: 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
@@ -4479,7 +4482,7 @@ else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4482 "configure"
+#line 4485 "configure"
#include "confdefs.h"
#ifndef __cplusplus
static $ac_kw int static_foo () {return 0; }
@@ -4488,16 +4491,16 @@ $ac_kw int foo () {return 0; }
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4494: \$? = $ac_status" >&5
+ echo "$as_me:4497: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4497: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4500: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4500: \$? = $ac_status" >&5
+ echo "$as_me:4503: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
@@ -4508,7 +4511,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:4511: result: $ac_cv_c_inline" >&5
+echo "$as_me:4514: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6
case $ac_cv_c_inline in
inline | yes) ;;
@@ -4529,28 +4532,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:4532: checking for $ac_header" >&5
+echo "$as_me:4535: 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 4538 "configure"
+#line 4541 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4547: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4547: \$? = $ac_status" >&5
+ echo "$as_me:4550: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4550: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4553: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4553: \$? = $ac_status" >&5
+ echo "$as_me:4556: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -4560,7 +4563,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4563: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4566: 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
@@ -4570,13 +4573,13 @@ EOF
fi
done
-echo "$as_me:4573: checking for off_t" >&5
+echo "$as_me:4576: 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 4579 "configure"
+#line 4582 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4591,16 +4594,16 @@ if (sizeof (off_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4597: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4597: \$? = $ac_status" >&5
+ echo "$as_me:4600: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4600: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4603: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4603: \$? = $ac_status" >&5
+ echo "$as_me:4606: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_off_t=yes
else
@@ -4610,7 +4613,7 @@ ac_cv_type_off_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4613: result: $ac_cv_type_off_t" >&5
+echo "$as_me:4616: 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
:
@@ -4622,13 +4625,13 @@ EOF
fi
-echo "$as_me:4625: checking for size_t" >&5
+echo "$as_me:4628: 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 4631 "configure"
+#line 4634 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4643,16 +4646,16 @@ if (sizeof (size_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4649: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4649: \$? = $ac_status" >&5
+ echo "$as_me:4652: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4652: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4655: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4655: \$? = $ac_status" >&5
+ echo "$as_me:4658: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_size_t=yes
else
@@ -4662,7 +4665,7 @@ ac_cv_type_size_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4665: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4668: 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
:
@@ -4676,13 +4679,13 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-echo "$as_me:4679: checking for working alloca.h" >&5
+echo "$as_me:4682: 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 4685 "configure"
+#line 4688 "configure"
#include "confdefs.h"
#include <alloca.h>
int
@@ -4694,16 +4697,16 @@ char *p = (char *) alloca (2 * sizeof (int));
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4700: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4700: \$? = $ac_status" >&5
+ echo "$as_me:4703: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4703: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4706: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4706: \$? = $ac_status" >&5
+ echo "$as_me:4709: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_working_alloca_h=yes
else
@@ -4713,7 +4716,7 @@ ac_cv_working_alloca_h=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4716: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:4719: 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
@@ -4723,13 +4726,13 @@ EOF
fi
-echo "$as_me:4726: checking for alloca" >&5
+echo "$as_me:4729: 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 4732 "configure"
+#line 4735 "configure"
#include "confdefs.h"
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -4761,16 +4764,16 @@ char *p = (char *) alloca (1);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4767: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4767: \$? = $ac_status" >&5
+ echo "$as_me:4770: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4770: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4773: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4773: \$? = $ac_status" >&5
+ echo "$as_me:4776: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_alloca_works=yes
else
@@ -4780,7 +4783,7 @@ ac_cv_func_alloca_works=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4783: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:4786: 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
@@ -4801,13 +4804,13 @@ cat >>confdefs.h <<\EOF
#define C_ALLOCA 1
EOF
-echo "$as_me:4804: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:4807: 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 4810 "configure"
+#line 4813 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -4825,18 +4828,18 @@ fi
rm -rf conftest*
fi
-echo "$as_me:4828: result: $ac_cv_os_cray" >&5
+echo "$as_me:4831: 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:4833: checking for $ac_func" >&5
+echo "$as_me:4836: 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 4839 "configure"
+#line 4842 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -4867,16 +4870,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4873: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4873: \$? = $ac_status" >&5
+ echo "$as_me:4876: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4876: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4879: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4879: \$? = $ac_status" >&5
+ echo "$as_me:4882: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -4886,7 +4889,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4889: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4892: 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
@@ -4900,7 +4903,7 @@ fi
done
fi
-echo "$as_me:4903: checking stack direction for C alloca" >&5
+echo "$as_me:4906: 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
@@ -4909,7 +4912,7 @@ else
ac_cv_c_stack_direction=0
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4912 "configure"
+#line 4915 "configure"
#include "confdefs.h"
int
find_stack_direction ()
@@ -4932,15 +4935,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4938: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4938: \$? = $ac_status" >&5
+ echo "$as_me:4941: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4940: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4943: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4943: \$? = $ac_status" >&5
+ echo "$as_me:4946: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_stack_direction=1
else
@@ -4952,7 +4955,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:4955: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:4958: result: $ac_cv_c_stack_direction" >&5
echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
cat >>confdefs.h <<EOF
@@ -4964,23 +4967,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:4967: checking for $ac_header" >&5
+echo "$as_me:4970: 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 4973 "configure"
+#line 4976 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:4977: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4980: \"$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:4983: \$? = $ac_status" >&5
+ echo "$as_me:4986: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4999,7 +5002,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:5002: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5005: 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
@@ -5012,13 +5015,13 @@ done
for ac_func in getpagesize
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5015: checking for $ac_func" >&5
+echo "$as_me:5018: 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 5021 "configure"
+#line 5024 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5049,16 +5052,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5055: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5055: \$? = $ac_status" >&5
+ echo "$as_me:5058: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5058: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5061: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5061: \$? = $ac_status" >&5
+ echo "$as_me:5064: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5068,7 +5071,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5071: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5074: 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
@@ -5078,7 +5081,7 @@ EOF
fi
done
-echo "$as_me:5081: checking for working mmap" >&5
+echo "$as_me:5084: 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
@@ -5087,7 +5090,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5090 "configure"
+#line 5093 "configure"
#include "confdefs.h"
$ac_includes_default
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5214,15 +5217,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5220: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5220: \$? = $ac_status" >&5
+ echo "$as_me:5223: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5222: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5225: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5225: \$? = $ac_status" >&5
+ echo "$as_me:5228: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -5234,7 +5237,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:5237: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5240: 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
@@ -5245,13 +5248,13 @@ EOF
fi
rm -f conftest.mmap
- echo "$as_me:5248: checking whether we are using the GNU C Library 2.1 or newer" >&5
+ echo "$as_me:5251: 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 5254 "configure"
+#line 5257 "configure"
#include "confdefs.h"
#include <features.h>
@@ -5271,7 +5274,7 @@ fi
rm -rf conftest*
fi
-echo "$as_me:5274: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5277: 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"
@@ -5284,7 +5287,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:5287: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+ { { echo "$as_me:5290: 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
@@ -5301,23 +5304,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:5304: checking for $ac_header" >&5
+echo "$as_me:5307: 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 5310 "configure"
+#line 5313 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:5314: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5317: \"$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:5320: \$? = $ac_status" >&5
+ echo "$as_me:5323: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5336,7 +5339,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:5339: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5342: 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
@@ -5351,13 +5354,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:5354: checking for $ac_func" >&5
+echo "$as_me:5357: 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 5360 "configure"
+#line 5363 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5388,16 +5391,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5394: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5394: \$? = $ac_status" >&5
+ echo "$as_me:5397: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5397: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5400: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5400: \$? = $ac_status" >&5
+ echo "$as_me:5403: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5407,7 +5410,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5410: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5413: 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
@@ -5455,7 +5458,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 5458 "configure"
+#line 5461 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -5467,16 +5470,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5473: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5473: \$? = $ac_status" >&5
+ echo "$as_me:5476: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5476: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5479: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5479: \$? = $ac_status" >&5
+ echo "$as_me:5482: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -5493,7 +5496,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}:5496: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5499: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -5534,7 +5537,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 5537 "configure"
+#line 5540 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -5546,16 +5549,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5552: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5552: \$? = $ac_status" >&5
+ echo "$as_me:5555: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5555: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5558: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5558: \$? = $ac_status" >&5
+ echo "$as_me:5561: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -5572,7 +5575,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}:5575: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5578: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -5588,7 +5591,7 @@ echo "${as_me:-configure}:5575: testing adding $cf_add_incdir to include-path ..
fi
else
-{ { echo "$as_me:5591: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:5594: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5613,7 +5616,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}:5616: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5619: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -5642,7 +5645,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}:5645: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5648: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -5651,7 +5654,7 @@ echo "${as_me:-configure}:5645: testing adding $cf_add_libdir to library-path ..
fi
else
-{ { echo "$as_me:5654: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:5657: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5662,7 +5665,7 @@ done
fi;
- echo "$as_me:5665: checking for iconv" >&5
+ echo "$as_me:5668: 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
@@ -5673,12 +5676,12 @@ else
cf_cv_header_path_iconv=
cf_cv_library_path_iconv=
-echo "${as_me:-configure}:5676: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:5679: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 5681 "configure"
+#line 5684 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5697,16 +5700,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5703: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5703: \$? = $ac_status" >&5
+ echo "$as_me:5706: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5706: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5709: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5709: \$? = $ac_status" >&5
+ echo "$as_me:5712: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -5720,7 +5723,7 @@ cat conftest.$ac_ext >&5
LIBS="-liconv $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 5723 "configure"
+#line 5726 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5739,16 +5742,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5745: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5745: \$? = $ac_status" >&5
+ echo "$as_me:5748: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5748: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5751: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5751: \$? = $ac_status" >&5
+ echo "$as_me:5754: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -5765,9 +5768,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for iconv library" 1>&6
-echo "${as_me:-configure}:5768: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:5771: testing find linkage for iconv library ..." 1>&5
-echo "${as_me:-configure}:5770: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:5773: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5880,11 +5883,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}:5883: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:5886: 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 5887 "configure"
+#line 5890 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5903,21 +5906,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5909: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5909: \$? = $ac_status" >&5
+ echo "$as_me:5912: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5912: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5915: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5915: \$? = $ac_status" >&5
+ echo "$as_me:5918: \$? = $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}:5920: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:5923: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5935,7 +5938,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_iconv" = maybe ; then
-echo "${as_me:-configure}:5938: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:5941: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -6032,13 +6035,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}:6035: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6038: 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 6041 "configure"
+#line 6044 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6057,21 +6060,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6063: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6063: \$? = $ac_status" >&5
+ echo "$as_me:6066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6066: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6069: \$? = $ac_status" >&5
+ echo "$as_me:6072: \$? = $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}:6074: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6077: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=yes
cf_cv_library_file_iconv="-liconv"
@@ -6111,7 +6114,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
fi
fi
-echo "$as_me:6114: result: $am_cv_func_iconv" >&5
+echo "$as_me:6117: result: $am_cv_func_iconv" >&5
echo "${ECHO_T}$am_cv_func_iconv" >&6
if test "$am_cv_func_iconv" = yes; then
@@ -6120,14 +6123,14 @@ cat >>confdefs.h <<\EOF
#define HAVE_ICONV 1
EOF
- echo "$as_me:6123: checking if the declaration of iconv() needs const." >&5
+ echo "$as_me:6126: 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 6130 "configure"
+#line 6133 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6152,16 +6155,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6158: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6158: \$? = $ac_status" >&5
+ echo "$as_me:6161: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6161: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6164: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6164: \$? = $ac_status" >&5
+ echo "$as_me:6167: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_proto_iconv_const=no
else
@@ -6171,7 +6174,7 @@ am_cv_proto_iconv_const=yes
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6174: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6177: 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
@@ -6213,7 +6216,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 6216 "configure"
+#line 6219 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -6225,16 +6228,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6228: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6231: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6231: \$? = $ac_status" >&5
+ echo "$as_me:6234: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6234: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6237: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6237: \$? = $ac_status" >&5
+ echo "$as_me:6240: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6251,7 +6254,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}:6254: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6257: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -6288,7 +6291,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}:6291: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6294: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -6299,13 +6302,13 @@ fi
fi
fi
- echo "$as_me:6302: checking for nl_langinfo and CODESET" >&5
+ echo "$as_me:6305: 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 6308 "configure"
+#line 6311 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -6317,16 +6320,16 @@ char* cs = nl_langinfo(CODESET);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6323: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6323: \$? = $ac_status" >&5
+ echo "$as_me:6326: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6326: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6329: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6329: \$? = $ac_status" >&5
+ echo "$as_me:6332: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
@@ -6337,7 +6340,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6340: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6343: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
@@ -6348,13 +6351,13 @@ EOF
fi
if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:6351: checking for LC_MESSAGES" >&5
+ echo "$as_me:6354: 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 6357 "configure"
+#line 6360 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -6366,16 +6369,16 @@ return LC_MESSAGES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6372: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6372: \$? = $ac_status" >&5
+ echo "$as_me:6375: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6375: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6378: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6378: \$? = $ac_status" >&5
+ echo "$as_me:6381: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_val_LC_MESSAGES=yes
else
@@ -6385,7 +6388,7 @@ am_cv_val_LC_MESSAGES=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6388: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6391: 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
@@ -6395,7 +6398,7 @@ EOF
fi
fi
- echo "$as_me:6398: checking whether NLS is requested" >&5
+ echo "$as_me:6401: 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.
@@ -6405,7 +6408,7 @@ if test "${enable_nls+set}" = set; then
else
USE_NLS=no
fi;
- echo "$as_me:6408: result: $USE_NLS" >&5
+ echo "$as_me:6411: result: $USE_NLS" >&5
echo "${ECHO_T}$USE_NLS" >&6
BUILD_INCLUDED_LIBINTL=no
@@ -6418,7 +6421,7 @@ cat >>confdefs.h <<\EOF
#define ENABLE_NLS 1
EOF
- echo "$as_me:6421: checking whether included gettext is requested" >&5
+ echo "$as_me:6424: 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.
@@ -6428,7 +6431,7 @@ if test "${with_included_gettext+set}" = set; then
else
nls_cv_force_use_gnu_gettext=no
fi;
- echo "$as_me:6431: result: $nls_cv_force_use_gnu_gettext" >&5
+ echo "$as_me:6434: 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"
@@ -6437,7 +6440,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
cf_save_LIBS_1="$LIBS"
LIBS="$LIBICONV $LIBS"
- echo "$as_me:6440: checking for libintl.h and gettext()" >&5
+ echo "$as_me:6443: 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
@@ -6448,12 +6451,12 @@ else
cf_cv_header_path_intl=
cf_cv_library_path_intl=
-echo "${as_me:-configure}:6451: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:6454: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6456 "configure"
+#line 6459 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6473,16 +6476,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6479: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6479: \$? = $ac_status" >&5
+ echo "$as_me:6482: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6482: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6485: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6485: \$? = $ac_status" >&5
+ echo "$as_me:6488: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_intl=yes
@@ -6496,7 +6499,7 @@ cat conftest.$ac_ext >&5
LIBS="-lintl $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6499 "configure"
+#line 6502 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6516,16 +6519,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6522: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6522: \$? = $ac_status" >&5
+ echo "$as_me:6525: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6525: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6528: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6528: \$? = $ac_status" >&5
+ echo "$as_me:6531: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_intl=yes
@@ -6542,9 +6545,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for intl library" 1>&6
-echo "${as_me:-configure}:6545: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:6548: testing find linkage for intl library ..." 1>&5
-echo "${as_me:-configure}:6547: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:6550: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6657,11 +6660,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}:6660: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:6663: 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 6664 "configure"
+#line 6667 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6681,21 +6684,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6687: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6687: \$? = $ac_status" >&5
+ echo "$as_me:6690: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6690: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6693: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6693: \$? = $ac_status" >&5
+ echo "$as_me:6696: \$? = $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}:6698: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:6701: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
cf_cv_find_linkage_intl=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6713,7 +6716,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_intl" = maybe ; then
-echo "${as_me:-configure}:6716: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:6719: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -6810,13 +6813,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}:6813: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:6816: 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 6819 "configure"
+#line 6822 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -6836,21 +6839,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6842: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6842: \$? = $ac_status" >&5
+ echo "$as_me:6845: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6845: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6848: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6848: \$? = $ac_status" >&5
+ echo "$as_me:6851: \$? = $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}:6853: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:6856: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
cf_cv_find_linkage_intl=yes
cf_cv_library_file_intl="-lintl"
@@ -6890,7 +6893,7 @@ cf_cv_func_gettext=no
fi
fi
-echo "$as_me:6893: result: $cf_cv_func_gettext" >&5
+echo "$as_me:6896: result: $cf_cv_func_gettext" >&5
echo "${ECHO_T}$cf_cv_func_gettext" >&6
LIBS="$cf_save_LIBS_1"
@@ -6929,7 +6932,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 6932 "configure"
+#line 6935 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -6941,16 +6944,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6947: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6947: \$? = $ac_status" >&5
+ echo "$as_me:6950: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6950: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6953: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6953: \$? = $ac_status" >&5
+ echo "$as_me:6956: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6967,7 +6970,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}:6970: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6973: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -7004,7 +7007,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}:7007: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7010: testing adding $cf_add_libdir to library-path ..." 1>&5
INTLLIBS="-L$cf_add_libdir $INTLLIBS"
fi
@@ -7020,13 +7023,13 @@ fi
for ac_func in dcgettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7023: checking for $ac_func" >&5
+echo "$as_me:7026: 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 7029 "configure"
+#line 7032 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -7057,16 +7060,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7063: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7063: \$? = $ac_status" >&5
+ echo "$as_me:7066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7066: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7069: \$? = $ac_status" >&5
+ echo "$as_me:7072: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -7076,7 +7079,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7079: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7082: 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
@@ -7091,7 +7094,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:7094: checking for $ac_word" >&5
+echo "$as_me:7097: 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
@@ -7118,16 +7121,16 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:7121: result: $MSGFMT" >&5
+ echo "$as_me:7124: result: $MSGFMT" >&5
echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$as_me:7124: result: no" >&5
+ echo "$as_me:7127: 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:7130: checking for $ac_word" >&5
+echo "$as_me:7133: 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
@@ -7144,7 +7147,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:7147: found $ac_dir/$ac_word" >&5
+ echo "$as_me:7150: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -7156,17 +7159,17 @@ fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- echo "$as_me:7159: result: $GMSGFMT" >&5
+ echo "$as_me:7162: result: $GMSGFMT" >&5
echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$as_me:7162: result: no" >&5
+ echo "$as_me:7165: 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:7169: checking for $ac_word" >&5
+echo "$as_me:7172: 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
@@ -7193,10 +7196,10 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:7196: result: $XGETTEXT" >&5
+ echo "$as_me:7199: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
- echo "$as_me:7199: result: no" >&5
+ echo "$as_me:7202: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7211,7 +7214,7 @@ fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
if test ! -d $srcdir/intl ; then
- { { echo "$as_me:7214: error: no NLS library is packaged with this application" >&5
+ { { echo "$as_me:7217: 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
@@ -7219,7 +7222,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:7222: checking for $ac_word" >&5
+echo "$as_me:7225: 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
@@ -7246,16 +7249,16 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:7249: result: $MSGFMT" >&5
+ echo "$as_me:7252: result: $MSGFMT" >&5
echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$as_me:7252: result: no" >&5
+ echo "$as_me:7255: 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:7258: checking for $ac_word" >&5
+echo "$as_me:7261: 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
@@ -7272,7 +7275,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:7275: found $ac_dir/$ac_word" >&5
+ echo "$as_me:7278: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -7284,17 +7287,17 @@ fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- echo "$as_me:7287: result: $GMSGFMT" >&5
+ echo "$as_me:7290: result: $GMSGFMT" >&5
echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$as_me:7290: result: no" >&5
+ echo "$as_me:7293: 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:7297: checking for $ac_word" >&5
+echo "$as_me:7300: 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
@@ -7321,10 +7324,10 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:7324: result: $XGETTEXT" >&5
+ echo "$as_me:7327: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
- echo "$as_me:7327: result: no" >&5
+ echo "$as_me:7330: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7339,7 +7342,7 @@ fi
if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:7342: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+ echo "$as_me:7345: 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
@@ -7349,7 +7352,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:7352: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ echo "$as_me:7355: 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
@@ -7369,7 +7372,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:7372: checking for $ac_word" >&5
+echo "$as_me:7375: 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
@@ -7384,7 +7387,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:7387: found $ac_dir/$ac_word" >&5
+echo "$as_me:7390: found $ac_dir/$ac_word" >&5
break
done
@@ -7392,10 +7395,10 @@ fi
fi
INTLBISON=$ac_cv_prog_INTLBISON
if test -n "$INTLBISON"; then
- echo "$as_me:7395: result: $INTLBISON" >&5
+ echo "$as_me:7398: result: $INTLBISON" >&5
echo "${ECHO_T}$INTLBISON" >&6
else
- echo "$as_me:7398: result: no" >&5
+ echo "$as_me:7401: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7405,7 +7408,7 @@ done
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
- echo "$as_me:7408: checking version of bison" >&5
+ echo "$as_me:7411: 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
@@ -7414,7 +7417,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:7417: result: $ac_prog_version" >&5
+ echo "$as_me:7420: result: $ac_prog_version" >&5
echo "${ECHO_T}$ac_prog_version" >&6
fi
if test $ac_verc_fail = yes; then
@@ -7440,7 +7443,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- echo "$as_me:7443: checking for catalogs to be installed" >&5
+ echo "$as_me:7446: 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
@@ -7460,7 +7463,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:7463: result: $LINGUAS" >&5
+ echo "$as_me:7466: result: $LINGUAS" >&5
echo "${ECHO_T}$LINGUAS" >&6
fi
@@ -7495,7 +7498,7 @@ cf_makefile=makefile
use_our_messages=no
if test "$USE_NLS" = yes ; then
if test -d $srcdir/po ; then
-echo "$as_me:7498: checking if we should use included message-library" >&5
+echo "$as_me:7501: 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.
@@ -7506,7 +7509,7 @@ else
use_our_messages=yes
fi;
fi
-echo "$as_me:7509: result: $use_our_messages" >&5
+echo "$as_me:7512: result: $use_our_messages" >&5
echo "${ECHO_T}$use_our_messages" >&6
fi
@@ -7547,23 +7550,23 @@ else
for ac_header in libintl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7550: checking for $ac_header" >&5
+echo "$as_me:7553: 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 7556 "configure"
+#line 7559 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:7560: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7563: \"$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:7566: \$? = $ac_status" >&5
+ echo "$as_me:7569: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7582,7 +7585,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:7585: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7588: 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
@@ -7627,14 +7630,14 @@ EOF
fi
fi
-echo "$as_me:7630: checking if -lm needed for math functions" >&5
+echo "$as_me:7633: 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 7637 "configure"
+#line 7640 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7649,16 +7652,16 @@ double x = rand(); printf("result = %g\n", sqrt(x))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7655: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7655: \$? = $ac_status" >&5
+ echo "$as_me:7658: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7658: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7661: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7661: \$? = $ac_status" >&5
+ echo "$as_me:7664: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_libm=no
else
@@ -7668,7 +7671,7 @@ cf_cv_need_libm=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7671: result: $cf_cv_need_libm" >&5
+echo "$as_me:7674: result: $cf_cv_need_libm" >&5
echo "${ECHO_T}$cf_cv_need_libm" >&6
if test "$cf_cv_need_libm" = yes
then
@@ -7677,7 +7680,7 @@ then
fi
-echo "$as_me:7680: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:7683: 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.
@@ -7693,7 +7696,7 @@ EOF
else
with_dmalloc=
fi;
-echo "$as_me:7696: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:7699: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -7787,23 +7790,23 @@ fi
esac
if test "$with_dmalloc" = yes ; then
- echo "$as_me:7790: checking for dmalloc.h" >&5
+ echo "$as_me:7793: 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 7796 "configure"
+#line 7799 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
-if { (eval echo "$as_me:7800: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7803: \"$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:7806: \$? = $ac_status" >&5
+ echo "$as_me:7809: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7822,11 +7825,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:7825: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:7828: 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:7829: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:7832: 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
@@ -7834,7 +7837,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7837 "configure"
+#line 7840 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7853,16 +7856,16 @@ dmalloc_debug ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7859: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7859: \$? = $ac_status" >&5
+ echo "$as_me:7862: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7862: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7865: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7865: \$? = $ac_status" >&5
+ echo "$as_me:7868: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@@ -7873,7 +7876,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:7876: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:7879: 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
@@ -7888,7 +7891,7 @@ fi
fi
-echo "$as_me:7891: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:7894: 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.
@@ -7904,7 +7907,7 @@ EOF
else
with_dbmalloc=
fi;
-echo "$as_me:7907: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:7910: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -7998,23 +8001,23 @@ fi
esac
if test "$with_dbmalloc" = yes ; then
- echo "$as_me:8001: checking for dbmalloc.h" >&5
+ echo "$as_me:8004: 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 8007 "configure"
+#line 8010 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
-if { (eval echo "$as_me:8011: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8014: \"$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:8017: \$? = $ac_status" >&5
+ echo "$as_me:8020: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8033,11 +8036,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:8036: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:8039: 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:8040: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:8043: 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
@@ -8045,7 +8048,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8048 "configure"
+#line 8051 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8064,16 +8067,16 @@ debug_malloc ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8070: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8070: \$? = $ac_status" >&5
+ echo "$as_me:8073: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8073: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8076: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8076: \$? = $ac_status" >&5
+ echo "$as_me:8079: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@@ -8084,7 +8087,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8087: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:8090: 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
@@ -8099,7 +8102,7 @@ fi
fi
-echo "$as_me:8102: checking if you want to use purify for testing" >&5
+echo "$as_me:8105: 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.
@@ -8115,7 +8118,7 @@ EOF
else
with_purify=
fi;
-echo "$as_me:8118: result: ${with_purify:-no}" >&5
+echo "$as_me:8121: result: ${with_purify:-no}" >&5
echo "${ECHO_T}${with_purify:-no}" >&6
case .$with_cflags in #(vi
@@ -8208,7 +8211,7 @@ fi
;;
esac
-echo "$as_me:8211: checking if you want to use valgrind for testing" >&5
+echo "$as_me:8214: 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.
@@ -8224,7 +8227,7 @@ EOF
else
with_valgrind=
fi;
-echo "$as_me:8227: result: ${with_valgrind:-no}" >&5
+echo "$as_me:8230: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@@ -8317,7 +8320,7 @@ fi
;;
esac
-echo "$as_me:8320: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:8323: 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.
@@ -8339,10 +8342,10 @@ EOF
else
with_no_leaks=
fi;
-echo "$as_me:8342: result: $with_no_leaks" >&5
+echo "$as_me:8345: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
-echo "$as_me:8345: checking if you want --trace option" >&5
+echo "$as_me:8348: 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.
@@ -8352,7 +8355,7 @@ if test "${enable_trace+set}" = set; then
else
enableval=yes
fi;
-echo "$as_me:8355: result: $enableval" >&5
+echo "$as_me:8358: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS trace\$o"
@@ -8366,7 +8369,7 @@ fi
LIBTOOL_MAKE="#"
-echo "$as_me:8369: checking if libtool -version-number should be used" >&5
+echo "$as_me:8372: 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.
@@ -8383,7 +8386,7 @@ else
cf_libtool_version=yes
fi;
-echo "$as_me:8386: result: $cf_libtool_version" >&5
+echo "$as_me:8389: result: $cf_libtool_version" >&5
echo "${ECHO_T}$cf_libtool_version" >&6
if test "$cf_libtool_version" = yes ; then
@@ -8408,7 +8411,7 @@ LIB_LINK='${CC}'
LIB_INSTALL=
LIB_UNINSTALL=
-echo "$as_me:8411: checking if you want to build libraries with libtool" >&5
+echo "$as_me:8414: 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.
@@ -8418,7 +8421,7 @@ if test "${with_libtool+set}" = set; then
else
with_libtool=no
fi;
-echo "$as_me:8421: result: $with_libtool" >&5
+echo "$as_me:8424: result: $with_libtool" >&5
echo "${ECHO_T}$with_libtool" >&6
if test "$with_libtool" != "no"; then
@@ -8449,7 +8452,7 @@ case ".$with_libtool" in #(vi
with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:8452: error: expected a pathname, not \"$with_libtool\"" >&5
+ { { echo "$as_me:8455: error: expected a pathname, not \"$with_libtool\"" >&5
echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -8459,7 +8462,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:8462: checking for $ac_word" >&5
+echo "$as_me:8465: 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
@@ -8476,7 +8479,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:8479: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8482: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -8487,20 +8490,20 @@ fi
LIBTOOL=$ac_cv_path_LIBTOOL
if test -n "$LIBTOOL"; then
- echo "$as_me:8490: result: $LIBTOOL" >&5
+ echo "$as_me:8493: result: $LIBTOOL" >&5
echo "${ECHO_T}$LIBTOOL" >&6
else
- echo "$as_me:8493: result: no" >&5
+ echo "$as_me:8496: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test -z "$LIBTOOL" ; then
- { { echo "$as_me:8499: error: Cannot find libtool" >&5
+ { { echo "$as_me:8502: error: Cannot find libtool" >&5
echo "$as_me: error: Cannot find libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
@@ -8511,17 +8514,17 @@ echo "$as_me: error: Cannot find libtool" >&2;}
LIB_PREP=:
# Show the version of libtool
- echo "$as_me:8514: checking version of libtool" >&5
+ echo "$as_me:8517: 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:8521: result: $cf_cv_libtool_version" >&5
+ echo "$as_me:8524: 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:8524: error: This is not GNU libtool" >&5
+ { { echo "$as_me:8527: error: This is not GNU libtool" >&5
echo "$as_me: error: This is not GNU libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8555,7 +8558,7 @@ if test "$with_libtool" = "yes" ; then
OBJEXT="lo"
LIBTOOL_MAKE=
-echo "$as_me:8558: checking for additional libtool options" >&5
+echo "$as_me:8561: 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.
@@ -8565,7 +8568,7 @@ if test "${with_libtool_opts+set}" = set; then
else
with_libtool_opts=no
fi;
-echo "$as_me:8568: result: $with_libtool_opts" >&5
+echo "$as_me:8571: result: $with_libtool_opts" >&5
echo "${ECHO_T}$with_libtool_opts" >&6
case .$with_libtool_opts in
@@ -8578,7 +8581,7 @@ esac
fi
-echo "$as_me:8581: checking for specific curses-directory" >&5
+echo "$as_me:8584: 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.
@@ -8588,7 +8591,7 @@ if test "${with_curses_dir+set}" = set; then
else
cf_cv_curses_dir=no
fi;
-echo "$as_me:8591: result: $cf_cv_curses_dir" >&5
+echo "$as_me:8594: 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" )
@@ -8619,7 +8622,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:8622: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:8625: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -8652,7 +8655,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 8655 "configure"
+#line 8658 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -8664,16 +8667,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8670: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8670: \$? = $ac_status" >&5
+ echo "$as_me:8673: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8673: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8676: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8676: \$? = $ac_status" >&5
+ echo "$as_me:8679: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -8690,7 +8693,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}:8693: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8696: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -8724,7 +8727,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}:8727: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8730: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -8752,7 +8755,7 @@ if test $use_ncurses != no ; then
cf_wide_curses=yes
if test $use_ncurses = ncursesw ; then
-echo "$as_me:8755: checking for multibyte character support" >&5
+echo "$as_me:8758: 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
@@ -8760,7 +8763,7 @@ else
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8763 "configure"
+#line 8766 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -8773,16 +8776,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8779: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8779: \$? = $ac_status" >&5
+ echo "$as_me:8782: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8782: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8785: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8785: \$? = $ac_status" >&5
+ echo "$as_me:8788: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_utf8_lib=yes
else
@@ -8794,12 +8797,12 @@ cat conftest.$ac_ext >&5
cf_cv_header_path_utf8=
cf_cv_library_path_utf8=
-echo "${as_me:-configure}:8797: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8800: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8802 "configure"
+#line 8805 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -8812,16 +8815,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8818: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8818: \$? = $ac_status" >&5
+ echo "$as_me:8821: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8821: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8824: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8824: \$? = $ac_status" >&5
+ echo "$as_me:8827: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_utf8=yes
@@ -8835,7 +8838,7 @@ cat conftest.$ac_ext >&5
LIBS="-lutf8 $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8838 "configure"
+#line 8841 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -8848,16 +8851,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8854: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8854: \$? = $ac_status" >&5
+ echo "$as_me:8857: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8857: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8860: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8860: \$? = $ac_status" >&5
+ echo "$as_me:8863: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_utf8=yes
@@ -8874,9 +8877,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
-echo "${as_me:-configure}:8877: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8880: testing find linkage for utf8 library ..." 1>&5
-echo "${as_me:-configure}:8879: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8882: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8989,11 +8992,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}:8992: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8995: 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 8996 "configure"
+#line 8999 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -9006,21 +9009,21 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9012: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9012: \$? = $ac_status" >&5
+ echo "$as_me:9015: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9015: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9018: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9018: \$? = $ac_status" >&5
+ echo "$as_me:9021: \$? = $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}:9023: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:9026: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
cf_cv_find_linkage_utf8=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9038,7 +9041,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_utf8" = maybe ; then
-echo "${as_me:-configure}:9041: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:9044: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -9135,13 +9138,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}:9138: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:9141: 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 9144 "configure"
+#line 9147 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -9154,21 +9157,21 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9160: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9160: \$? = $ac_status" >&5
+ echo "$as_me:9163: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9163: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9166: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9166: \$? = $ac_status" >&5
+ echo "$as_me:9169: \$? = $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}:9171: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:9174: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
cf_cv_find_linkage_utf8=yes
cf_cv_library_file_utf8="-lutf8"
@@ -9210,7 +9213,7 @@ fi
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:9213: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:9216: 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
@@ -9244,7 +9247,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 9247 "configure"
+#line 9250 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9256,16 +9259,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9262: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9262: \$? = $ac_status" >&5
+ echo "$as_me:9265: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9265: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9268: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9268: \$? = $ac_status" >&5
+ echo "$as_me:9271: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9282,7 +9285,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}:9285: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9288: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9316,7 +9319,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}:9319: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9322: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -9336,7 +9339,7 @@ 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:9339: checking for $ac_word" >&5
+echo "$as_me:9342: 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
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9353,7 +9356,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_NCURSES_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:9356: found $ac_dir/$ac_word" >&5
+ echo "$as_me:9359: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -9364,10 +9367,10 @@ fi
NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:9367: result: $NCURSES_CONFIG" >&5
+ echo "$as_me:9370: result: $NCURSES_CONFIG" >&5
echo "${ECHO_T}$NCURSES_CONFIG" >&6
else
- echo "$as_me:9370: result: no" >&5
+ echo "$as_me:9373: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -9382,7 +9385,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
# even with config script, some packages use no-override for curses.h
-echo "$as_me:9385: checking if we have identified curses headers" >&5
+echo "$as_me:9388: 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
@@ -9390,13 +9393,13 @@ else
cf_cv_ncurses_header=none
for cf_header in \
- $use_ncurses/curses.h \
- $use_ncurses/ncurses.h \
- curses.h \
- ncurses.h
+ $use_ncurses/ncurses.h \
+ $use_ncurses/curses.h \
+ ncurses.h \
+ curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 9399 "configure"
+#line 9402 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -9408,16 +9411,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9414: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9414: \$? = $ac_status" >&5
+ echo "$as_me:9417: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9417: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9420: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9420: \$? = $ac_status" >&5
+ echo "$as_me:9423: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -9428,11 +9431,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:9431: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9434: 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:9435: error: No curses header-files found" >&5
+ { { echo "$as_me:9438: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -9442,23 +9445,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:9445: checking for $ac_header" >&5
+echo "$as_me:9448: 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 9451 "configure"
+#line 9454 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:9455: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9458: \"$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:9461: \$? = $ac_status" >&5
+ echo "$as_me:9464: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9477,7 +9480,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9480: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9483: 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
@@ -9530,7 +9533,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 9533 "configure"
+#line 9536 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9542,16 +9545,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9548: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9548: \$? = $ac_status" >&5
+ echo "$as_me:9551: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9551: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9554: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9554: \$? = $ac_status" >&5
+ echo "$as_me:9557: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9568,7 +9571,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}:9571: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9574: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9585,7 +9588,7 @@ fi
}
-echo "$as_me:9588: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9591: 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
@@ -9597,7 +9600,7 @@ else
do
cat >conftest.$ac_ext <<_ACEOF
-#line 9600 "configure"
+#line 9603 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -9621,16 +9624,16 @@ printf("old\n");
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9627: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9627: \$? = $ac_status" >&5
+ echo "$as_me:9630: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9630: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9633: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9633: \$? = $ac_status" >&5
+ echo "$as_me:9636: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -9645,14 +9648,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:9648: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9651: 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:9655: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9658: 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
@@ -9792,7 +9795,7 @@ if test -n "$cf_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 9795 "configure"
+#line 9798 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9804,16 +9807,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9810: \$? = $ac_status" >&5
+ echo "$as_me:9813: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9813: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9816: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9816: \$? = $ac_status" >&5
+ echo "$as_me:9819: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9830,7 +9833,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}:9833: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9836: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9851,7 +9854,7 @@ fi
do
cat >conftest.$ac_ext <<_ACEOF
-#line 9854 "configure"
+#line 9857 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -9875,16 +9878,16 @@ printf("old\n");
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9881: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9881: \$? = $ac_status" >&5
+ echo "$as_me:9884: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9884: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9887: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9887: \$? = $ac_status" >&5
+ echo "$as_me:9890: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -9905,12 +9908,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:9908: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9911: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:9913: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9916: 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%/[^/]*$%%'`
@@ -9943,7 +9946,7 @@ if test -n "$cf_1st_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 9946 "configure"
+#line 9949 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9955,16 +9958,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9961: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9961: \$? = $ac_status" >&5
+ echo "$as_me:9964: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9964: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9967: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9967: \$? = $ac_status" >&5
+ echo "$as_me:9970: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9981,7 +9984,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}:9984: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9987: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -10024,7 +10027,7 @@ EOF
;;
esac
-echo "$as_me:10027: checking for terminfo header" >&5
+echo "$as_me:10030: 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
@@ -10042,7 +10045,7 @@ esac
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10045 "configure"
+#line 10048 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10057,16 +10060,16 @@ int x = auto_left_margin
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10063: \$? = $ac_status" >&5
+ echo "$as_me:10066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10066: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10069: \$? = $ac_status" >&5
+ echo "$as_me:10072: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -10082,7 +10085,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:10085: result: $cf_cv_term_header" >&5
+echo "$as_me:10088: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10116,7 +10119,7 @@ cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
-echo "$as_me:10119: checking for ncurses version" >&5
+echo "$as_me:10122: 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
@@ -10142,10 +10145,10 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:10145: \"$cf_try\"") >&5
+ { (eval echo "$as_me:10148: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:10148: \$? = $ac_status" >&5
+ echo "$as_me:10151: \$? = $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%".*%%'`
@@ -10155,7 +10158,7 @@ EOF
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10158 "configure"
+#line 10161 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10180,15 +10183,15 @@ int main()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10186: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10186: \$? = $ac_status" >&5
+ echo "$as_me:10189: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:10188: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10191: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10191: \$? = $ac_status" >&5
+ echo "$as_me:10194: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10202,7 +10205,7 @@ fi
rm -f $cf_tempfile
fi
-echo "$as_me:10205: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10208: 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
@@ -10214,7 +10217,7 @@ cf_nculib_root=$use_ncurses
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10217: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10220: 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
@@ -10222,7 +10225,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10225 "configure"
+#line 10228 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10241,16 +10244,16 @@ Gpm_Open ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10247: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10247: \$? = $ac_status" >&5
+ echo "$as_me:10250: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10250: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10253: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10253: \$? = $ac_status" >&5
+ echo "$as_me:10256: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -10261,10 +10264,10 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10264: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10267: 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:10267: checking for initscr in -lgpm" >&5
+ echo "$as_me:10270: 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
@@ -10272,7 +10275,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10275 "configure"
+#line 10278 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10291,16 +10294,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10297: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10297: \$? = $ac_status" >&5
+ echo "$as_me:10300: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10300: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10303: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10303: \$? = $ac_status" >&5
+ echo "$as_me:10306: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -10311,7 +10314,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10314: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10317: 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"
@@ -10326,7 +10329,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:10329: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:10332: 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
@@ -10334,7 +10337,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10337 "configure"
+#line 10340 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10353,16 +10356,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10359: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10359: \$? = $ac_status" >&5
+ echo "$as_me:10362: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10362: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10365: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10365: \$? = $ac_status" >&5
+ echo "$as_me:10368: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -10373,7 +10376,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10376: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10379: 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"
@@ -10392,13 +10395,13 @@ else
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:10395: checking for initscr" >&5
+ echo "$as_me:10398: 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 10401 "configure"
+#line 10404 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -10429,16 +10432,16 @@ f = initscr;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10435: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10435: \$? = $ac_status" >&5
+ echo "$as_me:10438: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10438: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10441: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10441: \$? = $ac_status" >&5
+ echo "$as_me:10444: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -10448,18 +10451,18 @@ ac_cv_func_initscr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10451: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10454: 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:10458: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:10461: 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 10462 "configure"
+#line 10465 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -10471,25 +10474,25 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10477: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10477: \$? = $ac_status" >&5
+ echo "$as_me:10480: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10480: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10483: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10483: \$? = $ac_status" >&5
+ echo "$as_me:10486: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:10485: result: yes" >&5
+ echo "$as_me:10488: 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:10492: result: no" >&5
+echo "$as_me:10495: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -10579,11 +10582,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:10582: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:10585: 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 10586 "configure"
+#line 10589 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -10595,25 +10598,25 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10601: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10601: \$? = $ac_status" >&5
+ echo "$as_me:10604: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10604: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10607: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10607: \$? = $ac_status" >&5
+ echo "$as_me:10610: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:10609: result: yes" >&5
+ echo "$as_me:10612: 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:10616: result: no" >&5
+echo "$as_me:10619: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -10628,7 +10631,7 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:10631: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:10634: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10636,7 +10639,7 @@ fi
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:10639: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:10642: 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
@@ -10646,7 +10649,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 10649 "configure"
+#line 10652 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -10658,23 +10661,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10664: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10664: \$? = $ac_status" >&5
+ echo "$as_me:10667: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10667: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10670: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10670: \$? = $ac_status" >&5
+ echo "$as_me:10673: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:10672: result: yes" >&5
+ echo "$as_me:10675: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:10677: result: no" >&5
+echo "$as_me:10680: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -10692,7 +10695,7 @@ fi
else
cf_wide_curses=no
-echo "$as_me:10695: checking for extra include directories" >&5
+echo "$as_me:10698: 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
@@ -10701,22 +10704,28 @@ else
cf_cv_curses_incdir=no
case $host_os in #(vi
hpux10.*) #(vi
- test -d /usr/include/curses_colr && \
- cf_cv_curses_incdir="-I/usr/include/curses_colr"
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+ test -d /usr/include/curses_colr && \
+ cf_cv_curses_incdir="-I/usr/include/curses_colr"
+ fi
;;
sunos3*|sunos4*)
- test -d /usr/5lib && \
- test -d /usr/5include && \
- cf_cv_curses_incdir="-I/usr/5include"
+ if test "x$cf_cv_screen" = "xcurses_5lib"
+ then
+ test -d /usr/5lib && \
+ test -d /usr/5include && \
+ cf_cv_curses_incdir="-I/usr/5include"
+ fi
;;
esac
fi
-echo "$as_me:10715: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10724: 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:10719: checking if we have identified curses headers" >&5
+echo "$as_me:10728: 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
@@ -10724,11 +10733,11 @@ else
cf_cv_ncurses_header=none
for cf_header in \
- curses.h \
- ncurses.h ncurses/curses.h ncurses/ncurses.h
+ ncurses.h \
+ curses.h ncurses/ncurses.h ncurses/curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10731 "configure"
+#line 10740 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -10740,16 +10749,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10746: \$? = $ac_status" >&5
+ echo "$as_me:10755: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10749: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10758: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10752: \$? = $ac_status" >&5
+ echo "$as_me:10761: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -10760,11 +10769,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:10763: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10772: 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:10767: error: No curses header-files found" >&5
+ { { echo "$as_me:10776: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10774,23 +10783,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:10777: checking for $ac_header" >&5
+echo "$as_me:10786: 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 10783 "configure"
+#line 10792 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:10787: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10796: \"$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:10793: \$? = $ac_status" >&5
+ echo "$as_me:10802: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10809,7 +10818,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10812: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10821: 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
@@ -10819,7 +10828,7 @@ EOF
fi
done
-echo "$as_me:10822: checking for terminfo header" >&5
+echo "$as_me:10831: 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
@@ -10837,7 +10846,7 @@ esac
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10840 "configure"
+#line 10849 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10852,16 +10861,16 @@ int x = auto_left_margin
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10864: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10858: \$? = $ac_status" >&5
+ echo "$as_me:10867: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10861: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10870: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10864: \$? = $ac_status" >&5
+ echo "$as_me:10873: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -10877,7 +10886,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:10880: result: $cf_cv_term_header" >&5
+echo "$as_me:10889: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10906,7 +10915,7 @@ EOF
;;
esac
-echo "$as_me:10909: checking for ncurses version" >&5
+echo "$as_me:10918: 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
@@ -10932,10 +10941,10 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:10935: \"$cf_try\"") >&5
+ { (eval echo "$as_me:10944: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:10938: \$? = $ac_status" >&5
+ echo "$as_me:10947: \$? = $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%".*%%'`
@@ -10945,7 +10954,7 @@ EOF
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10948 "configure"
+#line 10957 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -10970,15 +10979,15 @@ int main()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10982: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10976: \$? = $ac_status" >&5
+ echo "$as_me:10985: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:10978: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10987: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10981: \$? = $ac_status" >&5
+ echo "$as_me:10990: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10992,16 +11001,16 @@ fi
rm -f $cf_tempfile
fi
-echo "$as_me:10995: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11004: 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:11001: checking if we have identified curses libraries" >&5
+echo "$as_me:11010: 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 11004 "configure"
+#line 11013 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11013,16 +11022,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11025: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11019: \$? = $ac_status" >&5
+ echo "$as_me:11028: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11022: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11031: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11025: \$? = $ac_status" >&5
+ echo "$as_me:11034: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11031,13 +11040,13 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:11034: result: $cf_result" >&5
+echo "$as_me:11043: 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:11040: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:11049: 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
@@ -11045,7 +11054,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11048 "configure"
+#line 11057 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11064,16 +11073,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11076: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11070: \$? = $ac_status" >&5
+ echo "$as_me:11079: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11073: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11082: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11076: \$? = $ac_status" >&5
+ echo "$as_me:11085: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -11084,7 +11093,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11087: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11096: 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"
@@ -11092,7 +11101,13 @@ fi
;;
hpux10.*) #(vi
- echo "$as_me:11095: checking for initscr in -lcur_colr" >&5
+ # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
+ # next (1998), and xcurses "newer" (2000). There is no header file for
+ # Hcurses; the subdirectory curses_colr has the headers (curses.h and
+ # 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 $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
@@ -11100,7 +11115,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcur_colr $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11103 "configure"
+#line 11118 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11119,16 +11134,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11137: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11125: \$? = $ac_status" >&5
+ echo "$as_me:11140: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11128: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11143: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11131: \$? = $ac_status" >&5
+ echo "$as_me:11146: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cur_colr_initscr=yes
else
@@ -11139,16 +11154,16 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11142: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:11157: 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
- LIBS="-lcur_colr $LIBS"
- ac_cv_func_initscr=yes
+ LIBS="-lcur_colr $LIBS"
+ ac_cv_func_initscr=yes
else
- echo "$as_me:11151: checking for initscr in -lHcurses" >&5
+ echo "$as_me:11166: 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
@@ -11156,7 +11171,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lHcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11159 "configure"
+#line 11174 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11175,16 +11190,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11193: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11181: \$? = $ac_status" >&5
+ echo "$as_me:11196: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11184: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11199: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11187: \$? = $ac_status" >&5
+ echo "$as_me:11202: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Hcurses_initscr=yes
else
@@ -11195,22 +11210,23 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11198: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:11213: 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
- # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
- LIBS="-lHcurses $LIBS"
- CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
- ac_cv_func_initscr=yes
+ # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+ LIBS="-lHcurses $LIBS"
+ CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+ ac_cv_func_initscr=yes
fi
fi
+ fi
;;
linux*)
- case `arch` in
+ case `arch 2>/dev/null` in
x86_64)
if test -d /lib64
then
@@ -11234,7 +11250,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}:11237: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11253: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11263,7 +11279,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}:11266: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11282: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11294,7 +11310,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}:11297: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11313: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11306,7 +11322,9 @@ fi
esac
;;
sunos3*|sunos4*)
- if test -d /usr/5lib ; then
+ if test "x$cf_cv_screen" = "xcurses_5lib"
+ then
+ if test -d /usr/5lib ; then
if test -n "/usr/5lib" ; then
for cf_add_libdir in /usr/5lib
@@ -11327,7 +11345,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}:11330: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11348: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11335,7 +11353,8 @@ echo "${as_me:-configure}:11330: testing adding $cf_add_libdir to library-path .
done
fi
- LIBS="-lcurses -ltermcap $LIBS"
+ LIBS="-lcurses -ltermcap $LIBS"
+ fi
fi
ac_cv_func_initscr=yes
;;
@@ -11355,13 +11374,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:11358: checking for tgoto" >&5
+ echo "$as_me:11377: 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 11364 "configure"
+#line 11383 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tgoto (); below. */
@@ -11392,16 +11411,16 @@ f = tgoto;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11414: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11398: \$? = $ac_status" >&5
+ echo "$as_me:11417: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11401: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11420: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11404: \$? = $ac_status" >&5
+ echo "$as_me:11423: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_tgoto=yes
else
@@ -11411,7 +11430,7 @@ ac_cv_func_tgoto=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11414: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:11433: 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
@@ -11420,7 +11439,7 @@ else
for cf_term_lib in $cf_check_list termcap termlib unknown
do
as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:11423: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:11442: 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
@@ -11428,7 +11447,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_term_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11431 "configure"
+#line 11450 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11447,16 +11466,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11469: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11453: \$? = $ac_status" >&5
+ echo "$as_me:11472: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11456: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11475: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11459: \$? = $ac_status" >&5
+ echo "$as_me:11478: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -11467,7 +11486,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11470: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11489: 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
@@ -11482,7 +11501,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:11485: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:11504: 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
@@ -11490,7 +11509,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_curs_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11493 "configure"
+#line 11512 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11509,16 +11528,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11531: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11515: \$? = $ac_status" >&5
+ echo "$as_me:11534: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11518: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11537: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11521: \$? = $ac_status" >&5
+ echo "$as_me:11540: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -11529,23 +11548,23 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11532: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11551: 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:11539: error: no curses library found" >&5
+ test $cf_curs_lib = unknown && { { echo "$as_me:11558: 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:11545: checking if we can link with $cf_curs_lib library" >&5
+ echo "$as_me:11564: 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 11548 "configure"
+#line 11567 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11557,16 +11576,16 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11579: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11563: \$? = $ac_status" >&5
+ echo "$as_me:11582: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11566: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11585: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11569: \$? = $ac_status" >&5
+ echo "$as_me:11588: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11575,18 +11594,18 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:11578: result: $cf_result" >&5
+ echo "$as_me:11597: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
- test $cf_result = no && { { echo "$as_me:11580: error: Cannot link curses library" >&5
+ test $cf_result = no && { { echo "$as_me:11599: 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:11586: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo "$as_me:11605: 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 11589 "configure"
+#line 11608 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11598,16 +11617,16 @@ initscr(); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11620: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11604: \$? = $ac_status" >&5
+ echo "$as_me:11623: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11607: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11626: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11610: \$? = $ac_status" >&5
+ echo "$as_me:11629: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=no
else
@@ -11616,7 +11635,7 @@ cat conftest.$ac_ext >&5
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11619 "configure"
+#line 11638 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -11628,16 +11647,16 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11650: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11634: \$? = $ac_status" >&5
+ echo "$as_me:11653: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11637: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11656: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11640: \$? = $ac_status" >&5
+ echo "$as_me:11659: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -11649,7 +11668,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:11652: result: $cf_result" >&5
+ echo "$as_me:11671: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
fi
fi
@@ -11659,7 +11678,7 @@ fi
cf_all_widgets=yes
-echo "$as_me:11662: checking if you want extra dialogs" >&5
+echo "$as_me:11681: 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.
@@ -11669,7 +11688,7 @@ if test "${enable_extras+set}" = set; then
else
enableval=yes
fi;
-echo "$as_me:11672: result: $enableval" >&5
+echo "$as_me:11691: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
cf_all_widgets=yes
@@ -11677,7 +11696,7 @@ else
cf_all_widgets=no
fi
-echo "$as_me:11680: checking if you want config-file support" >&5
+echo "$as_me:11699: 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.
@@ -11687,7 +11706,7 @@ if test "${enable_rc_file+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11690: result: $enableval" >&5
+echo "$as_me:11709: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS rc\$o"
@@ -11699,7 +11718,7 @@ else
:
fi
-echo "$as_me:11702: checking if you want Xdialog-style dialogs" >&5
+echo "$as_me:11721: 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.
@@ -11709,7 +11728,7 @@ if test "${enable_Xdialog+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11712: result: $enableval" >&5
+echo "$as_me:11731: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o"
@@ -11721,7 +11740,7 @@ else
:
fi
-echo "$as_me:11724: checking if you want the form dialog" >&5
+echo "$as_me:11743: 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.
@@ -11731,7 +11750,7 @@ if test "${enable_form+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11734: result: $enableval" >&5
+echo "$as_me:11753: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS formbox\$o"
@@ -11743,7 +11762,7 @@ else
:
fi
-echo "$as_me:11746: checking if you want the gauge dialog" >&5
+echo "$as_me:11765: 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.
@@ -11753,7 +11772,7 @@ if test "${enable_gauge+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11756: result: $enableval" >&5
+echo "$as_me:11775: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o"
@@ -11765,7 +11784,7 @@ else
:
fi
-echo "$as_me:11768: checking if you want the tailbox dialog" >&5
+echo "$as_me:11787: 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.
@@ -11775,7 +11794,7 @@ if test "${enable_tailbox+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11778: result: $enableval" >&5
+echo "$as_me:11797: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS tailbox\$o"
@@ -11787,7 +11806,7 @@ else
:
fi
-echo "$as_me:11790: checking if you want the mixedform dialog" >&5
+echo "$as_me:11809: 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.
@@ -11797,7 +11816,7 @@ if test "${enable_mixedform+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11800: result: $enableval" >&5
+echo "$as_me:11819: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS mixedform\$o"
@@ -11809,7 +11828,7 @@ else
:
fi
-echo "$as_me:11812: checking if you want the mixedgauge dialog" >&5
+echo "$as_me:11831: 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.
@@ -11819,7 +11838,7 @@ if test "${enable_mixedgauge+set}" = set; then
else
enableval=$cf_all_widgets
fi;
-echo "$as_me:11822: result: $enableval" >&5
+echo "$as_me:11841: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
EXTRAOBJS="$EXTRAOBJS mixedgauge\$o"
@@ -11831,7 +11850,7 @@ else
:
fi
-echo "$as_me:11834: checking if you want the wide-curses features" >&5
+echo "$as_me:11853: 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.
@@ -11841,7 +11860,7 @@ if test "${enable_widec+set}" = set; then
else
enableval=$cf_wide_curses
fi;
-echo "$as_me:11844: result: $enableval" >&5
+echo "$as_me:11863: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" != no ; then
cat >>confdefs.h <<\EOF
@@ -11852,13 +11871,13 @@ else
:
fi
-echo "$as_me:11855: checking for ANSI C header files" >&5
+echo "$as_me:11874: 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 11861 "configure"
+#line 11880 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -11866,13 +11885,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:11869: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11888: \"$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:11875: \$? = $ac_status" >&5
+ echo "$as_me:11894: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11894,7 +11913,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 11897 "configure"
+#line 11916 "configure"
#include "confdefs.h"
#include <string.h>
@@ -11912,7 +11931,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 11915 "configure"
+#line 11934 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -11933,7 +11952,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11936 "configure"
+#line 11955 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -11959,15 +11978,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11981: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11965: \$? = $ac_status" >&5
+ echo "$as_me:11984: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11967: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11986: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11970: \$? = $ac_status" >&5
+ echo "$as_me:11989: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -11980,7 +11999,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:11983: result: $ac_cv_header_stdc" >&5
+echo "$as_me:12002: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -11990,13 +12009,13 @@ EOF
fi
-echo "$as_me:11993: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:12012: 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 11999 "configure"
+#line 12018 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -12012,16 +12031,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12034: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12018: \$? = $ac_status" >&5
+ echo "$as_me:12037: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12021: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12040: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12024: \$? = $ac_status" >&5
+ echo "$as_me:12043: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -12031,7 +12050,7 @@ ac_cv_header_time=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12034: result: $ac_cv_header_time" >&5
+echo "$as_me:12053: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -12044,13 +12063,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:12047: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:12066: 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 12053 "configure"
+#line 12072 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -12065,16 +12084,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12087: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12071: \$? = $ac_status" >&5
+ echo "$as_me:12090: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12074: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12093: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12077: \$? = $ac_status" >&5
+ echo "$as_me:12096: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -12084,7 +12103,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12087: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12106: 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
@@ -12097,7 +12116,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:12100: checking for opendir in -ldir" >&5
+ echo "$as_me:12119: 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
@@ -12105,7 +12124,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12108 "configure"
+#line 12127 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12124,16 +12143,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12146: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12130: \$? = $ac_status" >&5
+ echo "$as_me:12149: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12133: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12152: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12136: \$? = $ac_status" >&5
+ echo "$as_me:12155: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
else
@@ -12144,14 +12163,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12147: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:12166: 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:12154: checking for opendir in -lx" >&5
+ echo "$as_me:12173: 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
@@ -12159,7 +12178,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12162 "configure"
+#line 12181 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12178,16 +12197,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12200: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12184: \$? = $ac_status" >&5
+ echo "$as_me:12203: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12187: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12206: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12190: \$? = $ac_status" >&5
+ echo "$as_me:12209: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
else
@@ -12198,7 +12217,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12201: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:12220: 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"
@@ -12209,23 +12228,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:12212: checking for $ac_header" >&5
+echo "$as_me:12231: 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 12218 "configure"
+#line 12237 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12222: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12241: \"$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:12228: \$? = $ac_status" >&5
+ echo "$as_me:12247: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12244,7 +12263,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12247: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12266: 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
@@ -12254,7 +12273,7 @@ EOF
fi
done
-echo "$as_me:12257: checking for term.h" >&5
+echo "$as_me:12276: 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
@@ -12262,12 +12281,20 @@ else
# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
# for <term.h> if we do not find the variant.
-for cf_header in \
- `echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
- term.h
+
+cf_header_list="term.h ncurses/term.h ncursesw/term.h"
+
+case ${cf_cv_ncurses_header:-curses.h} in #(vi
+*/*)
+ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
+ cf_header_list="$cf_header_item $cf_header_list"
+ ;;
+esac
+
+for cf_header in $cf_header_list
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12270 "configure"
+#line 12297 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -12281,16 +12308,16 @@ WINDOW *x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12311: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12287: \$? = $ac_status" >&5
+ echo "$as_me:12314: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12317: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12293: \$? = $ac_status" >&5
+ echo "$as_me:12320: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -12309,7 +12336,7 @@ no)
for cf_header in ncurses/term.h ncursesw/term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12312 "configure"
+#line 12339 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -12327,16 +12354,16 @@ WINDOW *x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12357: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12333: \$? = $ac_status" >&5
+ echo "$as_me:12360: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12336: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12363: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12339: \$? = $ac_status" >&5
+ echo "$as_me:12366: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -12351,7 +12378,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
esac
fi
-echo "$as_me:12354: result: $cf_cv_term_header" >&5
+echo "$as_me:12381: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
case $cf_cv_term_header in #(vi
@@ -12375,13 +12402,13 @@ EOF
;;
esac
-echo "$as_me:12378: checking return type of signal handlers" >&5
+echo "$as_me:12405: 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 12384 "configure"
+#line 12411 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -12403,16 +12430,16 @@ int i;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12433: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12409: \$? = $ac_status" >&5
+ echo "$as_me:12436: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12412: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12439: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12415: \$? = $ac_status" >&5
+ echo "$as_me:12442: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
else
@@ -12422,7 +12449,7 @@ ac_cv_type_signal=int
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12425: result: $ac_cv_type_signal" >&5
+echo "$as_me:12452: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
cat >>confdefs.h <<EOF
@@ -12447,13 +12474,13 @@ wctomb \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12450: checking for $ac_func" >&5
+echo "$as_me:12477: 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 12456 "configure"
+#line 12483 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12484,16 +12511,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12514: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12490: \$? = $ac_status" >&5
+ echo "$as_me:12517: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12493: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12520: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12496: \$? = $ac_status" >&5
+ echo "$as_me:12523: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12503,7 +12530,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12506: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12533: 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
@@ -12513,14 +12540,14 @@ EOF
fi
done
-echo "$as_me:12516: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12543: 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 12523 "configure"
+#line 12550 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -12542,23 +12569,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12548: \$? = $ac_status" >&5
+ echo "$as_me:12575: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12551: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12578: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12554: \$? = $ac_status" >&5
+ echo "$as_me:12581: \$? = $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 12561 "configure"
+#line 12588 "configure"
#include "confdefs.h"
#define _XOPEN_SOURCE_EXTENDED
@@ -12580,16 +12607,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12586: \$? = $ac_status" >&5
+ echo "$as_me:12613: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12589: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12616: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12592: \$? = $ac_status" >&5
+ echo "$as_me:12619: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_xopen_extension=yes
else
@@ -12601,10 +12628,98 @@ 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:12604: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:12631: 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 $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
+else
+
+# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look
+# for <unctrl.h> if we do not find the variant.
+
+cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
+
+case ${cf_cv_ncurses_header:-curses.h} in #(vi
+*/*)
+ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
+ cf_header_list="$cf_header_item $cf_header_list"
+ ;;
+esac
+
+for cf_header in $cf_header_list
+do
+ cat >conftest.$ac_ext <<_ACEOF
+#line 12656 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header:-curses.h}>
+#include <${cf_header}>
+int
+main ()
+{
+WINDOW *x
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:12673: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:12676: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:12679: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_unctrl_header=$cf_header
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_unctrl_header=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+case $cf_cv_unctrl_header in #(vi
+no)
+ { echo "$as_me:12693: 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 "${ECHO_T}$cf_cv_unctrl_header" >&6
+
+case $cf_cv_unctrl_header in #(vi
+unctrl.h) #(vi
+ cat >>confdefs.h <<\EOF
+#define HAVE_UNCTRL_H 1
+EOF
+
+ ;;
+ncurses/unctrl.h) #(vi
+ cat >>confdefs.h <<\EOF
+#define HAVE_NCURSES_UNCTRL_H 1
+EOF
+
+ ;;
+ncursesw/unctrl.h)
+ cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_UNCTRL_H 1
+EOF
+
+ ;;
+esac
+
for cf_func in \
flushinp \
getattrs \
@@ -12620,16 +12735,17 @@ getparx \
getpary \
getparyx \
use_default_colors \
+wchgat \
wget_wch \
do
cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- echo "$as_me:12629: checking for ${cf_func}" >&5
+ echo "$as_me:12745: checking for ${cf_func}" >&5
echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
-echo "${as_me:-configure}:12632: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:12748: testing ${cf_func} ..." 1>&5
if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12638,7 +12754,7 @@ else
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
cat >conftest.$ac_ext <<_ACEOF
-#line 12641 "configure"
+#line 12757 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
@@ -12661,7 +12777,8 @@ main ()
#ifndef ${cf_func}
long foo = (long)(&${cf_func});
-${cf_cv_main_return:-return}(foo == 0);
+if (foo + 1234 > 5678)
+ ${cf_cv_main_return:-return}(foo);
#endif
;
@@ -12669,16 +12786,16 @@ ${cf_cv_main_return:-return}(foo == 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12789: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12675: \$? = $ac_status" >&5
+ echo "$as_me:12792: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12795: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12681: \$? = $ac_status" >&5
+ echo "$as_me:12798: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -12694,7 +12811,7 @@ fi
# use the computed/retrieved cache-value:
eval 'cf_result=$cf_cv_func_'$cf_func
- echo "$as_me:12697: result: $cf_result" >&5
+ echo "$as_me:12814: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result != no; then
cat >>confdefs.h <<EOF
@@ -12704,13 +12821,13 @@ EOF
fi
done
-echo "$as_me:12707: checking for start_color" >&5
+echo "$as_me:12824: 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 12713 "configure"
+#line 12830 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char start_color (); below. */
@@ -12741,16 +12858,16 @@ f = start_color;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12861: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12747: \$? = $ac_status" >&5
+ echo "$as_me:12864: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12750: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12867: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12753: \$? = $ac_status" >&5
+ echo "$as_me:12870: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_start_color=yes
else
@@ -12760,7 +12877,7 @@ ac_cv_func_start_color=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12763: result: $ac_cv_func_start_color" >&5
+echo "$as_me:12880: 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
@@ -12769,14 +12886,14 @@ EOF
fi
-echo "$as_me:12772: checking for chtype typedef" >&5
+echo "$as_me:12889: 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 12779 "configure"
+#line 12896 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -12788,16 +12905,16 @@ chtype foo
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12794: \$? = $ac_status" >&5
+ echo "$as_me:12911: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12797: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12914: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12800: \$? = $ac_status" >&5
+ echo "$as_me:12917: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_chtype_decl=yes
else
@@ -12807,21 +12924,21 @@ cf_cv_chtype_decl=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12810: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:12927: 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:12817: checking if chtype is scalar or struct" >&5
+ echo "$as_me:12934: 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 12824 "configure"
+#line 12941 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -12833,16 +12950,16 @@ chtype foo; long x = foo
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12839: \$? = $ac_status" >&5
+ echo "$as_me:12956: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12842: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12959: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12845: \$? = $ac_status" >&5
+ echo "$as_me:12962: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_chtype_type=scalar
else
@@ -12852,7 +12969,7 @@ cf_cv_chtype_type=struct
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12855: result: $cf_cv_chtype_type" >&5
+echo "$as_me:12972: 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
@@ -12862,7 +12979,7 @@ EOF
fi
fi
-echo "$as_me:12865: checking for wide alternate character set array" >&5
+echo "$as_me:12982: 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
@@ -12872,7 +12989,7 @@ else
for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12875 "configure"
+#line 12992 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
@@ -12888,16 +13005,16 @@ void *foo = &($name['k'])
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13008: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12894: \$? = $ac_status" >&5
+ echo "$as_me:13011: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12897: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13014: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12900: \$? = $ac_status" >&5
+ echo "$as_me:13017: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_map=$name
break
@@ -12908,14 +13025,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:12911: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:13028: 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:12918: checking for wide alternate character constants" >&5
+echo "$as_me:13035: 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
@@ -12925,7 +13042,7 @@ cf_cv_curses_wacs_symbols=no
if test "$cf_cv_curses_wacs_map" != unknown
then
cat >conftest.$ac_ext <<_ACEOF
-#line 12928 "configure"
+#line 13045 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
@@ -12942,16 +13059,16 @@ cchar_t *foo = WACS_PLUS;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13062: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12948: \$? = $ac_status" >&5
+ echo "$as_me:13065: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12951: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13068: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12954: \$? = $ac_status" >&5
+ echo "$as_me:13071: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_symbols=yes
else
@@ -12961,7 +13078,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12964 "configure"
+#line 13081 "configure"
#include "confdefs.h"
#ifndef _XOPEN_SOURCE_EXTENDED
@@ -12977,16 +13094,16 @@ cchar_t *foo = WACS_PLUS
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13097: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12983: \$? = $ac_status" >&5
+ echo "$as_me:13100: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13103: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12989: \$? = $ac_status" >&5
+ echo "$as_me:13106: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curses_wacs_symbols=yes
else
@@ -12997,7 +13114,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
fi
-echo "$as_me:13000: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:13117: 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
@@ -13007,23 +13124,23 @@ EOF
for ac_header in sys/wait.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13010: checking for $ac_header" >&5
+echo "$as_me:13127: 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 13016 "configure"
+#line 13133 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13020: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13137: \"$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:13026: \$? = $ac_status" >&5
+ echo "$as_me:13143: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13042,7 +13159,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13045: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13162: 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
@@ -13063,23 +13180,23 @@ else
for ac_header in wait.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13066: checking for $ac_header" >&5
+echo "$as_me:13183: 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 13072 "configure"
+#line 13189 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13076: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13193: \"$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:13082: \$? = $ac_status" >&5
+ echo "$as_me:13199: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13098,7 +13215,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13101: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13218: 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
@@ -13111,23 +13228,23 @@ done
for ac_header in waitstatus.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13114: checking for $ac_header" >&5
+echo "$as_me:13231: 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 13120 "configure"
+#line 13237 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13124: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13241: \"$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:13130: \$? = $ac_status" >&5
+ echo "$as_me:13247: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13146,7 +13263,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13149: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13266: 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
@@ -13168,14 +13285,14 @@ cf_wait_headers="$cf_wait_headers
fi
fi
-echo "$as_me:13171: checking for union wait" >&5
+echo "$as_me:13288: 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 13178 "configure"
+#line 13295 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13191,16 +13308,16 @@ int x;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13311: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13197: \$? = $ac_status" >&5
+ echo "$as_me:13314: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13200: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13317: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13203: \$? = $ac_status" >&5
+ echo "$as_me:13320: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_unionwait=no
echo compiles ok w/o union wait 1>&5
@@ -13210,7 +13327,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13213 "configure"
+#line 13330 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13230,16 +13347,16 @@ union wait x;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13350: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13236: \$? = $ac_status" >&5
+ echo "$as_me:13353: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13239: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13356: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13242: \$? = $ac_status" >&5
+ echo "$as_me:13359: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_unionwait=yes
echo compiles ok with union wait and possibly macros too 1>&5
@@ -13254,7 +13371,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:13257: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:13374: 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
@@ -13262,14 +13379,14 @@ EOF
if test $cf_cv_type_unionwait = yes; then
- echo "$as_me:13265: checking if union wait can be used as wait-arg" >&5
+ echo "$as_me:13382: 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 13272 "configure"
+#line 13389 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13281,16 +13398,16 @@ union wait x; wait(&x)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13401: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13287: \$? = $ac_status" >&5
+ echo "$as_me:13404: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13290: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13407: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13293: \$? = $ac_status" >&5
+ echo "$as_me:13410: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_arg_union_wait=yes
else
@@ -13302,20 +13419,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
- echo "$as_me:13305: result: $cf_cv_arg_union_wait" >&5
+ echo "$as_me:13422: 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:13311: checking if union wait can be used as waitpid-arg" >&5
+ echo "$as_me:13428: 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 13318 "configure"
+#line 13435 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -13327,16 +13444,16 @@ union wait x; waitpid(0, &x, 0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13447: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13333: \$? = $ac_status" >&5
+ echo "$as_me:13450: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13336: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13453: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13339: \$? = $ac_status" >&5
+ echo "$as_me:13456: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_arg_union_waitpid=yes
else
@@ -13348,7 +13465,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
- echo "$as_me:13351: result: $cf_cv_arg_union_waitpid" >&5
+ echo "$as_me:13468: 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
@@ -13356,14 +13473,14 @@ EOF
fi
-echo "$as_me:13359: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13476: 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 13366 "configure"
+#line 13483 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -13380,23 +13497,23 @@ mbstate_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13500: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13386: \$? = $ac_status" >&5
+ echo "$as_me:13503: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13389: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13506: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13392: \$? = $ac_status" >&5
+ echo "$as_me:13509: \$? = $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 13399 "configure"
+#line 13516 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -13414,16 +13531,16 @@ mbstate_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13534: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13420: \$? = $ac_status" >&5
+ echo "$as_me:13537: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13423: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13540: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13426: \$? = $ac_status" >&5
+ echo "$as_me:13543: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=yes
else
@@ -13435,7 +13552,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:13438: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13555: result: $cf_cv_mbstate_t" >&5
echo "${ECHO_T}$cf_cv_mbstate_t" >&6
if test "$cf_cv_mbstate_t" = yes ; then
@@ -13458,7 +13575,7 @@ PACKAGE_CONFIG=dlg_config.h
EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
cat >conftest.$ac_ext <<_ACEOF
-#line 13461 "configure"
+#line 13578 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -13470,16 +13587,16 @@ setlocale(LC_ALL, "")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13590: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13476: \$? = $ac_status" >&5
+ echo "$as_me:13593: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13479: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13596: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13482: \$? = $ac_status" >&5
+ echo "$as_me:13599: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
#define HAVE_SETLOCALE 1
@@ -13492,7 +13609,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LD_RPATH_OPT=
-echo "$as_me:13495: checking for an rpath option" >&5
+echo "$as_me:13612: 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
@@ -13505,7 +13622,7 @@ irix*) #(vi
linux*|gnu*|k*bsd*-gnu) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
-openbsd[2-9].*) #(vi
+openbsd[2-9].*|mirbsd*) #(vi
LD_RPATH_OPT="-Wl,-rpath,"
;;
freebsd*) #(vi
@@ -13523,17 +13640,17 @@ solaris2*) #(vi
*)
;;
esac
-echo "$as_me:13526: result: $LD_RPATH_OPT" >&5
+echo "$as_me:13643: result: $LD_RPATH_OPT" >&5
echo "${ECHO_T}$LD_RPATH_OPT" >&6
case "x$LD_RPATH_OPT" in #(vi
x-R*)
- echo "$as_me:13531: checking if we need a space after rpath option" >&5
+ echo "$as_me:13648: 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 13536 "configure"
+#line 13653 "configure"
#include "confdefs.h"
int
@@ -13545,16 +13662,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13551: \$? = $ac_status" >&5
+ echo "$as_me:13668: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13554: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13671: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13557: \$? = $ac_status" >&5
+ echo "$as_me:13674: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_space=no
else
@@ -13564,14 +13681,14 @@ cf_rpath_space=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
- echo "$as_me:13567: result: $cf_rpath_space" >&5
+ echo "$as_me:13684: 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:13573: checking if rpath should be not be set" >&5
-echo $ECHO_N "checking if rpath should be not be set... $ECHO_C" >&6
+echo "$as_me:13690: 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.
if test "${enable_rpath_hack+set}" = set; then
@@ -13587,21 +13704,21 @@ else
cf_disable_rpath_hack=no
fi;
-echo "$as_me:13590: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:13707: 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:13594: checking for updated LDFLAGS" >&5
+echo "$as_me:13711: 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:13597: result: maybe" >&5
+ echo "$as_me:13714: 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:13604: checking for $ac_word" >&5
+echo "$as_me:13721: 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
@@ -13616,7 +13733,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:13619: found $ac_dir/$ac_word" >&5
+echo "$as_me:13736: found $ac_dir/$ac_word" >&5
break
done
@@ -13624,10 +13741,10 @@ fi
fi
cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
if test -n "$cf_ldd_prog"; then
- echo "$as_me:13627: result: $cf_ldd_prog" >&5
+ echo "$as_me:13744: result: $cf_ldd_prog" >&5
echo "${ECHO_T}$cf_ldd_prog" >&6
else
- echo "$as_me:13630: result: no" >&5
+ echo "$as_me:13747: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13638,8 +13755,10 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
cf_rpath_list="/usr/lib /lib"
if test "$cf_ldd_prog" != no
then
+ cf_rpath_oops=
+
cat >conftest.$ac_ext <<_ACEOF
-#line 13642 "configure"
+#line 13761 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13651,32 +13770,60 @@ printf("Hello");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13773: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13657: \$? = $ac_status" >&5
+ echo "$as_me:13776: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13660: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13779: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13663: \$? = $ac_status" >&5
+ echo "$as_me:13782: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
+ 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`
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ # If we passed the link-test, but get a "not found" on a given library,
+ # this could be due to inept reconfiguration of gcc to make it only
+ # partly honor /usr/local/lib (or whatever). Sometimes this behavior
+ # is intentional, e.g., installing gcc in /usr/bin and suppressing the
+ # /usr/local libraries.
+ if test -n "$cf_rpath_oops"
+ then
+ for cf_rpath_src in $cf_rpath_oops
+ do
+ for cf_rpath_dir in \
+ /usr/local \
+ /usr/pkg \
+ /opt/sfw
+ do
+ if test -f $cf_rpath_dir/lib/$cf_rpath_src
+ 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
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+ fi
+ done
+ done
+ fi
fi
test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me:-configure}:13675: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:13822: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me:-configure}:13679: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:13826: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LDFLAGS
@@ -13713,7 +13860,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-echo "${as_me:-configure}:13716: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:13863: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@@ -13726,11 +13873,11 @@ LDFLAGS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me:-configure}:13729: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:13876: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
-echo "${as_me:-configure}:13733: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:13880: testing ...checking LIBS $LIBS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LIBS
@@ -13767,7 +13914,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-echo "${as_me:-configure}:13770: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:13917: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@@ -13780,11 +13927,11 @@ LIBS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
-echo "${as_me:-configure}:13783: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:13930: testing ...checked LIBS $LIBS ..." 1>&5
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me:-configure}:13787: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:13934: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
fi
@@ -13871,7 +14018,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:13874: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:14021: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -14047,7 +14194,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:14050: error: ambiguous option: $1
+ { { echo "$as_me:14197: 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;}
@@ -14066,7 +14213,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:14069: error: unrecognized option: $1
+ -*) { { echo "$as_me:14216: 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;}
@@ -14116,7 +14263,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:14119: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:14266: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -14407,7 +14554,7 @@ done; }
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:14410: creating $ac_file" >&5
+ { echo "$as_me:14557: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -14425,7 +14572,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:14428: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:14575: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -14438,7 +14585,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:14441: error: cannot find input file: $f" >&5
+ { { echo "$as_me:14588: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -14504,7 +14651,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:14507: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:14654: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -14515,7 +14662,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:14518: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:14665: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -14528,7 +14675,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:14531: error: cannot find input file: $f" >&5
+ { { echo "$as_me:14678: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -14586,7 +14733,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:14589: $ac_file is unchanged" >&5
+ { echo "$as_me:14736: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 5ecd8fbaa33c..2feac7366ebd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.64 2011/03/01 00:59:50 tom Exp $
+dnl $Id: configure.in,v 1.65 2011/06/27 10:42:27 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl ---------------------------------------------------------------------------
dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
@@ -225,6 +225,7 @@ getparx \
getpary \
getparyx \
use_default_colors \
+wchgat \
wget_wch \
)
diff --git a/dialog.1 b/dialog.1
index fc9931168804..8fd4de13ce91 100644
--- a/dialog.1
+++ b/dialog.1
@@ -1,5 +1,5 @@
'\" t
-.\" $Id: dialog.1,v 1.126 2011/03/02 01:24:21 tom Exp $
+.\" $Id: dialog.1,v 1.133 2011/06/29 09:39:29 tom Exp $
.\" Copyright 2005-2010,2011 Thomas E. Dickey
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
.RE
..
.
-.TH \*D 1 "" "$Date: 2011/03/02 01:24:21 $"
+.TH \*D 1 "" "$Date: 2011/06/29 09:39:29 $"
.SH NAME
\*p \- display dialog boxes from shell scripts
.SH SYNOPSIS
@@ -285,8 +285,9 @@ Override the label used for "Extra" buttons.
Note: for inputmenu widgets, this defaults to "Rename".
.
.IP "\fB--help"
-Prints the help message to \fB\*p\fP's output.
-The help message is printed if no options are given.
+Prints the help message to the standard output and exits.
+The help message is also printed if no options are given,
+or if an unrecognized option is given.
.
.IP "\fB--help-button"
Show a help-button after "OK" and "Cancel" buttons,
@@ -307,6 +308,12 @@ after the item-help "HELP" information.
This can be used to reconstruct the state of a checklist after processing
the help request.
.
+.IP "\fB--hfile \fIfilename"
+Display the given file using a textbox when the user presses F1.
+.
+.IP "\fB--hline \fIstring"
+Display the given string centered at the bottom of the widget.
+.
.IP "\fB--ignore"
Ignore options that \fB\*p\fP does not recognize.
Some well-known ones such as "\fB--icon\fP" are ignored anyway,
@@ -385,6 +392,10 @@ See also "\fB--ascii-lines\fR".
.IP "\fB--no-mouse
Do not enable the mouse.
.
+.IP "\fB--no-nl-expand
+Do not convert "\\n" substrings of the message/prompt text into
+literal newlines.
+.
.IP "\fB--no-ok"
.IP "\fB--nook"
Suppress the "OK" button in checklist, inputbox and menu box modes.
@@ -420,8 +431,9 @@ Prints the size of each dialog box to \fB\*p\fP's output.
.IP "\fB--print-version"
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--scrollbar \fIstring"
+.IP "\fB--scrollbar"
For widgets holding a scrollable set of data,
draw a scrollbar on its right-margin.
This does not respond to the mouse.
@@ -501,6 +513,7 @@ string to be displayed at the top of the dialog box.
logs the command-line parameters and
keystrokes 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.
.
.IP "\fB--trim"
@@ -511,7 +524,8 @@ trim literal newlines and repeated blanks from message text.
See also the "\fB--cr-wrap\fR" and "\fB--no-collapse\fR" options.
.
.IP "\fB--version"
-Same as "\fB--print-version\fP".
+Prints \fB\*p\fR's version to the standard output, and exits.
+See also "\fB--print-version\fP".
.
.IP "\fB--visit-items"
Modify the tab-traversal of checklist, radiobox, menubox and inputmenu
@@ -1278,12 +1292,13 @@ also does not work for common options of \*p, such as the gauge box.
original dialog 0.4 program.
.PP
\fBwhiptail\fP's manpage borrows features from \fB\*p\fP, e.g.,
-\fB--default-item\fP, \fB--output-fd\fP,
-but oddly cites only \fB\*p\fP versions up to 0.4 as a source.
+\fB--default-item\fP (2000),
+\fB--output-fd\fP (2002),
+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.
+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/dialog.3 b/dialog.3
index 521684a6121a..62938af92503 100644
--- a/dialog.3
+++ b/dialog.3
@@ -1,4 +1,4 @@
-.\" $Id: dialog.3,v 1.60 2011/03/02 10:19:12 tom Exp $
+.\" $Id: dialog.3,v 1.68 2011/06/29 09:07:36 tom Exp $
.\" Copyright 2005-2010,2011 Thomas E. Dickey
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -21,11 +21,24 @@
.ds l dialog
.ds L Dialog
.ds D DIALOG
+.
+.de ES
+.ne 8
+.IP
+..
+.de EX
+.RS +10
+.nf
+..
+.de EE
+.fi
+.RE
+..
.\" Bulleted paragraph
.de bP
.IP \(bu 4
..
-.TH \*D 3 "" "$Date: 2011/03/02 10:19:12 $"
+.TH \*D 3 "" "$Date: 2011/06/29 09:07:36 $"
.SH NAME
\*l \- widgets and utilities for the \*p program
.SH SYNOPSIS
@@ -66,7 +79,7 @@ Colors and video attributes are categorized and associated with
settings in the configuration file
(see the discussion of \fI$DIALOGRC\fP in \fB\*p\fP(1)).
The \fIDIALOG_ATR(n)\fP macro is used for defining the references
-to the combined color and attribute table \fIdlg_color_table[]\fP.
+to the combined color and attribute table \fBdlg_color_table[]\fP.
.PP
The \fB\*p\fP application passes its command-line parameters
to the widget functions. Some of those parameters are single values,
@@ -85,7 +98,7 @@ These include definitions based on the generated \fI<dlg_config.h>\fP header.
.SH DATA STRUCTURES
All of the global data for the \fB\*l\fP library is stored in
a few structures: \fIDIALOG_STATE\fP, \fIDIALOG_VARS\fP and \fIDIALOG_COLORS\fP.
-The corresponding \fIdialog_state\fP, \fIdialog_vars\fP and \fIdlg_color_table\fP
+The corresponding \fBdialog_state\fP, \fBdialog_vars\fP and \fBdlg_color_table\fP
global variables should be initialized to zeros,
and then populated with the data to use.
A few of these must be nonzero for the corresponding widgets to function.
@@ -133,7 +146,7 @@ prefer to write results to the standard output,
e.g., by using the "\fB--stdout\fP" option.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_STATE.output_count
-This is incremented by \fIdlg_does_output\fP,
+This is incremented by \fBdlg_does_output\fP,
which is called by each widget that writes text to the output.
The \fB\*p\fP application uses that to decide if it should
also write a separator, i.e.,
@@ -205,12 +218,15 @@ suppress shadows that would be drawn to the right and bottom of each dialog box.
This corresponds to the command-line option "\fB--visit-items\fP".
.\" ---------------------------------------------------------------------------
.PP
-The \fB\*p\fP application resets the \fIdialog_vars\fP data before
+The \fB\*p\fP application resets the \fBdialog_vars\fP data before
accepting options to invoke each widget.
Most of the \fIDIALOG_VARS\fP members are set directly from \fB\*p\fP's
command-line options:
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.ascii_lines
+This corresponds to the command-line option "\fB--ascii-lines\fP.
+It causes line-drawing to be done with ASCII characters, e.g., "+" and "-".
+See \fIDIALOG_VARS.no_lines\fP.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.backtitle
This corresponds to the command-line option "\fB--backtitle\fP \fIbacktitle\fP".
@@ -344,10 +360,20 @@ and the item-help text will be written to \fB\*p\fP's output after the token "HE
Otherwise, the return status will indicate that the Help button was pressed,
and no message printed.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.help_file
+This corresponds to the command-line option "\fB--hfile\fP \fIstring\fP".
+The given filename is passed to \fBdialog_helpfile\fP when the user
+presses F1.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.help_label
This corresponds to the command-line option "\fB--help-label\fP \fIstring\fP".
The given string overrides the label used for "Help" buttons.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.help_line
+This corresponds to the command-line option "\fB--hline\fP \fIstring\fP".
+The given string is displayed in the bottom of dialog windows,
+like a subtitle.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.help_status
This corresponds to the command-line option "\fB--help-status\fP".
If true, and the the help-button is selected,
@@ -391,6 +417,10 @@ This corresponds to the command-line option "\fB--insecure\fP".
If true, make the password widget friendlier but less secure,
by echoing asterisks for each character.
.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.in_helpfile
+This variable is used to prevent \fBdialog_helpfile\fP from showing
+anything, e.g., if F1 were pressed within a help-file display.
+.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.item_help
This corresponds to the command-line option "\fB--item-help\fP".
If true,
@@ -423,6 +453,14 @@ This corresponds to the command-line option "\fB--no-label\fP \fIstring\fP".
The given string overrides the label used for "No" buttons.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.no_lines
+This corresponds to the command-line option "\fB--no-lines\fP.
+It suppresses line-drawing.
+See \fIDIALOG_VARS.ascii_lines\fP.
+.\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.no_nl_expand
+This corresponds to the command-line option "\fB--no-nl-expand\fP".
+If false, \fBdlg_trim_string\fP converts literal "\\n" substrings
+in a message into newlines.
.\" ---------------------------------------------------------------------------
.IP \fIDIALOG_VARS.nocancel
This corresponds to the command-line option "\fB--no-cancel\fP".
@@ -537,24 +575,31 @@ Other parameters depend on the box type.
.IP \fBdialog_calendar
implements the "\fB--calendar\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP subtitle
+.TP 5
+.B const char * \fIsubtitle
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the height excluding the fixed-height calendar grid.
-.IP width
+.TP 5
+.B int \fIwidth
is the overall width of the box,
which is adjusted up to the calendar grid's minimum width if needed.
-.IP day
+.TP 5
+.B int \fIday
is the initial day of the week shown,
counting zero as Sunday.
If the value is negative, the current day of the week is used.
-.IP month
+.TP 5
+.B int \fImonth
is the initial month of the year shown,
counting one as January.
If the value is negative, the current month of the year is used.
-.IP year
+.TP 5
+.B int \fIyear
is the initial year shown.
If the value is negative, the current year is used.
.RE
@@ -563,22 +608,29 @@ If the value is negative, the current year is used.
implements the "\fB--checklist\fP" and "\fB--radiolist\fP" options
depending on the \fIflag\fP parameter.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is adjusted to use the available screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is adjusted to use the available screen size.
-.IP list_height
+.TP 5
+.B int \fIlist_height
is the minimum height to reserve for displaying the list.
If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
-.IP item_no
+.TP 5
+.B int \fIitem_no
is the number of rows in \fIitems\fP.
-.IP items
+.TP 5
+.B int \fIitems
is an array of strings which is viewed either as a list of rows
.RS
\fItag item status \fR
@@ -589,7 +641,7 @@ or
\fItag item status help\fR
.RE
.IP
-depending on whether \fIdialog_vars.item_help\fP is set.
+depending on whether \fBdialog_vars.item_help\fP is set.
.IP flag
is either \fIFLAG_CHECK\fP, for checklists,
or \fIFLAG_RADIO\fP for radiolists.
@@ -598,15 +650,19 @@ or \fIFLAG_RADIO\fP for radiolists.
.IP \fBdialog_dselect
implements the "\fB--dselect\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP path
+.TP 5
+.B const char * \fIpath
is the preselected value to show in the input-box,
which is used also to set the directory- and file-windows.
-.IP height
+.TP 5
+.B int \fIheight
is the height excluding the minimum needed to show the dialog box framework.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
.RE
@@ -614,14 +670,18 @@ If zero, the height is based on the screen size.
.IP \fBdialog_editbox
implements the "\fB--editbox\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP file
+.TP 5
+.B const char * \fIfile
is the name of the file from which to read.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is adjusted to use the available screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is adjusted to use the available screen size.
.RE
@@ -629,22 +689,29 @@ If zero, the height is adjusted to use the available screen size.
.IP \fBdialog_form
implements the "\fB--form\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is adjusted to use the available screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is adjusted to use the available screen size.
-.IP form_height
+.TP 5
+.B int \fIform_height
is the minimum height to reserve for displaying the list.
If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
-.IP item_no
+.TP 5
+.B int \fIitem_no
is the number of rows in \fIitems\fP.
-.IP items
+.TP 5
+.B int \fIitems
is an array of strings which is viewed either as a list of rows
.RS
\fIName NameY NameX Text TextY TextX FLen ILen\fR
@@ -655,39 +722,53 @@ or
\fIName NameY NameX Text TextY TextX FLen ILen Help\fR
.RE
.IP
-depending on whether \fIdialog_vars.item_help\fP is set.
+depending on whether \fBdialog_vars.item_help\fP is set.
.RE
.\" ************************************************************************
.IP \fBdialog_fselect
implements the "\fB--fselect\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP path
+.TP 5
+.B const char * \fIpath
is the preselected value to show in the input-box,
which is used also to set the directory- and file-windows.
-.IP height
+.TP 5
+.B int \fIheight
is the height excluding the minimum needed to show the dialog box framework.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
.RE
.\" ************************************************************************
.IP \fBdialog_gauge
implements the "\fB--gauge\fP" option.
+Alternatively, a simpler or customized gauge widget can be
+setup using
+\fBdlg_allocate_gauge\fP,
+\fBdlg_update_gauge\fP and
+\fBdlg_free_gauge\fP.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.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.
.RE
.\" ************************************************************************
@@ -695,43 +776,79 @@ is the percentage to show in the progress bar.
implements the "\fB--inputbox\fP" or
"\fB--password\fP" option, depending on the value of \fIpassword\fP.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP init
+.TP 5
+.B const char * \fIinit
is the initial value of the input box, whose length is taken into account
when auto-sizing the width of the dialog box.
-.IP password
+.TP 5
+.B int \fIpassword
if true, causes typed input to be echoed as asterisks.
.RE
.\" ************************************************************************
+.IP \fBdialog_helpfile
+implements the "\fB--hfile\fP" option.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title on the top of the widget.
+.TP 5
+.B const char * \fIfile
+is the name of a file containing the text to display.
+This function is internally bound to F1 (function key "1"),
+passing \fBdialog_vars.help_file\fP as a parameter.
+The \fBdialog\fP program sets that variable when the \fB--hfile\fP option
+is given.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is based on the screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is based on the screen size.
+.RE
+.\" ************************************************************************
.IP \fBdialog_menu
implements the "\fB--menu\fP" or "\fB--inputmenu\fP" option
-depending on whether \fIdialog_vars.input_menu\fP is set.
+depending on whether \fBdialog_vars.input_menu\fP is set.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP menu_height
+.TP 5
+.B int \fImenu_height
is the minimum height to reserve for displaying the list.
If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
-.IP item_no
+.TP 5
+.B int \fIitem_no
is the number of rows in \fIitems\fP.
-.IP items
+.TP 5
+.B int \fIitems
is an array of strings which is viewed either as a list of rows
.RS
\fItag item\fR
@@ -742,28 +859,35 @@ or
\fItag item help\fR
.RE
.IP
-depending on whether \fIdialog_vars.item_help\fP is set.
+depending on whether \fBdialog_vars.item_help\fP is set.
.RE
.\" ************************************************************************
.IP \fBdialog_mixedform
implements the "\fB--mixedform\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is adjusted to use the available screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is adjusted to use the available screen size.
-.IP form_height
+.TP 5
+.B int \fIform_height
is the minimum height to reserve for displaying the list.
If zero, it is computed based on the given \fIheight\fP and \fIwidth\fP.
-.IP item_no
+.TP 5
+.B int \fIitem_no
is the number of rows in \fIitems\fP.
-.IP items
+.TP 5
+.B int \fIitems
is an array of strings which is viewed either as a list of rows
.RS
\fIName NameY NameX Text TextY TextX FLen ILen Ityp\fR
@@ -774,27 +898,33 @@ or
\fIName NameY NameX Text TextY TextX FLen ILen Ityp Help\fR
.RE
.IP
-depending on whether \fIdialog_vars.item_help\fP is set.
+depending on whether \fBdialog_vars.item_help\fP is set.
.RE
.\" ************************************************************************
.IP \fBdialog_mixedgauge
implements the "\fB--mixedgauge\fP" option
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the caption text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
.IP percent
is the percentage to show in the progress bar.
-.IP item_no
+.TP 5
+.B int \fIitem_no
is the number of rows in \fIitems\fP.
-.IP items
+.TP 5
+.B int \fIitems
is an array of strings which is viewed as a list of \fItag\fP and \fIitem\fP values.
The \fItag\fP values are listed, one per row, in the list at the top of
the widget.
@@ -832,17 +962,22 @@ Other strings are displayed as is.
implements the "\fB--msgbox\fP" or "\fB--infobox\fP" option
depending on whether \fIpauseopt\fP is set.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP pauseopt
+.TP 5
+.B int \fIpauseopt
if true, an "OK" button will be shown,
and the dialog will wait for it to complete.
With an "OK" button, it is denoted a "msgbox",
@@ -852,35 +987,45 @@ without an "OK" button, it is denoted an "infobox".
.IP \fBdialog_pause
implements the "\fB--pause\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP seconds
+.TP 5
+.B int \fIseconds
is the timeout to use for the progress bar.
.RE
.\" ************************************************************************
.IP \fBdialog_prgbox
implements the "\fB--prgbox\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
If empty or null, no prompt is shown.
-.IP command
+.TP 5
+.B const char * \fIcommand
is the name of the command to execute.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP pauseopt
+.TP 5
+.B int \fIpauseopt
if true, an "OK" button will be shown,
and the dialog will wait for it to complete.
.RE
@@ -888,15 +1033,19 @@ and the dialog will wait for it to complete.
.IP \fBdialog_progressbox
implements the "\fB--progressbox\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
If empty or null, no prompt is shown.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
.RE
@@ -905,19 +1054,24 @@ If zero, the height is based on the screen size.
implements the "\fB--tailbox\fP" or "\fB--tailboxbg\fP" option
depending on whether \fIbg_task\fP is set.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP file
+.TP 5
+.B const char * \fIfile
is the name of the file to display in the dialog.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP bg_task
+.TP 5
+.B int \fIbg_task
if true,
-the window is added to the callback list in \fIdialog_state\fP,
+the window is added to the callback list in \fBdialog_state\fP,
and the application will poll for the window to be updated.
Otherwise an "OK" button is added to the window,
and it will be closed when the button is activated.
@@ -926,14 +1080,18 @@ and it will be closed when the button is activated.
.IP \fBdialog_textbox
implements the "\fB--textbox\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP file
+.TP 5
+.B const char * \fIfile
is the name of the file to display in the dialog.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
.RE
@@ -941,25 +1099,32 @@ If zero, the height is based on the screen size.
.IP \fBdialog_timebox
implements the "\fB--timebox\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP subtitle
+.TP 5
+.B const char * \fIsubtitle
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP hour
+.TP 5
+.B int \fIhour
is the initial hour shown.
If the value is negative, the current hour is used.
Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 24.
-.IP minute
+.TP 5
+.B int \fIminute
is the initial minute shown.
If the value is negative, the current minute is used.
Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 60.
-.IP second
+.TP 5
+.B int \fIsecond
is the initial second shown.
If the value is negative, the current second is used.
Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 60.
@@ -968,14 +1133,18 @@ Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 60.
.IP \fBdialog_yesno
implements the "\fB--yesno\fP" option.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
.RE
@@ -989,7 +1158,7 @@ Bowing to longstanding usage, the functions that initialize the
display and end it are named \fIinit_dialog\fP and \fIend_dialog\fP.
.PP
The only non-widget function whose name begins with "\fIdialog_\fP"
-is \fIdialog_version\fP, which returns the version number of the
+is \fBdialog_version\fP, which returns the version number of the
library as a string.
.
.PP
@@ -1079,6 +1248,30 @@ This is the number of rows in the array.
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_allocate_gauge
+Allocates a gauge widget.
+Use \fBdlg_update_gauge\fP to display the result.
+.RS
+.TP 5
+.B const char * \fItitle
+is the title string to display at the top of the widget.
+.TP 5
+.B const char * \fIcprompt
+is the prompt text shown within the widget.
+.TP 5
+.B int \fIheight
+is the desired height of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIwidth
+is the desired width of the box.
+If zero, the height is adjusted to use the available screen size.
+.TP 5
+.B int \fIpercent
+is the percentage to show in the progress bar.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_asciibox
returns its parameter transformed to the
corresponding "+" or "-", etc. for the line-drawing characters used in \fB\*p\fP.
@@ -1325,7 +1518,7 @@ is the number of \fIitems\fP in the list.
.TP 5
.B dlg_calc_listw
This function is obsolete, provided for library-compatibility.
-It is replaced by \fIdlg_calc_list_width\fP.
+It is replaced by \fBdlg_calc_list_width\fP.
.RS
.TP 5
.B int \fIitem_no
@@ -1541,7 +1734,7 @@ It is terminated by an entry with a null \fIname\fP field.
.TP 5
.B dlg_default_item
This function is obsolete, provided for library-compatibility.
-It is replaced by \fIdlg_default_formitem\fP and \fIdlg_default_listitem\fP.
+It is replaced by \fBdlg_default_formitem\fP and \fBdlg_default_listitem\fP.
.RS
.TP 5
.B char ** \fIitems
@@ -1701,6 +1894,18 @@ is the number of columns (or rows if \fIvertical\fP) allowed for the display.
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_draw_helpline
+draw the text in \fBdialog_vars.help_line\fP at the bottom of the given window.
+.RS
+.TP 5
+.B WINDOW * \fIdialog
+is the window to modify.
+.TP 5
+.B bool \fIdecorations
+if true, allow room for the scrolling arrows.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_draw_scrollbar
If \fBdialog_state.use_scrollbar\fP is set,
draw a scrollbar on the right margin of windows holding scrollable data.
@@ -1898,7 +2103,8 @@ Quit program killing all \fBtailboxbg\fP widgets.
.B const char * \fIfmt
is the format of the \fBprintf\fP-like message to write.
.TP 5
-.
+.B ...
+.br
are the variables to apply to the \fIfmt\fP format.
.RE
.\" ---------------------------------------------------------------------------
@@ -2014,6 +2220,15 @@ is the list to free.
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_free_gauge
+Remove the gauge widget from the screen and free its associated memory.
+.RS
+.TP 5
+.B void *\fIobjptr
+points to the gauge widget.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_getc
Read a character from the given window.
Handle repainting here (to simplify
@@ -2615,23 +2830,29 @@ applied to the string.
.B dlg_progressbox
implements the "\fB--prgbox\fP" and "\fB--progressbox\fP" options.
.RS
-.IP title
+.TP 5
+.B const char * \fItitle
is the title on the top of the widget.
-.IP cprompt
+.TP 5
+.B const char * \fIcprompt
is the prompt text shown within the widget.
If empty or null, no prompt is shown.
-.IP height
+.TP 5
+.B int \fIheight
is the desired height of the box.
If zero, the height is based on the screen size.
-.IP width
+.TP 5
+.B int \fIwidth
is the desired width of the box.
If zero, the height is based on the screen size.
-.IP pauseopt
+.TP 5
+.B int \fIpauseopt
if true, an "OK" button will be shown,
and the dialog will wait for it to complete.
With an "OK" button, it is denoted a "programbox",
without an "OK" button, it is denoted a "progressbox".
-.IP fp
+.TP 5
+.B FILE * \fIfp
is the file pointer, which may be a pipe or a regular file.
.RE
.\" ---------------------------------------------------------------------------
@@ -2865,16 +3086,66 @@ Some of these may be values declared in the DLG_KEYS_ENUM.
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_trace_msg
+Write a formatted message to the trace file.
+.RS
+.TP 5
+.B const char * \fIfmt
+is the format of the \fBprintf\fP-like message to write.
+.TP 5
+.B ...
+.br
+are the variables to apply to the \fIfmt\fP format.
+.RE
+.IP
+Use the DLG_TRACE macro for portability, in case the trace
+feature is not compiled into the library.
+It uses an extra level of parentheses to work with a variable number of
+parameters, e.g.,
+.ES
+.EX
+DLG_TRACE(("this is dialog version %s\\n", dialog_version()));
+.EE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_trace_win
If \fBdialog_state.trace\fP is set,
log a printable picture of the given window.
.\" ---------------------------------------------------------------------------
.TP 5
.B dlg_trim_string
-Change embedded "\\n" substrings to '\\n' characters and tabs to single spaces.
-If there are no "\\n"s, the function strips all extra spaces, for justification.
-If it has "\\n"'s, the function preserves extra spaces.
-If \fBdialog_vars.cr_wrap\fP is set, the function preserves '\\n's.
+The \fBdialog\fP program uses this in each widget to adjust the
+message string,
+which may contain the newline character (referred to as '\\n')
+and/or the special substring "\\n"
+(which can be translated into a newline character).
+.IP
+There are several optional features:
+.RS
+.bP
+Unless \fBdialog_vars.no_nl_expand\fP is set,
+.RS
+.bP
+If it has "\\n" substrings,
+the function preserves extra spaces.
+For instance, spaces following a newline (substring or character)
+are preserved to use as an indentation.
+.bP
+The function changes embedded "\\n" substrings to '\\n' characters.
+.RE
+.bP
+If \fBdialog_vars.no_nl_expand\fP is not set,
+or if there are no "\\n" substrings,
+this function strips all extra spaces to simplify justification.
+.bP
+If \fBdialog_vars.cr_wrap\fP is set,
+the function preserves '\\n' newline characters.
+Otherwise, each '\\n' newline character is converted to a space.
+.bP
+Unless \fBdialog_vars.nocollapse\fP is set,
+each tab character is converted to a space,
+and sequences of blanks (space or tab) are reduced to a single space.
+.RE
.RS
.TP 5
.B char * \fIsrc
@@ -2891,6 +3162,18 @@ is the window from which to remove bindings
.RE
.\" ---------------------------------------------------------------------------
.TP 5
+.B dlg_update_gauge
+Update a gauge widget to show a different percentage value.
+.RS
+.TP 5
+.B void *\fIobjptr
+points to the gauge object to update.
+.TP 5
+.B int \fIpercent
+is the new percentage value to display.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
.B dlg_yes_buttoncode
Map the given button index for \fBdlg_yes_labels\fP into \fB\*p\fP's exit-code.
.RS
diff --git a/dialog.c b/dialog.c
index 13b2a170a392..44a16dba003e 100644
--- a/dialog.c
+++ b/dialog.c
@@ -1,5 +1,5 @@
/*
- * $Id: dialog.c,v 1.186 2011/03/02 09:58:29 tom Exp $
+ * $Id: dialog.c,v 1.193 2011/06/29 09:10:56 tom Exp $
*
* cdialog - Display simple dialog boxes from shell scripts
*
@@ -71,7 +71,9 @@ typedef enum {
,o_gauge
,o_help
,o_help_button
+ ,o_help_file
,o_help_label
+ ,o_help_line
,o_help_status
,o_icon
,o_ignore
@@ -96,6 +98,7 @@ typedef enum {
,o_no_label
,o_no_lines
,o_no_mouse
+ ,o_no_nl_expand
,o_no_shadow
,o_nocancel
,o_noitem
@@ -137,6 +140,7 @@ typedef enum {
,o_title
,o_trim
,o_under_mouse
+ ,o_version
,o_visit_items
,o_wmclass
,o_yes_label
@@ -215,6 +219,8 @@ static const Options options[] = {
{ "help-button", o_help_button, 1, "" },
{ "help-label", o_help_label, 1, "<str>" },
{ "help-status", o_help_status, 1, "" },
+ { "hfile", o_help_file, 1, "<str>" },
+ { "hline", o_help_line, 1, "<str>" },
{ "icon", o_icon, 1, NULL },
{ "ignore", o_ignore, 1, "" },
{ "infobox", o_infobox, 2, "<text> <height> <width>" },
@@ -239,6 +245,7 @@ static const Options options[] = {
{ "no-label", o_no_label, 1, "<str>" },
{ "no-lines", o_no_lines, 1, "" },
{ "no-mouse", o_no_mouse, 1, "" },
+ { "no-nl-expand", o_no_nl_expand, 1, "" },
{ "no-ok", o_nook, 1, "" },
{ "no-shadow", o_no_shadow, 1, "" },
{ "nocancel", o_nocancel, 1, NULL }, /* see --no-cancel */
@@ -281,7 +288,7 @@ static const Options options[] = {
{ "title", o_title, 1, "<title>" },
{ "trim", o_trim, 1, "" },
{ "under-mouse", o_under_mouse, 1, NULL },
- { "version", o_print_version, 5, "" },
+ { "version", o_version, 5, "" },
{ "visit-items", o_visit_items, 1, "" },
{ "wmclass", o_wmclass, 1, NULL },
{ "yes-label", o_yes_label, 1, "<str>" },
@@ -872,6 +879,7 @@ call_mixed_gauge(CALLARGS)
}
#endif
+#ifdef HAVE_DLG_GAUGE
static int
call_prgbox(CALLARGS)
{
@@ -891,6 +899,7 @@ call_prgbox(CALLARGS)
numeric_arg(av, 2),
numeric_arg(av, 3), TRUE));
}
+#endif
#ifdef HAVE_DLG_GAUGE
static int
@@ -1089,6 +1098,15 @@ compare_opts(const void *a, const void *b)
}
/*
+ * Print program's version.
+ */
+static void
+PrintVersion(FILE *fp)
+{
+ fprintf(fp, "Version: %s\n", dialog_version());
+}
+
+/*
* Print program help-message
*/
static void
@@ -1122,6 +1140,9 @@ Help(void)
size_t j, k;
const Options **opts;
+ end_dialog();
+ dialog_state.output = stdout;
+
opts = dlg_calloc(const Options *, limit);
assert_ptr(opts, "Help");
for (j = 0; j < limit; ++j) {
@@ -1191,6 +1212,9 @@ process_common_options(int argc, char **argv, int offset, bool output)
case o_cr_wrap:
dialog_vars.cr_wrap = TRUE;
break;
+ case o_no_nl_expand:
+ dialog_vars.no_nl_expand = TRUE;
+ break;
case o_no_collapse:
dialog_vars.nocollapse = TRUE;
break;
@@ -1236,6 +1260,12 @@ process_common_options(int argc, char **argv, int offset, bool output)
case o_item_help:
dialog_vars.item_help = TRUE;
break;
+ case o_help_line:
+ dialog_vars.help_line = optionString(argv, &offset);
+ break;
+ case o_help_file:
+ dialog_vars.help_file = optionString(argv, &offset);
+ break;
case o_help_button:
dialog_vars.help_button = TRUE;
break;
@@ -1274,7 +1304,7 @@ process_common_options(int argc, char **argv, int offset, bool output)
break;
case o_print_version:
if (output) {
- fprintf(stdout, "Version: %s\n", dialog_version());
+ PrintVersion(dialog_state.output);
}
break;
case o_separator:
@@ -1356,6 +1386,7 @@ process_common_options(int argc, char **argv, int offset, bool output)
break;
case o_no_mouse:
dialog_state.no_mouse = TRUE;
+ mouse_close();
break;
case o_noitem:
case o_fullbutton:
@@ -1474,6 +1505,9 @@ main(int argc, char *argv[])
* that. We can only write to one of them. If --stdout is used, that
* can interfere with initializing the curses library, so we want to
* know explicitly if it is used.
+ *
+ * Also, look for any --version or --help message, processing those
+ * immediately.
*/
while (offset < argc) {
int base = offset;
@@ -1497,6 +1531,14 @@ main(int argc, char *argv[])
case o_keep_tite:
keep_tite = TRUE;
break;
+ case o_version:
+ dialog_state.output = stdout;
+ PrintVersion(dialog_state.output);
+ exit(DLG_EXIT_OK);
+ break;
+ case o_help:
+ Help();
+ break;
default:
++offset;
continue;
@@ -1512,7 +1554,11 @@ main(int argc, char *argv[])
offset = 1;
init_result(my_buffer);
- if (argc == 2) { /* if we don't want clear screen */
+ /*
+ * Dialog's output may be redirected (see above). Handle the special
+ * case of options that only report information without interaction.
+ */
+ if (argc == 2) {
switch (lookupOption(argv[1], 7)) {
case o_print_maxsize:
(void) initscr();
@@ -1521,7 +1567,7 @@ main(int argc, char *argv[])
fprintf(dialog_state.output, "MaxSize: %d, %d\n", SLINES, SCOLS);
break;
case o_print_version:
- fprintf(stdout, "Version: %s\n", dialog_version());
+ PrintVersion(dialog_state.output);
break;
case o_clear:
initscr();
@@ -1531,8 +1577,6 @@ main(int argc, char *argv[])
case o_ignore:
break;
default:
- case o_help:
- dialog_state.output = stdout;
Help();
break;
}
@@ -1621,6 +1665,8 @@ main(int argc, char *argv[])
case o_unknown:
case o_title:
case o_backtitle:
+ case o_help_line:
+ case o_help_file:
break;
default:
if (argv[j] != 0) {
diff --git a/dialog.h b/dialog.h
index e7265734094e..4e1b01c9b365 100644
--- a/dialog.h
+++ b/dialog.h
@@ -1,5 +1,5 @@
/*
- * $Id: dialog.h,v 1.223 2011/03/02 10:04:09 tom Exp $
+ * $Id: dialog.h,v 1.231 2011/06/29 09:51:00 tom Exp $
*
* dialog.h -- common declarations for all dialog modules
*
@@ -44,7 +44,10 @@
#include <signal.h> /* fork() etc. */
#include <math.h> /* sqrt() */
-#undef ERR /* header conflict with Solaris xpg4 */
+/* header conflict with Solaris xpg4 versus <sys/regset.h> */
+#if defined(ERR) && (ERR == 13)
+#undef ERR
+#endif
#if defined(HAVE_NCURSESW_NCURSES_H)
#include <ncursesw/ncurses.h>
@@ -140,6 +143,7 @@
#define DLG_CTRL(n) ((n) & 0x1f) /* CTRL is preferred, but conflicts */
+#define CHR_HELP DLG_CTRL('E')
#define CHR_BACKSPACE DLG_CTRL('H')
#define CHR_REPAINT DLG_CTRL('L')
#define CHR_KILL DLG_CTRL('U')
@@ -476,6 +480,11 @@ typedef struct {
/* 1.1-20100118 */
char *date_format; /* option "--date-format" */
char *time_format; /* option "--time-format" */
+ /* 1.1-20110629 */
+ char *help_line; /* option "--hline" */
+ char *help_file; /* option "--hfile" */
+ bool in_helpfile; /* flag to prevent recursion in --hfile */
+ bool no_nl_expand; /* option "--no-nl-expand" */
} DIALOG_VARS;
#define USE_ITEM_HELP(s) (dialog_vars.item_help && (s) != 0)
@@ -530,6 +539,7 @@ extern int dialog_editbox(const char * /*title*/, const char * /*file*/, int /*h
extern int dialog_form(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, char ** /*items*/);
extern int dialog_fselect(const char * /*title*/, const char * /*path*/, int /*height*/, int /*width*/);
extern int dialog_gauge(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*percent*/);
+extern int dialog_helpfile(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
extern int dialog_inputbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, const char * /*init*/, const int /*password*/);
extern int dialog_menu(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*menu_height*/, int /*item_no*/, char ** /*items*/);
extern int dialog_mixedform(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, char ** /*items*/);
@@ -584,6 +594,7 @@ extern int dlg_eat_argv(int * /* argcp */, char *** /* argvp */, int /* start */
/* arrows.c */
extern void dlg_draw_arrows(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/);
extern void dlg_draw_arrows2(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
+extern void dlg_draw_helpline(WINDOW * /*dialog*/, bool /*decorations*/);
extern void dlg_draw_scrollbar(WINDOW * /*dialog*/, long /* first_data */, long /* this_data */, long /* next_data */, long /* total_data */, int /* left */, int /* right */, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
/* buttons.c */
@@ -619,6 +630,11 @@ extern int dlg_default_formitem(DIALOG_FORMITEM * /*items*/);
extern int dlg_ordinate(const char * /*s*/);
extern void dlg_free_formitems(DIALOG_FORMITEM * /*items*/);
+/* guage.c */
+extern void * dlg_allocate_gauge(const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
+extern void dlg_free_gauge(void * /* objptr */);
+extern void dlg_update_gauge(void * /* objptr */, int /* percent */);
+
/* inputstr.c */
extern bool dlg_edit_string(char * /*string*/, int * /*offset*/, int /*key*/, int /*fkey*/, bool /*force*/);
extern const int * dlg_index_columns(const char * /*string*/);
@@ -740,6 +756,12 @@ extern void dlg_move_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int
#endif
/*
+ * Normally "enter" means "ok". Use this macro to handle the explicit
+ * check for DLGK_ENTER:
+ */
+#define dlg_enter_buttoncode(code) (dialog_vars.nook ? DLG_EXIT_OK : dlg_ok_buttoncode(code))
+
+/*
* The following stuff is needed for mouse support
*/
typedef struct mseRegion {
diff --git a/dlg_keys.h b/dlg_keys.h
index 6a96c0fec8eb..34b4cba318ad 100644
--- a/dlg_keys.h
+++ b/dlg_keys.h
@@ -1,9 +1,9 @@
/*
- * $Id: dlg_keys.h,v 1.24 2010/01/19 00:57:36 tom Exp $
+ * $Id: dlg_keys.h,v 1.26 2011/06/21 22:09:22 tom Exp $
*
- * dlg_keys.h -- runtime binding support for dialog
+ * dlg_keys.h -- runtime binding support for dialog
*
- * Copyright 2005-2007,2010 Thomas E. Dickey
+ * Copyright 2005-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
@@ -89,12 +89,18 @@ typedef enum {
DLGK_BEGIN,
DLGK_FINAL,
DLGK_SELECT,
+ DLGK_HELPFILE,
DLGK_TRACE
} DLG_KEYS_ENUM;
#define is_DLGK_MOUSE(code) ((code) >= M_EVENT)
#define DLGK_MOUSE(code) ((code) + M_EVENT)
+#define HELPKEY_BINDINGS \
+ DLG_KEYS_DATA( DLGK_HELPFILE, CHR_HELP ), \
+ DLG_KEYS_DATA( DLGK_HELPFILE, KEY_F(1) ), \
+ DLG_KEYS_DATA( DLGK_HELPFILE, KEY_HELP )
+
#define ENTERKEY_BINDINGS \
DLG_KEYS_DATA( DLGK_ENTER, '\n' ), \
DLG_KEYS_DATA( DLGK_ENTER, '\r' ), \
diff --git a/editbox.c b/editbox.c
index 7889024196dc..c7da10c74105 100644
--- a/editbox.c
+++ b/editbox.c
@@ -1,9 +1,9 @@
/*
- * $Id: editbox.c,v 1.54 2010/04/28 21:02:01 tom Exp $
+ * $Id: editbox.c,v 1.55 2011/06/21 00:10:46 tom Exp $
*
* editbox.c -- implements the edit box
*
- * Copyright 2007-2009,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
@@ -312,12 +312,14 @@ dlg_editbox(const char *title,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
};
static DLG_KEYS_BINDING binding2[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
diff --git a/formbox.c b/formbox.c
index 18f20545c6fd..7ec798ce0b8f 100644
--- a/formbox.c
+++ b/formbox.c
@@ -1,9 +1,9 @@
/*
- * $Id: formbox.c,v 1.71 2010/02/24 10:45:57 Samuel.Martin.Moro Exp $
+ * $Id: formbox.c,v 1.73 2011/06/29 09:48:08 tom Exp $
*
* formbox.c -- implements the form (i.e, some pairs label/editbox)
*
- * Copyright 2003-2009,2010 Thomas E. Dickey
+ * Copyright 2003-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
@@ -433,12 +433,14 @@ dlg_form(const char *title,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
};
static DLG_KEYS_BINDING binding2[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
@@ -633,7 +635,7 @@ dlg_form(const char *title,
case DLGK_ENTER:
dlg_del_window(dialog);
- result = (state >= 0) ? dlg_ok_buttoncode(state) : DLG_EXIT_OK;
+ result = (state >= 0) ? dlg_enter_buttoncode(state) : DLG_EXIT_OK;
continue;
case DLGK_GRID_LEFT:
diff --git a/fselect.c b/fselect.c
index 09a55604aedd..e082abf0822d 100644
--- a/fselect.c
+++ b/fselect.c
@@ -1,5 +1,5 @@
/*
- * $Id: fselect.c,v 1.76 2011/01/16 22:20:16 tom Exp $
+ * $Id: fselect.c,v 1.78 2011/06/29 09:48:21 tom Exp $
*
* fselect.c -- implements the file-selector box
*
@@ -532,12 +532,14 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
};
static DLG_KEYS_BINDING binding2[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
@@ -795,7 +797,7 @@ dlg_fselect(const char *title, const char *path, int height, int width, int dsel
}
/* FALLTHRU */
case DLGK_ENTER:
- result = (state > 0) ? dlg_ok_buttoncode(state) : DLG_EXIT_OK;
+ result = (state > 0) ? dlg_enter_buttoncode(state) : DLG_EXIT_OK;
continue;
#ifdef KEY_RESIZE
case KEY_RESIZE:
diff --git a/guage.c b/guage.c
index d12bc21f919f..b25052f23227 100644
--- a/guage.c
+++ b/guage.c
@@ -1,5 +1,5 @@
/*
- * $Id: guage.c,v 1.52 2011/01/17 10:39:28 tom Exp $
+ * $Id: guage.c,v 1.60 2011/06/27 00:52:28 tom Exp $
*
* guage.c -- implements the gauge dialog
*
@@ -35,8 +35,9 @@
#define isMarker(buf) !strncmp(buf, "XXX", (size_t) 3)
-typedef struct {
- DIALOG_CALLBACK obj;
+typedef struct _my_obj {
+ DIALOG_CALLBACK obj; /* has to be first in struct */
+ struct _my_obj *next;
WINDOW *text;
const char *title;
char *prompt;
@@ -47,6 +48,43 @@ typedef struct {
char line[MAX_LEN + 1];
} MY_OBJ;
+static MY_OBJ *all_objects;
+
+static int
+valid(MY_OBJ * obj)
+{
+ MY_OBJ *list = all_objects;
+ int result = 0;
+
+ while (list != 0) {
+ if (list == obj) {
+ result = 1;
+ break;
+ }
+ list = list->next;
+ }
+ return result;
+}
+
+static void
+delink(MY_OBJ * obj)
+{
+ MY_OBJ *p = all_objects;
+ MY_OBJ *q = 0;
+ while (p != 0) {
+ if (p == obj) {
+ if (q != 0) {
+ q->next = p->next;
+ } else {
+ all_objects = p->next;
+ }
+ break;
+ }
+ q = p;
+ p = p->next;
+ }
+}
+
static int
read_data(char *buffer, FILE *fp)
{
@@ -55,6 +93,7 @@ read_data(char *buffer, FILE *fp)
if (feof(fp)) {
result = 0;
} else if (fgets(buffer, MY_LEN, fp) != 0) {
+ DLG_TRACE(("read_data:%s", buffer));
dlg_trim_string(buffer);
result = 1;
} else {
@@ -88,6 +127,7 @@ repaint_text(MY_OBJ * obj)
dlg_draw_title(dialog, obj->title);
wattrset(dialog, dialog_attr);
+ dlg_draw_helpline(dialog, FALSE);
dlg_print_autowrap(dialog, obj->prompt, obj->height, obj->width);
dlg_draw_box(dialog,
@@ -179,6 +219,7 @@ handle_input(DIALOG_CALLBACK * cb)
} else {
if (feof(dialog_state.pipe_input) ||
(ferror(dialog_state.pipe_input) && errno != EINTR)) {
+ delink(obj);
dlg_remove_callback(cb);
}
}
@@ -202,7 +243,8 @@ handle_my_getc(DIALOG_CALLBACK * cb, int ch, int fkey, int *result)
if (cb != 0) {
if (!fkey && (ch == ERR)) {
(void) handle_input(cb);
- status = (cb->input != 0);
+ /* cb might be freed in handle_input */
+ status = (valid((MY_OBJ *) cb) && (cb->input != 0));
}
} else {
status = FALSE;
@@ -215,46 +257,42 @@ my_cleanup(DIALOG_CALLBACK * cb)
{
MY_OBJ *obj = (MY_OBJ *) cb;
- if (obj != 0) {
- if (obj->prompt != obj->prompt_buf)
+ if (valid(obj)) {
+ if (obj->prompt != obj->prompt_buf) {
free(obj->prompt);
+ obj->prompt = obj->prompt_buf;
+ }
+ delink(obj);
}
}
+void
+dlg_update_gauge(void *objptr, int percent)
+{
+ MY_OBJ *obj = (MY_OBJ *) objptr;
+
+ curs_set(0);
+ obj->percent = percent;
+ repaint_text(obj);
+}
+
/*
- * Display a gauge, or progress meter. Starts at percent% and reads stdin. If
- * stdin is not XXX, then it is interpreted as a percentage, and the display is
- * updated accordingly. Otherwise the next line is the percentage, and
- * subsequent lines up to another XXX are used for the new prompt. Note that
- * the size of the window never changes, so the prompt can not get any larger
- * than the height and width specified.
+ * Allocates a new object and fills it as per the arguments
*/
-int
-dialog_gauge(const char *title,
- const char *cprompt,
- int height,
- int width,
- int percent)
+void *
+dlg_allocate_gauge(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int percent)
{
-#ifdef KEY_RESIZE
- int old_height = height;
- int old_width = width;
-#endif
- int fkey;
- int ch, result;
int x, y;
char *prompt = dlg_strclone(cprompt);
WINDOW *dialog;
MY_OBJ *obj = 0;
- curs_set(0);
-
dlg_tab_correct_str(prompt);
-#ifdef KEY_RESIZE
- retry:
-#endif
-
dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE);
dlg_print_size(height, width);
dlg_ctl_size(height, width);
@@ -265,51 +303,97 @@ dialog_gauge(const char *title,
dialog = dlg_new_window(height, width, y, x);
- if (obj == 0) {
- MY_OBJ **objref;
-
- obj = dlg_calloc(MY_OBJ, 1);
- assert_ptr(obj, "dialog_gauge");
-
- objref = &obj;
- obj->obj.input = dialog_state.pipe_input;
- obj->obj.win = dialog;
- obj->obj.keep_win = TRUE;
- obj->obj.bg_task = TRUE;
- obj->obj.handle_getc = handle_my_getc;
- obj->obj.handle_input = handle_input;
- obj->title = title;
- obj->prompt = prompt;
- obj->percent = percent;
- obj->height = height;
- obj->width = width;
- dlg_add_callback_ref((DIALOG_CALLBACK **) objref, my_cleanup);
- } else {
- obj->obj.win = dialog;
+ obj = dlg_calloc(MY_OBJ, 1);
+ assert_ptr(obj, "dialog_gauge");
+
+ obj->obj.input = dialog_state.pipe_input;
+ obj->obj.win = dialog;
+ obj->obj.keep_win = TRUE;
+ obj->obj.bg_task = TRUE;
+ obj->obj.handle_getc = handle_my_getc;
+ obj->obj.handle_input = handle_input;
+
+ obj->title = title;
+ obj->prompt = prompt;
+ obj->percent = percent;
+ obj->height = height;
+ obj->width = width;
+
+ obj->next = all_objects;
+ all_objects = obj;
+
+ return (void *) obj;
+}
+
+void
+dlg_free_gauge(void *objptr)
+{
+ MY_OBJ *obj = (MY_OBJ *) objptr;
+
+ curs_set(1);
+ if (valid(obj)) {
+ delink(obj);
+ obj->obj.keep_win = FALSE;
+ dlg_remove_callback(&(obj->obj));
+ free(obj);
}
+}
- repaint_text(obj);
+/*
+ * Display a gauge, or progress meter. Starts at percent% and reads stdin. If
+ * stdin is not XXX, then it is interpreted as a percentage, and the display is
+ * updated accordingly. Otherwise the next line is the percentage, and
+ * subsequent lines up to another XXX are used for the new prompt. Note that
+ * the size of the window never changes, so the prompt can not get any larger
+ * than the height and width specified.
+ */
+int
+dialog_gauge(const char *title,
+ const char *cprompt,
+ int height,
+ int width,
+ int percent)
+{
+ int fkey;
+ int ch, result;
+ void *objptr = dlg_allocate_gauge(title, cprompt, height, width, percent);
+ MY_OBJ *obj = (MY_OBJ *) objptr;
+
+ dlg_add_callback_ref((DIALOG_CALLBACK **) & obj, my_cleanup);
+ dlg_update_gauge(obj, percent);
do {
- ch = dlg_getc(dialog, &fkey);
+ ch = dlg_getc(obj->obj.win, &fkey);
#ifdef KEY_RESIZE
if (fkey && ch == KEY_RESIZE) {
- /* reset data */
- height = old_height;
- width = old_width;
- /* repaint */
+ MY_OBJ *oldobj = obj;
+
+ dlg_mouse_free_regions();
+
+ obj = dlg_allocate_gauge(title,
+ cprompt,
+ height,
+ width,
+ oldobj->percent);
+
+ /* avoid breaking new window in dlg_remove_callback */
+ oldobj->obj.caller = 0;
+ oldobj->obj.input = 0;
+ oldobj->obj.keep_win = FALSE;
+
+ /* remove the old version of the gauge */
dlg_clear();
- dlg_del_window(dialog);
+ dlg_remove_callback(&(oldobj->obj));
refresh();
- dlg_mouse_free_regions();
- goto retry;
+
+ dlg_add_callback_ref((DIALOG_CALLBACK **) & obj, my_cleanup);
+ dlg_update_gauge(obj, obj->percent);
}
#endif
}
- while (handle_my_getc(&(obj->obj), ch, fkey, &result));
+ while (valid(obj) && handle_my_getc(&(obj->obj), ch, fkey, &result));
- curs_set(1);
- dlg_del_window(dialog);
+ dlg_free_gauge(obj);
return (DLG_EXIT_OK);
}
diff --git a/help.c b/help.c
new file mode 100644
index 000000000000..8ba922984ebe
--- /dev/null
+++ b/help.c
@@ -0,0 +1,43 @@
+/*
+ * $Id: help.c,v 1.2 2011/06/25 00:27:16 tom Exp $
+ *
+ * help.c -- implements the help dialog
+ *
+ * Copyright 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
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to
+ * Free Software Foundation, Inc.
+ * 51 Franklin St., Fifth Floor
+ * Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+
+/*
+ * Display a help-file as a textbox widget.
+ */
+int
+dialog_helpfile(const char *title,
+ const char *file,
+ int height,
+ int width)
+{
+ int result = DLG_EXIT_ERROR;
+
+ if (!dialog_vars.in_helpfile && file != 0 && *file != '\0') {
+ dialog_vars.in_helpfile = TRUE;
+ result = dialog_textbox(title, file, height, width);
+ dialog_vars.in_helpfile = FALSE;
+ }
+ return (result);
+}
diff --git a/inputbox.c b/inputbox.c
index 6e83cbc93c3a..14e2c288e17c 100644
--- a/inputbox.c
+++ b/inputbox.c
@@ -1,9 +1,9 @@
/*
- * $Id: inputbox.c,v 1.64 2010/01/19 01:03:39 tom Exp $
+ * $Id: inputbox.c,v 1.67 2011/06/29 09:48:34 tom Exp $
*
- * inputbox.c -- implements the input box
+ * inputbox.c -- implements the input box
*
- * Copyright 2000-2009,2010 Thomas E. Dickey
+ * Copyright 2000-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
@@ -46,12 +46,14 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
};
static DLG_KEYS_BINDING binding2[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
NAVIGATE_BINDINGS,
END_KEYS_BINDING
@@ -119,6 +121,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
dlg_draw_title(dialog, title);
wattrset(dialog, dialog_attr);
+ dlg_draw_helpline(dialog, FALSE);
dlg_print_autowrap(dialog, prompt, height, width);
/* Draw the input field box */
@@ -202,7 +205,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
case ' ': /* FIXME: conflict with inputstr.c */
case DLGK_ENTER:
dlg_del_window(dialog);
- result = (state >= 0) ? dlg_ok_buttoncode(state) : DLG_EXIT_OK;
+ result = (state >= 0) ? dlg_enter_buttoncode(state) : DLG_EXIT_OK;
break;
#ifdef KEY_RESIZE
case KEY_RESIZE:
diff --git a/makefile.in b/makefile.in
index 753f642c9faa..d05d74da3778 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $Id: makefile.in,v 1.78 2011/03/02 09:57:24 tom Exp $
+# $Id: makefile.in,v 1.79 2011/06/25 00:27:56 tom Exp $
# template makefile for DIALOG
##############################################################################
# Copyright (c) 1999-2010,2011 Thomas E. Dickey #
@@ -134,6 +134,7 @@ OBJECTS = $(EXTRAOBJS) \
columns$o \
dlg_keys$o \
editbox$o \
+ help$o \
inputbox$o \
inputstr$o \
menubox$o \
diff --git a/menubox.c b/menubox.c
index aa4cc2d89183..25005a403948 100644
--- a/menubox.c
+++ b/menubox.c
@@ -1,5 +1,5 @@
/*
- * $Id: menubox.c,v 1.120 2011/01/19 00:27:53 tom Exp $
+ * $Id: menubox.c,v 1.122 2011/06/29 09:48:46 tom Exp $
*
* menubox.c -- implements the menu box
*
@@ -291,6 +291,7 @@ dlg_menu(const char *title,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_FIELD_NEXT, ' ' ),
DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
@@ -312,6 +313,7 @@ dlg_menu(const char *title,
};
static DLG_KEYS_BINDING binding2[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
END_KEYS_BINDING
};
@@ -685,7 +687,7 @@ dlg_menu(const char *title,
FALSE, width);
break;
case DLGK_ENTER:
- result = dlg_ok_buttoncode(button);
+ result = dlg_enter_buttoncode(button);
/*
* If dlg_menu() is called from dialog_menu(), we want to
diff --git a/mixedgauge.c b/mixedgauge.c
index 739165de0c6f..e15a4df7b028 100644
--- a/mixedgauge.c
+++ b/mixedgauge.c
@@ -1,5 +1,5 @@
/*
- * $Id: mixedgauge.c,v 1.23 2011/01/19 00:27:53 tom Exp $
+ * $Id: mixedgauge.c,v 1.24 2011/06/27 08:16:38 tom Exp $
*
* mixedgauge.c -- implements the mixedgauge dialog
*
@@ -331,6 +331,7 @@ dlg_begin_mixedgauge(DIALOG_MIXEDGAUGE * dlg,
dialog_attr, border_attr);
dlg_draw_title(dlg->dialog, dlg->title);
+ dlg_draw_helpline(dlg->dialog, FALSE);
if ((dlg->prompt != 0 && *(dlg->prompt) != 0)
&& wmove(dlg->dialog, dlg->item_no, 0) != ERR) {
diff --git a/msgbox.c b/msgbox.c
index 91606af024fe..25a021be9f98 100644
--- a/msgbox.c
+++ b/msgbox.c
@@ -1,9 +1,9 @@
/*
- * $Id: msgbox.c,v 1.64 2010/01/15 10:50:17 tom Exp $
+ * $Id: msgbox.c,v 1.66 2011/06/27 08:36:28 tom Exp $
*
* msgbox.c -- implements the message box and info box
*
- * Copyright 2000-2009,2010 Thomas E. Dickey
+ * Copyright 2000-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
@@ -37,6 +37,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
SCROLLKEY_BINDINGS,
@@ -103,6 +104,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
dlg_draw_bottom_box(dialog);
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);
while (result == DLG_EXIT_UNKNOWN) {
if (show) {
@@ -172,6 +174,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
}
} else {
dlg_print_scrolled(dialog, prompt, offset, page, width, pauseopt);
+ dlg_draw_helpline(dialog, FALSE);
wrefresh(dialog);
result = DLG_EXIT_OK;
}
diff --git a/package/debian/changelog b/package/debian/changelog
index 2b15e4cb96c5..51d497e6936a 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,15 @@
+cdialog (20110707) unstable; urgency=high
+
+ * fix a regression in dlg_getc() from 20110630 changes.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Thu, 07 Jul 2011 18:10:47 -0400
+
+cdialog (20110630) unstable; urgency=high
+
+ * various bug-fixes reported in FreeBSD.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 13 Jun 2011 05:44:17 -0400
+
cdialog (20110302) unstable; urgency=high
* Add --prgbox and --progressbox
diff --git a/package/debian/control b/package/debian/control
index c1ad86ac3546..f219de1fef1b 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -3,12 +3,12 @@ Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
Section: misc
Priority: optional
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), libncursesw5-dev (>= 5.3), groff-base
Homepage: http://invisible-island.net/dialog/
Package: cdialog
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libncursesw5 (>= 5.3)
Description: dialog - display dialog boxes from shell scripts
Dialog is a program that will let you to present a variety of questions
or display messages using dialog boxes from a shell script. These
diff --git a/package/dialog.spec b/package/dialog.spec
index a6f43605273b..f5df49460be7 100644
--- a/package/dialog.spec
+++ b/package/dialog.spec
@@ -1,9 +1,9 @@
Summary: dialog - display dialog boxes from shell scripts
%define AppProgram dialog
%define AppVersion 1.1
-%define AppRelease 20110302
+%define AppRelease 20110707
%define ActualProg c%{AppProgram}
-# $XTermId: dialog.spec,v 1.16 2011/03/02 10:08:16 tom Exp $
+# $XTermId: dialog.spec,v 1.24 2011/07/07 22:10:02 tom Exp $
Name: %{ActualProg}
Version: %{AppVersion}
Release: %{AppRelease}
diff --git a/pause.c b/pause.c
index 001753fb9930..c104a700e75e 100644
--- a/pause.c
+++ b/pause.c
@@ -1,5 +1,5 @@
/*
- * $Id: pause.c,v 1.26 2011/01/18 10:16:33 tom Exp $
+ * $Id: pause.c,v 1.29 2011/06/29 09:48:53 tom Exp $
*
* pause.c -- implements the pause dialog
*
@@ -53,6 +53,7 @@ dialog_pause(const char *title,
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ),
@@ -124,6 +125,7 @@ dialog_pause(const char *title,
dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
dlg_draw_title(dialog, title);
+ dlg_draw_helpline(dialog, FALSE);
wattrset(dialog, dialog_attr);
dlg_print_autowrap(dialog, prompt, height, width);
@@ -215,7 +217,7 @@ dialog_pause(const char *title,
FALSE, width);
break;
case DLGK_ENTER:
- result = dlg_ok_buttoncode(button);
+ result = dlg_enter_buttoncode(button);
break;
case DLGK_MOUSE(0):
result = DLG_EXIT_OK;
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 000000000000..e87991ca7232
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,111 @@
+# Dialog
+# Copyright 2003-2007,2008 # Thomas Dickey
+# This file is distributed under the same license as the dialog package.
+# Marián Čavojský <preklad@cavo.sk>, 2011
+#
+msgid ""
+msgstr ""
+"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: 2011-03-09 09:50+0100\n"
+"Last-Translator: Marián Čavojský <preklad@cavo.sk>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: buttons.c:385
+msgid "Yes"
+msgstr "Áno"
+
+#: buttons.c:393
+msgid "No"
+msgstr "Nie"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "OK"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "VÝCHOD"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Extra"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Pomoc"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mesiac"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Rok"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Premenovať"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Adresáre"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Súbory"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Vporiadku"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "S chybou"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Prešlo"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Skompletované"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Skontrolované"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Dokončené"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Preskočené"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "Spracováva"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "N/A"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Celkový pokrok"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Vyhľadať"
diff --git a/prgbox.c b/prgbox.c
index fea23936db9a..89f2cda555ee 100644
--- a/prgbox.c
+++ b/prgbox.c
@@ -1,14 +1,13 @@
/*
- * $Id: prgbox.c,v 1.6 2011/03/02 09:59:26 tom Exp $
+ * $Id: prgbox.c,v 1.7 2011/06/30 20:44:13 tom Exp $
*
* prgbox.c -- implements the prg box
*
* Copyright 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 as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
+ * it under the terms of the GNU Lesser General Public License, version 2.1
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/progressbox.c b/progressbox.c
index 5670d1cc48c7..024e288fac8a 100644
--- a/progressbox.c
+++ b/progressbox.c
@@ -1,5 +1,5 @@
/*
- * $Id: progressbox.c,v 1.11 2011/03/02 01:10:08 tom Exp $
+ * $Id: progressbox.c,v 1.13 2011/06/27 08:18:20 tom Exp $
*
* progressbox.c -- implements the progress box
*
@@ -109,6 +109,7 @@ pause_for_ok(WINDOW *dialog, int height, int width)
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
END_KEYS_BINDING
@@ -189,6 +190,7 @@ dlg_progressbox(const char *title,
dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
dlg_draw_title(dialog, title);
+ dlg_draw_helpline(dialog, FALSE);
if (*prompt != '\0') {
int y2, x2;
diff --git a/rc.c b/rc.c
index 77dd586dfce9..2e2c7e658ef3 100644
--- a/rc.c
+++ b/rc.c
@@ -1,9 +1,9 @@
/*
- * $Id: rc.c,v 1.45 2010/01/18 10:28:16 tom Exp $
+ * $Id: rc.c,v 1.47 2011/06/20 22:30:04 tom Exp $
*
* rc.c -- routines for processing the configuration file
*
- * Copyright 2000-2008,2010 Thomas E. Dickey
+ * Copyright 2000-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
@@ -433,9 +433,7 @@ dlg_create_rc(const char *filename)
dlg_color_table[i].hilite));
}
#endif /* HAVE_COLOR */
-#if 1
dlg_dump_keys(rc_file);
-#endif
(void) fclose(rc_file);
}
@@ -455,9 +453,7 @@ dlg_parse_rc(void)
char *tempptr;
int result = 0;
FILE *rc_file = 0;
-#if 1
char *params;
-#endif
/*
* At startup, dialog determines the settings to use as follows:
@@ -486,20 +482,21 @@ dlg_parse_rc(void)
sprintf(str, "%s%s", tempptr, DIALOGRC);
else
sprintf(str, "%s/%s", tempptr, DIALOGRC);
- rc_file = fopen(str, "rt");
+ rc_file = fopen(tempptr = str, "rt");
}
}
if (rc_file == NULL) { /* step (b) failed? */
/* try step (c) */
strcpy(str, GLOBALRC);
- if ((rc_file = fopen(str, "rt")) == NULL)
+ if ((rc_file = fopen(tempptr = str, "rt")) == NULL)
return 0; /* step (c) failed, use default values */
}
+ DLG_TRACE(("opened rc file \"%s\"\n", tempptr));
/* Scan each line and set variables */
while ((result == 0) && (fgets(str, MAX_LEN, rc_file) != NULL)) {
- dlg_trace_msg("rc:%s\n", str);
+ DLG_TRACE(("rc:%s", str));
if (*str == '\0' || lastch(str) != '\n') {
/* ignore rest of file if line too long */
fprintf(stderr, "\nParse error: line %d of configuration"
diff --git a/samples/valgrind.log b/samples/valgrind.log
new file mode 100644
index 000000000000..f33b862d8a62
--- /dev/null
+++ b/samples/valgrind.log
@@ -0,0 +1,847 @@
+==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/tailbox.c b/tailbox.c
index 3499b4bc0eac..c111f64af668 100644
--- a/tailbox.c
+++ b/tailbox.c
@@ -1,5 +1,5 @@
/*
- * $Id: tailbox.c,v 1.61 2011/01/16 21:48:16 tom Exp $
+ * $Id: tailbox.c,v 1.63 2011/06/27 08:19:43 tom Exp $
*
* tailbox.c -- implements the tail box
*
@@ -284,6 +284,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_BEGIN, '0' ),
DLG_KEYS_DATA( DLGK_BEGIN, KEY_BEG ),
@@ -338,6 +339,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
dlg_draw_bottom_box(dialog);
dlg_draw_title(dialog, title);
+ dlg_draw_helpline(dialog, FALSE);
if (!bg_task) {
buttons = dlg_exit_label();
diff --git a/textbox.c b/textbox.c
index f9a19ebf74d2..72a9b1146c10 100644
--- a/textbox.c
+++ b/textbox.c
@@ -1,5 +1,5 @@
/*
- * $Id: textbox.c,v 1.99 2011/01/16 22:20:34 tom Exp $
+ * $Id: textbox.c,v 1.101 2011/06/29 09:53:03 tom Exp $
*
* textbox.c -- implements the text box
*
@@ -452,6 +452,7 @@ get_search_term(WINDOW *dialog, char *input, int height, int width)
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
INPUTSTR_BINDINGS,
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
END_KEYS_BINDING
};
@@ -628,6 +629,7 @@ dialog_textbox(const char *title, const char *file, int height, int width)
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_GRID_DOWN, 'J' ),
DLG_KEYS_DATA( DLGK_GRID_DOWN, 'j' ),
@@ -819,7 +821,10 @@ dialog_textbox(const char *title, const char *file, int height, int width)
FALSE, width);
break;
case DLGK_ENTER:
- result = dlg_exit_buttoncode(button);
+ if (dialog_vars.nook)
+ result = DLG_EXIT_OK;
+ else
+ result = dlg_exit_buttoncode(button);
break;
case DLGK_PAGE_FIRST:
if (!obj.begin_reached) {
diff --git a/timebox.c b/timebox.c
index 63bffd8daca7..5a6be3e02bb5 100644
--- a/timebox.c
+++ b/timebox.c
@@ -1,5 +1,5 @@
/*
- * $Id: timebox.c,v 1.43 2011/01/18 01:07:45 Garrett.Cooper Exp $
+ * $Id: timebox.c,v 1.45 2011/06/27 08:20:22 tom Exp $
*
* timebox.c -- implements the timebox dialog
*
@@ -148,6 +148,7 @@ dialog_timebox(const char *title,
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
DLG_KEYS_DATA( DLGK_DELETE_RIGHT,KEY_DC ),
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
DLG_KEYS_DATA( DLGK_FIELD_FIRST,KEY_HOME ),
@@ -223,6 +224,7 @@ dialog_timebox(const char *title,
dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
dlg_draw_bottom_box(dialog);
dlg_draw_title(dialog, title);
+ dlg_draw_helpline(dialog, FALSE);
wattrset(dialog, dialog_attr);
dlg_print_autowrap(dialog, prompt, height, width);
diff --git a/trace.c b/trace.c
index b7ca87d55785..a742ae8a1e77 100644
--- a/trace.c
+++ b/trace.c
@@ -1,5 +1,5 @@
/*
- * $Id: trace.c,v 1.12 2011/01/13 01:36:34 tom Exp $
+ * $Id: trace.c,v 1.14 2011/06/21 21:12:56 tom Exp $
*
* trace.c -- implements screen-dump and keystroke-logging
*
@@ -119,6 +119,7 @@ dlg_trace_chr(int ch, int fkey)
CASE(DLGK_BEGIN);
CASE(DLGK_FINAL);
CASE(DLGK_SELECT);
+ CASE(DLGK_HELPFILE);
CASE(DLGK_TRACE);
}
}
@@ -144,6 +145,7 @@ dlg_trace(const char *fname)
myFP = fopen(fname, "a");
if (myFP != 0) {
dlg_trace_time("** opened at");
+ dlg_trace_msg("** dialog %s\n", dialog_version());
}
}
} else if (myFP != 0) {
diff --git a/ui_getc.c b/ui_getc.c
index 4298d8a212da..d9d5a93a00e2 100644
--- a/ui_getc.c
+++ b/ui_getc.c
@@ -1,5 +1,5 @@
/*
- * $Id: ui_getc.c,v 1.59 2011/02/28 10:56:15 tom Exp $
+ * $Id: ui_getc.c,v 1.63 2011/07/07 22:05:58 tom Exp $
*
* ui_getc.c - user interface glue for getc()
*
@@ -385,6 +385,9 @@ prev_callback(DIALOG_CALLBACK * p)
return p;
}
+#define isBeforeChr(chr) ((chr) == before_chr && !before_fkey)
+#define isBeforeFkey(chr) ((chr) == before_chr && before_fkey)
+
/*
* Read a character from the given window. Handle repainting here (to simplify
* things in the calling application). Also, if input-callback(s) are set up,
@@ -396,7 +399,8 @@ dlg_getc(WINDOW *win, int *fkey)
{
WINDOW *save_win = win;
int ch = ERR;
- int before_lookup;
+ int before_chr;
+ int before_fkey;
int result;
bool done = FALSE;
bool literal = FALSE;
@@ -411,6 +415,8 @@ dlg_getc(WINDOW *win, int *fkey)
wtimeout(win, interval);
while (!done) {
+ bool handle_others = FALSE;
+
/*
* If there was no pending file-input, check the keyboard.
*/
@@ -420,80 +426,108 @@ dlg_getc(WINDOW *win, int *fkey)
continue;
}
- before_lookup = ch;
+ before_chr = ch;
+ before_fkey = *fkey;
+
ch = dlg_lookup_key(win, ch, fkey);
dlg_trace_chr(ch, *fkey);
current = time((time_t *) 0);
- switch (ch) {
- case CHR_LITERAL:
- if (!literal) {
- literal = TRUE;
- keypad(win, FALSE);
- continue;
- }
- break;
- case CHR_REPAINT:
- (void) touchwin(win);
- (void) wrefresh(curscr);
- break;
- case ERR: /* wtimeout() in effect; check for file I/O */
- if (interval > 0
- && current >= expired) {
- dlg_exiterr("timeout");
- }
- if (!valid_file(stdin)
- || !valid_file(dialog_state.screen_output)) {
- ch = ESC;
- done = TRUE;
- } else if (check_inputs()) {
- if (handle_inputs(win))
- dlg_raise_window(win);
- else
+ /*
+ * If we acquired a fkey value, then it is one of dialog's builtin
+ * codes such as DLGK_HELPFILE.
+ */
+ if (!*fkey || *fkey != before_fkey) {
+ switch (ch) {
+ case CHR_LITERAL:
+ if (!literal) {
+ literal = TRUE;
+ keypad(win, FALSE);
+ continue;
+ }
+ break;
+ case CHR_REPAINT:
+ (void) touchwin(win);
+ (void) wrefresh(curscr);
+ break;
+ case ERR: /* wtimeout() in effect; check for file I/O */
+ if (interval > 0
+ && current >= expired) {
+ dlg_exiterr("timeout");
+ }
+ if (!valid_file(stdin)
+ || !valid_file(dialog_state.screen_output)) {
+ ch = ESC;
done = TRUE;
- } else {
- done = (interval <= 0);
- }
- break;
- case DLGK_FIELD_PREV:
- /* FALLTHRU */
- case KEY_BTAB:
- /* FALLTHRU */
- case DLGK_FIELD_NEXT:
- /* FALLTHRU */
- case TAB:
- /* Handle tab/backtab as a special case for traversing between the
- * nominal "current" window, and other windows having callbacks.
- * If the nominal (control) window closes, we'll close the windows
- * with callbacks.
- */
- if (dialog_state.getc_callbacks != 0 &&
- (before_lookup == TAB ||
- before_lookup == KEY_BTAB)) {
- if (before_lookup == TAB)
- p = next_callback(p);
- else
- p = prev_callback(p);
- if ((dialog_state.getc_redirect = p) != 0) {
- win = p->win;
+ } else if (check_inputs()) {
+ if (handle_inputs(win))
+ dlg_raise_window(win);
+ else
+ done = TRUE;
} else {
- win = save_win;
+ done = (interval <= 0);
}
- dlg_raise_window(win);
break;
- }
- /* FALLTHRU */
- default:
+ case DLGK_HELPFILE:
+ if (dialog_vars.help_file) {
+ int yold, xold;
+ getyx(win, yold, xold);
+ dialog_helpfile("HELP", dialog_vars.help_file, 0, 0);
+ dlg_raise_window(win);
+ wmove(win, yold, xold);
+ }
+ continue;
+ case DLGK_FIELD_PREV:
+ /* FALLTHRU */
+ case KEY_BTAB:
+ /* FALLTHRU */
+ case DLGK_FIELD_NEXT:
+ /* FALLTHRU */
+ case TAB:
+ /* Handle tab/backtab as a special case for traversing between
+ * the nominal "current" window, and other windows having
+ * callbacks. If the nominal (control) window closes, we'll
+ * close the windows with callbacks.
+ */
+ if (dialog_state.getc_callbacks != 0 &&
+ (isBeforeChr(TAB) ||
+ isBeforeFkey(KEY_BTAB))) {
+ p = (isBeforeChr(TAB)
+ ? next_callback(p)
+ : prev_callback(p));
+ if ((dialog_state.getc_redirect = p) != 0) {
+ win = p->win;
+ } else {
+ win = save_win;
+ }
+ dlg_raise_window(win);
+ break;
+ }
+ /* FALLTHRU */
+ default:
#ifdef NO_LEAKS
- if (before_lookup == DLG_CTRL('P')) {
- /* for testing, ^P closes the connection */
- close(0);
- close(1);
- close(2);
+ if (isBeforeChr(DLG_CTRL('P'))) {
+ /* for testing, ^P closes the connection */
+ close(0);
+ close(1);
+ close(2);
+ break;
+ }
+#endif
+ handle_others = TRUE;
+ break;
+#ifdef HAVE_DLG_TRACE
+ case CHR_TRACE:
+ dlg_trace_win(win);
break;
- }
#endif
+ }
+ } else {
+ handle_others = TRUE;
+ }
+
+ if (handle_others) {
if ((p = dialog_state.getc_redirect) != 0) {
if (!(p->handle_getc(p, ch, *fkey, &result))) {
dlg_remove_callback(p);
@@ -503,12 +537,6 @@ dlg_getc(WINDOW *win, int *fkey)
} else {
done = TRUE;
}
- break;
-#ifdef HAVE_DLG_TRACE
- case CHR_TRACE:
- dlg_trace_win(win);
- break;
-#endif
}
}
if (literal)
diff --git a/util.c b/util.c
index 8496330a3db3..82ef4fa67414 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
/*
- * $Id: util.c,v 1.211 2011/01/19 00:31:43 tom Exp $
+ * $Id: util.c,v 1.227 2011/07/07 23:42:30 tom Exp $
*
* util.c -- miscellaneous utilities for dialog
*
@@ -37,6 +37,20 @@
#endif
#endif
+#if defined(HAVE_WCHGAT)
+# if defined(NCURSES_VERSION_PATCH)
+# if NCURSES_VERSION_PATCH >= 20060715
+# define USE_WCHGAT 1
+# else
+# define USE_WCHGAT 0
+# endif
+# else
+# define USE_WCHGAT 1
+# endif
+#else
+# define USE_WCHGAT 0
+#endif
+
/* globals */
DIALOG_STATE dialog_state;
DIALOG_VARS dialog_vars;
@@ -61,6 +75,8 @@ DIALOG_VARS dialog_vars;
#define DATA(atr,upr,lwr,cmt) { atr COLOR_DATA(upr) RC_DATA(lwr,cmt) }
+#define UseShadow(dw) ((dw) != 0 && (dw)->normal != 0 && (dw)->shadow != 0)
+
/*
* Table of color and attribute values, default is for mono display.
*/
@@ -411,7 +427,7 @@ dlg_get_attrs(WINDOW *win)
{
chtype result;
#ifdef HAVE_GETATTRS
- result = getattrs(win);
+ result = (chtype) getattrs(win);
#else
attr_t my_result;
short my_pair;
@@ -487,6 +503,7 @@ end_dialog(void)
}
}
+#define ESCAPE_LEN 3
#define isOurEscape(p) (((p)[0] == '\\') && ((p)[1] == 'Z') && ((p)[2] != 0))
static int
@@ -500,7 +517,7 @@ centered(int width, const char *string)
if (dialog_vars.colors) {
for (n = 0; n < len; ++n) {
if (isOurEscape(string + n)) {
- hide += 3;
+ hide += ESCAPE_LEN;
}
}
}
@@ -661,6 +678,7 @@ dlg_print_line(WINDOW *win,
{
const char *wrap_ptr = prompt;
const char *test_ptr = prompt;
+ const char *hide_ptr = 0;
const int *cols = dlg_index_columns(prompt);
const int *indx = dlg_index_wchars(prompt);
int wrap_inx = 0;
@@ -687,8 +705,9 @@ dlg_print_line(WINDOW *win,
wrap_inx = n;
*x = cur_x;
} else if (isOurEscape(test_ptr)) {
- hidden += 3;
- n += 2;
+ hide_ptr = test_ptr;
+ hidden += ESCAPE_LEN;
+ n += (ESCAPE_LEN - 1);
}
cur_x = lm + tabbed + cols[n + 1];
if (cur_x > (rm + hidden))
@@ -725,6 +744,23 @@ dlg_print_line(WINDOW *win,
#endif
/*
+ * If we found hidden text past the last point that we will display,
+ * discount that from the displayed length.
+ */
+ if ((hide_ptr != 0) && (hide_ptr >= wrap_ptr)) {
+ hidden -= ESCAPE_LEN;
+ test_ptr = wrap_ptr;
+ while (test_ptr < wrap_ptr) {
+ if (isOurEscape(test_ptr)) {
+ hidden -= ESCAPE_LEN;
+ test_ptr += ESCAPE_LEN;
+ } else {
+ ++test_ptr;
+ }
+ }
+ }
+
+ /*
* Print the line if we have a window pointer. Otherwise this routine
* is just being called for sizing the window.
*/
@@ -736,6 +772,8 @@ dlg_print_line(WINDOW *win,
if (*x == 1)
*x = rm;
+ *x -= hidden;
+
/* Find the start of the next line and return a pointer to it */
test_ptr = wrap_ptr;
while (*test_ptr == ' ')
@@ -863,43 +901,49 @@ dlg_print_scrolled(WINDOW *win,
high = len;
#endif
dummy = newwin(high, width, 0, 0);
- wbkgdset(dummy, dialog_attr | ' ');
- wattrset(dummy, dialog_attr);
- werase(dummy);
- dlg_print_autowrap(dummy, prompt, high, width);
- getyx(dummy, y, x);
-
- copywin(dummy, /* srcwin */
- win, /* dstwin */
- offset + MARGIN, /* sminrow */
- MARGIN, /* smincol */
- MARGIN, /* dminrow */
- MARGIN, /* dmincol */
- height, /* dmaxrow */
- wide, /* dmaxcol */
- FALSE);
-
- delwin(dummy);
-
- /* if the text is incomplete, or we have scrolled, show the percentage */
- if (y > 0 && wide > 4) {
- percent = (int) ((height + offset) * 100.0 / y);
- if (percent < 0)
- percent = 0;
- if (percent > 100)
- percent = 100;
- if (offset != 0 || percent != 100) {
- (void) wattrset(win, position_indicator_attr);
- (void) wmove(win, MARGIN + height, wide - 4);
- (void) sprintf(buffer, "%d%%", percent);
- (void) waddstr(win, buffer);
- if ((len = (int) strlen(buffer)) < 4) {
- wattrset(win, border_attr);
- whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
+ if (dummy == 0) {
+ wattrset(win, dialog_attr);
+ dlg_print_autowrap(win, prompt, height + 1 + (3 * MARGIN), width);
+ last = 0;
+ } else {
+ wbkgdset(dummy, dialog_attr | ' ');
+ wattrset(dummy, dialog_attr);
+ werase(dummy);
+ dlg_print_autowrap(dummy, prompt, high, width);
+ getyx(dummy, y, x);
+
+ copywin(dummy, /* srcwin */
+ win, /* dstwin */
+ offset + MARGIN, /* sminrow */
+ MARGIN, /* smincol */
+ MARGIN, /* dminrow */
+ MARGIN, /* dmincol */
+ height, /* dmaxrow */
+ wide, /* dmaxcol */
+ FALSE);
+
+ delwin(dummy);
+
+ /* if the text is incomplete, or we have scrolled, show the percentage */
+ if (y > 0 && wide > 4) {
+ percent = (int) ((height + offset) * 100.0 / y);
+ if (percent < 0)
+ percent = 0;
+ if (percent > 100)
+ percent = 100;
+ if (offset != 0 || percent != 100) {
+ (void) wattrset(win, position_indicator_attr);
+ (void) wmove(win, MARGIN + height, wide - 4);
+ (void) sprintf(buffer, "%d%%", percent);
+ (void) waddstr(win, buffer);
+ if ((len = (int) strlen(buffer)) < 4) {
+ wattrset(win, border_attr);
+ whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
+ }
}
}
+ last = (y - height);
}
- last = (y - height);
} else
#endif
{
@@ -1037,6 +1081,25 @@ 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.
@@ -1074,7 +1137,7 @@ real_auto_size(const char *title,
} else if (prompt != 0) {
wide = MAX(title_length, mincols);
if (strchr(prompt, '\n') == 0) {
- double val = dialog_state.aspect_ratio * dlg_count_columns(prompt);
+ double val = dialog_state.aspect_ratio * count_real_columns(prompt);
double xxx = sqrt(val);
int tmp = (int) xxx;
wide = MAX(wide, tmp);
@@ -1190,6 +1253,27 @@ dlg_auto_sizefile(const char *title,
(void) fclose(fd);
}
+static chtype
+dlg_get_cell_attrs(WINDOW *win)
+{
+ chtype result;
+#ifdef USE_WIDE_CURSES
+ cchar_t wch;
+ wchar_t cc;
+ attr_t attrs;
+ short pair;
+ if (win_wch(win, &wch) == OK
+ && getcchar(&wch, &cc, &attrs, &pair, NULL) == OK) {
+ result = attrs;
+ } else {
+ result = 0;
+ }
+#else
+ result = winch(win) & (A_ATTRIBUTES & ~A_COLOR);
+#endif
+ return result;
+}
+
/*
* Draw a rectangular box with line drawing characters.
*
@@ -1239,54 +1323,221 @@ dlg_draw_box(WINDOW *win, int y, int x, int height, int width,
wattrset(win, save);
}
+static DIALOG_WINDOWS *
+find_window(WINDOW *win)
+{
+ DIALOG_WINDOWS *result = 0;
+ DIALOG_WINDOWS *p;
+
+ for (p = dialog_state.all_windows; p != 0; p = p->next) {
+ if (p->normal == win) {
+ result = p;
+ break;
+ }
+ }
+ return result;
+}
+
#ifdef HAVE_COLOR
/*
- * Draw a shadow on the parent window corresponding to the right- and
- * bottom-edge of the child window, to give a 3-dimensional look.
+ * If we have wchgat(), use that for updating shadow attributes, to work with
+ * wide-character data.
*/
-static void
-draw_childs_shadow(WINDOW *parent, WINDOW *child)
+
+/*
+ * Check if the given point is "in" the given window. If so, return the window
+ * pointer, otherwise null.
+ */
+static WINDOW *
+in_window(WINDOW *win, int y, int x)
{
- if (has_colors()) { /* Whether terminal supports color? */
- chtype save = dlg_get_attrs(parent);
+ WINDOW *result = 0;
+ int y_base = getbegy(win);
+ int x_base = getbegx(win);
+ int y_last = getmaxy(win) + y_base;
+ int x_last = getmaxx(win) + x_base;
+
+ if (y >= y_base && y <= y_last && x >= x_base && x <= x_last)
+ result = win;
+ return result;
+}
+
+static WINDOW *
+window_at_cell(DIALOG_WINDOWS * dw, int y, int x)
+{
+ WINDOW *result = 0;
+ DIALOG_WINDOWS *p;
+ int y_want = y + getbegy(dw->shadow);
+ int x_want = x + getbegx(dw->shadow);
+
+ for (p = dialog_state.all_windows; p != 0; p = p->next) {
+ if (dw->normal != p->normal
+ && dw->shadow != p->normal
+ && (result = in_window(p->normal, y_want, x_want)) != 0) {
+ break;
+ }
+ }
+ if (result == 0) {
+ result = stdscr;
+ }
+ return result;
+}
- dlg_draw_shadow(parent,
- getbegy(child) - getbegy(parent),
- getbegx(child) - getbegx(parent),
- getmaxy(child),
- getmaxx(child));
- wattrset(parent, save);
+static bool
+in_shadow(WINDOW *normal, WINDOW *shadow, int y, int x)
+{
+ bool result = FALSE;
+ int ybase = getbegy(normal);
+ int ylast = getmaxy(normal) + ybase;
+ int xbase = getbegx(normal);
+ int xlast = getmaxx(normal) + xbase;
+
+ y += getbegy(shadow);
+ x += getbegx(shadow);
+
+ if (y >= ybase + SHADOW_ROWS
+ && y < ylast + SHADOW_ROWS
+ && x >= xlast
+ && x < xlast + SHADOW_COLS) {
+ /* in the right-side */
+ result = TRUE;
+ } else if (y >= ylast
+ && y < ylast + SHADOW_ROWS
+ && x >= ybase + SHADOW_COLS
+ && x < ylast + SHADOW_COLS) {
+ /* check the bottom */
+ result = TRUE;
}
+
+ return result;
}
/*
- * Draw shadows along the right and bottom edge to give a more 3D look
- * to the boxes
+ * When erasing a shadow, check each cell to make sure that it is not part of
+ * another box's shadow. This is a little complicated since most shadows are
+ * merged onto stdscr.
*/
-void
-dlg_draw_shadow(WINDOW *win, int y, int x, int height, int width)
+static bool
+last_shadow(DIALOG_WINDOWS * dw, int y, int x)
+{
+ DIALOG_WINDOWS *p;
+ bool result = TRUE;
+
+ for (p = dialog_state.all_windows; p != 0; p = p->next) {
+ if (p->normal != dw->normal
+ && in_shadow(p->normal, dw->shadow, y, x)) {
+ result = FALSE;
+ break;
+ }
+ }
+ return result;
+}
+
+static void
+repaint_cell(DIALOG_WINDOWS * dw, bool draw, int y, int x)
+{
+ WINDOW *win = dw->shadow;
+ WINDOW *cellwin;
+ int y2, x2;
+
+ if ((cellwin = window_at_cell(dw, y, x)) != 0
+ && (draw || last_shadow(dw, y, x))
+ && (y2 = (y + getbegy(win) - getbegy(cellwin))) >= 0
+ && (x2 = (x + getbegx(win) - getbegx(cellwin))) >= 0
+ && wmove(cellwin, y2, x2) != ERR) {
+ chtype the_cell = dlg_get_attrs(cellwin);
+ chtype the_attr = (draw ? shadow_attr : the_cell);
+
+ if (dlg_get_cell_attrs(cellwin) & A_ALTCHARSET) {
+ the_attr |= A_ALTCHARSET;
+ }
+#if USE_WCHGAT
+ wchgat(cellwin, 1,
+ the_attr & (chtype) (~A_COLOR),
+ PAIR_NUMBER(the_attr),
+ NULL);
+#else
+ {
+ chtype the_char = ((winch(cellwin) & A_CHARTEXT) | the_attr);
+ (void) waddch(cellwin, the_char);
+ }
+#endif
+ wnoutrefresh(cellwin);
+ }
+}
+
+#define RepaintCell(dw, draw, y, x) repaint_cell(dw, draw, y, x)
+
+static void
+repaint_shadow(DIALOG_WINDOWS * dw, bool draw, int y, int x, int height, int width)
{
int i, j;
- if (has_colors()) { /* Whether terminal supports color? */
- wattrset(win, shadow_attr);
+ if (UseShadow(dw)) {
+#if !USE_WCHGAT
+ chtype save = dlg_get_attrs(dw->shadow);
+ wattrset(dw->shadow, draw ? shadow_attr : screen_attr);
+#endif
for (i = 0; i < SHADOW_ROWS; ++i) {
for (j = 0; j < width; ++j) {
- if (wmove(win, i + y + height, j + x + SHADOW_COLS) != ERR) {
- (void) waddch(win, winch(win) & (chtype) (~A_COLOR));
- }
+ RepaintCell(dw, draw, i + y + height, j + x + SHADOW_COLS);
}
}
for (i = 0; i < height; i++) {
for (j = 0; j < SHADOW_COLS; ++j) {
- if (wmove(win, i + y + SHADOW_ROWS, j + x + width) != ERR) {
- (void) waddch(win, winch(win) & (chtype) (~A_COLOR));
- }
+ RepaintCell(dw, draw, i + y + SHADOW_ROWS, j + x + width);
}
}
- (void) wnoutrefresh(win);
+ (void) wnoutrefresh(dw->shadow);
+#if !USE_WCHGAT
+ wattrset(dw->shadow, save);
+#endif
+ }
+}
+
+/*
+ * Draw a shadow on the parent window corresponding to the right- and
+ * bottom-edge of the child window, to give a 3-dimensional look.
+ */
+static void
+draw_childs_shadow(DIALOG_WINDOWS * dw)
+{
+ if (UseShadow(dw)) {
+ repaint_shadow(dw,
+ TRUE,
+ getbegy(dw->normal) - getbegy(dw->shadow),
+ getbegx(dw->normal) - getbegx(dw->shadow),
+ getmaxy(dw->normal),
+ getmaxx(dw->normal));
}
}
+
+/*
+ * Erase a shadow on the parent window corresponding to the right- and
+ * bottom-edge of the child window.
+ */
+static void
+erase_childs_shadow(DIALOG_WINDOWS * dw)
+{
+ if (UseShadow(dw)) {
+ repaint_shadow(dw,
+ FALSE,
+ getbegy(dw->normal) - getbegy(dw->shadow),
+ getbegx(dw->normal) - getbegx(dw->shadow),
+ getmaxy(dw->normal),
+ getmaxx(dw->normal));
+ }
+}
+
+/*
+ * Draw shadows along the right and bottom edge to give a more 3D look
+ * to the boxes.
+ */
+void
+dlg_draw_shadow(WINDOW *win, int y, int x, int height, int width)
+{
+ repaint_shadow(find_window(win), TRUE, y, x, height, width);
+}
#endif /* HAVE_COLOR */
/*
@@ -1340,6 +1591,10 @@ dlg_exit(int code)
code = DLG_EXIT_HELP;
goto retry;
}
+#ifdef HAVE_DLG_TRACE
+ dlg_trace((const char *) 0); /* close it */
+#endif
+
#ifdef NO_LEAKS
_dlg_inputstr_leaks();
#if defined(NCURSES_VERSION) && defined(HAVE__NC_FREE_AND_EXIT)
@@ -1650,6 +1905,8 @@ dlg_del_window(WINDOW *win)
}
if (q) {
+ if (dialog_state.all_windows != 0)
+ erase_childs_shadow(q);
delwin(q->normal);
dlg_unregister_window(q->normal);
free(q);
@@ -1663,26 +1920,13 @@ dlg_del_window(WINDOW *win)
WINDOW *
dlg_new_window(int height, int width, int y, int x)
{
- WINDOW *win;
- DIALOG_WINDOWS *p = dlg_calloc(DIALOG_WINDOWS, 1);
-
- if ((win = newwin(height, width, y, x)) == 0) {
- dlg_exiterr("Can't make new window at (%d,%d), size (%d,%d).\n",
- y, x, height, width);
- }
- p->next = dialog_state.all_windows;
- p->normal = win;
- dialog_state.all_windows = p;
-#ifdef HAVE_COLOR
- if (dialog_state.use_shadow) {
- draw_childs_shadow(p->shadow = stdscr, win);
- }
-#endif
-
- (void) keypad(win, TRUE);
- return win;
+ return dlg_new_modal_window(stdscr, height, width, y, x);
}
+/*
+ * "Modal" windows differ from normal ones by having a shadow in a window
+ * separate from the standard screen.
+ */
WINDOW *
dlg_new_modal_window(WINDOW *parent, int height, int width, int y, int x)
{
@@ -1699,7 +1943,8 @@ dlg_new_modal_window(WINDOW *parent, int height, int width, int y, int x)
dialog_state.all_windows = p;
#ifdef HAVE_COLOR
if (dialog_state.use_shadow) {
- draw_childs_shadow(p->shadow = parent, win);
+ p->shadow = parent;
+ draw_childs_shadow(p);
}
#endif
@@ -1714,19 +1959,12 @@ dlg_new_modal_window(WINDOW *parent, int height, int width, int y, int x)
void
dlg_move_window(WINDOW *win, int height, int width, int y, int x)
{
- DIALOG_WINDOWS *p, *q;
+ DIALOG_WINDOWS *p;
if (win != 0) {
dlg_ctl_size(height, width);
- for (p = dialog_state.all_windows; p != 0; p = q) {
- q = p->next;
- if (p->normal == win) {
- break;
- }
- }
-
- if (p != 0) {
+ if ((p = find_window(win)) != 0) {
(void) wresize(win, height, width);
(void) mvwin(win, y, x);
#ifdef HAVE_COLOR
@@ -1741,8 +1979,7 @@ dlg_move_window(WINDOW *win, int height, int width, int y, int x)
(void) refresh();
#ifdef HAVE_COLOR
- if (p->shadow)
- draw_childs_shadow(p->shadow, win);
+ draw_childs_shadow(p);
#endif
}
}
@@ -1883,7 +2120,7 @@ dlg_trim_string(char *s)
char *base = s;
char *p1;
char *p = s;
- int has_newlines = (strstr(s, "\\n") != 0);
+ int has_newlines = !dialog_vars.no_nl_expand && (strstr(s, "\\n") != 0);
while (*p != '\0') {
if (*p == TAB && !dialog_vars.nocollapse)
diff --git a/yesno.c b/yesno.c
index c666154c6d32..4efb073926af 100644
--- a/yesno.c
+++ b/yesno.c
@@ -1,9 +1,9 @@
/*
- * $Id: yesno.c,v 1.49 2010/01/15 10:54:54 tom Exp $
+ * $Id: yesno.c,v 1.51 2011/06/27 08:20:57 tom Exp $
*
* yesno.c -- implements the yes/no box
*
- * Copyright 1999-2009,2010 Thomas E. Dickey
+ * Copyright 1999-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
@@ -35,6 +35,7 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
{
/* *INDENT-OFF* */
static DLG_KEYS_BINDING binding[] = {
+ HELPKEY_BINDINGS,
ENTERKEY_BINDINGS,
DLG_KEYS_DATA( DLGK_ENTER, ' ' ),
DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_DOWN ),
@@ -89,6 +90,7 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
dlg_draw_bottom_box(dialog);
dlg_draw_title(dialog, title);
+ dlg_draw_helpline(dialog, FALSE);
wattrset(dialog, dialog_attr);