diff options
Diffstat (limited to 'patches/ncurses/6.0/170-ncurses-6.0-20151010.patch')
| -rw-r--r-- | patches/ncurses/6.0/170-ncurses-6.0-20151010.patch | 5485 |
1 files changed, 5485 insertions, 0 deletions
diff --git a/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch b/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch new file mode 100644 index 00000000..1f9e9499 --- /dev/null +++ b/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch @@ -0,0 +1,5485 @@ +# ncurses 6.0 - patch 20151010 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.0 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.0 can be found at +# ftp://invisible-island.net/ncurses/6.0 +# http://invisible-mirror.net/archives/ncurses/6.0 +# +# ------------------------------------------------------------------------------ +# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151010.patch.gz +# patch by Thomas E. Dickey <dickey@invisible-island.net> +# created Sun Oct 11 01:01:49 UTC 2015 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 10 +# Ada95/configure | 54 +- +# NEWS | 12 +# VERSION | 2 +# aclocal.m4 | 20 +# configure | 861 ++++++++++++++++++++----------------- +# dist.mk | 4 +# ncurses/base/MKlib_gen.sh | 3 +# ncurses/base/resizeterm.c | 12 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# test/aclocal.m4 | 30 + +# test/configure | 722 +++++++++++++++++++------------ +# test/configure.in | 13 +# test/demo_termcap.c | 4 +# test/demo_terminfo.c | 6 +# test/view.c | 26 - +# 21 files changed, 1085 insertions(+), 714 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/aclocal.m4 +Prereq: 1.106 +--- ncurses-6.0-20150926+/Ada95/aclocal.m4 2015-08-22 21:14:14.000000000 +0000 ++++ ncurses-6.0-20151010/Ada95/aclocal.m4 2015-10-10 19:52:33.000000000 +0000 +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.106 2015/08/22 21:14:14 tom Exp $ ++dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -365,15 +365,19 @@ + ])dnl + ])])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29 ++dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05 + dnl ----------- + dnl Check for suitable "ar" (archiver) options for updating an archive. ++dnl ++dnl In particular, handle some obsolete cases where the "-" might be omitted, ++dnl as well as a workaround for breakage of make's archive rules by the GNU ++dnl binutils "ar" program. + AC_DEFUN([CF_AR_FLAGS],[ + AC_REQUIRE([CF_PROG_AR]) + + AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice +Index: Ada95/configure +--- ncurses-6.0-20150926+/Ada95/configure 2015-09-19 20:50:21.000000000 +0000 ++++ ncurses-6.0-20151010/Ada95/configure 2015-10-10 19:53:00.000000000 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh + # From configure.in Revision: 1.61 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20141204. ++# Generated by Autoconf 2.52.20150926. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -804,7 +804,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20141204. Invocation command line was ++generated by GNU Autoconf 2.52.20150926. Invocation command line was + + $ $0 $@ + +@@ -3268,7 +3268,7 @@ + else + + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice +@@ -14601,7 +14601,7 @@ + cat >>$CONFIG_STATUS <<EOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.52.20141204, ++configured by $0, generated by GNU Autoconf 2.52.20150926, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +@@ -14683,7 +14683,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20141204, executed with ++This file was extended by $as_me 2.52.20150926, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -14974,10 +14974,28 @@ + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed ++ # It is possible to make a multiline substitution using escaped newlines. ++ # Ensure that we do not split the substitution between script fragments. ++ ac_BEG=$ac_end ++ ac_END=`expr $ac_end + $ac_max_sed_lines` ++ sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next ++ if test -s $tmp/subs.next; then ++ grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit ++ if test ! -s $tmp/subs.edit; then ++ grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit ++ if test ! -s $tmp/subs.edit; then ++ if test $ac_beg -gt 1; then ++ ac_end=`expr $ac_end - 1` ++ continue ++ fi ++ fi ++ fi ++ fi ++ + if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" ++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" ++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end +@@ -15060,7 +15078,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:15063: creating $ac_file" >&5 ++ { echo "$as_me:15081: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -15078,7 +15096,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:15081: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:15099: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -15091,7 +15109,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:15094: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:15112: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -15107,7 +15125,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:15110: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:15128: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -15116,7 +15134,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:15119: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:15137: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -15153,7 +15171,7 @@ + ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:15156: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:15174: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -15164,7 +15182,7 @@ + egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:15167: WARNING: Some variables may not be substituted: ++ { echo "$as_me:15185: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -15213,7 +15231,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:15216: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:15234: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -15224,7 +15242,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:15227: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:15245: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -15237,7 +15255,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:15240: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:15258: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -15295,7 +15313,7 @@ + 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:15298: $ac_file is unchanged" >&5 ++ { echo "$as_me:15316: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: NEWS +Prereq: 1.2499 +--- ncurses-6.0-20150926+/NEWS 2015-09-26 21:58:14.000000000 +0000 ++++ ncurses-6.0-20151010/NEWS 2015-10-10 20:24:26.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $ ++-- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,16 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20151010 ++ + add configure check for openpty to test/configure script, for ditto. ++ + minor fixes to test/view.c in investigating Debian #790847. ++ + update autoconf patch to 2.52.20150926, incorporates a fix for Cdk. ++ + add workaround for breakage of POSIX makefiles by recent binutils ++ change. ++ + improve check for working poll() by using posix_openpt() as a ++ fallback in case there is no valid terminal on the standard input ++ (prompted by discussion on bug-ncurses mailing list, Debian #676461). ++ + 20150926 + + change makefile rule for removing resulting.map to distclean rather + than clean. +Index: VERSION +--- ncurses-6.0-20150926+/VERSION 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/VERSION 2015-10-10 17:06:12.000000000 +0000 +@@ -1 +1 @@ +-5:0:9 6.0 20150926 ++5:0:9 6.0 20151010 +Index: aclocal.m4 +Prereq: 1.768 +--- ncurses-6.0-20150926+/aclocal.m4 2015-09-26 21:56:12.000000000 +0000 ++++ ncurses-6.0-20151010/aclocal.m4 2015-10-10 19:27:07.000000000 +0000 +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $ ++dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -423,15 +423,19 @@ + ])dnl + ])])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29 ++dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05 + dnl ----------- + dnl Check for suitable "ar" (archiver) options for updating an archive. ++dnl ++dnl In particular, handle some obsolete cases where the "-" might be omitted, ++dnl as well as a workaround for breakage of make's archive rules by the GNU ++dnl binutils "ar" program. + AC_DEFUN([CF_AR_FLAGS],[ + AC_REQUIRE([CF_PROG_AR]) + + AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice +@@ -1821,11 +1825,12 @@ + ]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_FUNC_POLL version: 8 updated: 2012/10/04 05:24:07 ++dnl CF_FUNC_POLL version: 9 updated: 2015/10/10 13:27:32 + dnl ------------ + dnl See if the poll function really works. Some platforms have poll(), but + dnl it does not work for terminals or files. + AC_DEFUN([CF_FUNC_POLL],[ ++tty 2>&1 >/dev/null || { AC_CHECK_FUNCS(posix_openpt) } + AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[ + AC_TRY_RUN([ + #include <stdlib.h> +@@ -1837,7 +1842,7 @@ + #else + #include <sys/poll.h> + #endif +-int main() { ++int main(void) { + struct pollfd myfds; + int ret; + +@@ -1857,6 +1862,11 @@ + if (!isatty(fd)) { + fd = open("/dev/tty", 2); /* O_RDWR */ + } ++#ifdef HAVE_POSIX_OPENPT ++ if (fd < 0) { ++ fd = posix_openpt(O_RDWR); ++ } ++#endif + + if (fd >= 0) { + /* also check with standard input */ +Index: configure +--- ncurses-6.0-20150926+/configure 2015-09-26 21:56:47.000000000 +0000 ++++ ncurses-6.0-20151010/configure 2015-10-10 19:18:37.000000000 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh + # From configure.in Revision: 1.619 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20141204. ++# Generated by Autoconf 2.52.20150926. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -907,7 +907,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20141204. Invocation command line was ++generated by GNU Autoconf 2.52.20150926. Invocation command line was + + $ $0 $@ + +@@ -4408,7 +4408,7 @@ + else + + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice +@@ -17833,7 +17833,77 @@ + + fi + +-echo "$as_me:17836: checking if poll really works" >&5 ++tty 2>&1 >/dev/null || { ++for ac_func in posix_openpt ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:17840: 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 17846 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++char (*f) (); ++ ++int ++main () ++{ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:17877: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:17880: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:17883: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:17886: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++eval "$as_ac_var=no" ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:17896: 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 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++EOF ++ ++fi ++done ++ } ++echo "$as_me:17906: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17843,7 +17913,7 @@ + cf_cv_working_poll=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 17846 "configure" ++#line 17916 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -17855,7 +17925,7 @@ + #else + #include <sys/poll.h> + #endif +-int main() { ++int main(void) { + struct pollfd myfds; + int ret; + +@@ -17875,6 +17945,11 @@ + if (!isatty(fd)) { + fd = open("/dev/tty", 2); /* O_RDWR */ + } ++#ifdef HAVE_POSIX_OPENPT ++ if (fd < 0) { ++ fd = posix_openpt(O_RDWR); ++ } ++#endif + + if (fd >= 0) { + /* also check with standard input */ +@@ -17890,15 +17965,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:17893: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17968: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17896: \$? = $ac_status" >&5 ++ echo "$as_me:17971: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:17898: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17973: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17901: \$? = $ac_status" >&5 ++ echo "$as_me:17976: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_working_poll=yes + else +@@ -17910,21 +17985,21 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:17913: result: $cf_cv_working_poll" >&5 ++echo "$as_me:17988: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && + cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:17920: checking for va_copy" >&5 ++echo "$as_me:17995: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 17927 "configure" ++#line 18002 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -17941,16 +18016,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17944: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18019: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17947: \$? = $ac_status" >&5 ++ echo "$as_me:18022: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17950: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17953: \$? = $ac_status" >&5 ++ echo "$as_me:18028: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_va_copy=yes + else +@@ -17960,7 +18035,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17963: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:18038: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + test "$cf_cv_have_va_copy" = yes && +@@ -17968,14 +18043,14 @@ + #define HAVE_VA_COPY 1 + EOF + +-echo "$as_me:17971: checking for __va_copy" >&5 ++echo "$as_me:18046: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 17978 "configure" ++#line 18053 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -17992,16 +18067,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17995: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18070: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17998: \$? = $ac_status" >&5 ++ echo "$as_me:18073: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18001: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18076: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18004: \$? = $ac_status" >&5 ++ echo "$as_me:18079: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___va_copy=yes + else +@@ -18011,7 +18086,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:18014: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:18089: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + test "$cf_cv_have___va_copy" = yes && +@@ -18019,13 +18094,13 @@ + #define HAVE___VA_COPY 1 + EOF + +-echo "$as_me:18022: checking for pid_t" >&5 ++echo "$as_me:18097: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18028 "configure" ++#line 18103 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -18040,16 +18115,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18043: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18118: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18046: \$? = $ac_status" >&5 ++ echo "$as_me:18121: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18049: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18124: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18052: \$? = $ac_status" >&5 ++ echo "$as_me:18127: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_pid_t=yes + else +@@ -18059,7 +18134,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18062: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:18137: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test $ac_cv_type_pid_t = yes; then + : +@@ -18074,23 +18149,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:18077: checking for $ac_header" >&5 ++echo "$as_me:18152: 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 18083 "configure" ++#line 18158 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:18087: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18162: \"$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:18093: \$? = $ac_status" >&5 ++ echo "$as_me:18168: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18109,7 +18184,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:18112: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:18187: 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 +@@ -18122,13 +18197,13 @@ + for ac_func in fork vfork + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:18125: checking for $ac_func" >&5 ++echo "$as_me:18200: 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 18131 "configure" ++#line 18206 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -18159,16 +18234,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18162: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18237: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18165: \$? = $ac_status" >&5 ++ echo "$as_me:18240: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18168: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18243: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18171: \$? = $ac_status" >&5 ++ echo "$as_me:18246: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -18178,7 +18253,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:18181: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:18256: 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 +@@ -18190,7 +18265,7 @@ + + ac_cv_func_fork_works=$ac_cv_func_fork + if test "x$ac_cv_func_fork" = xyes; then +- echo "$as_me:18193: checking for working fork" >&5 ++ echo "$as_me:18268: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18213,15 +18288,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:18216: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18291: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18219: \$? = $ac_status" >&5 ++ echo "$as_me:18294: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:18221: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18224: \$? = $ac_status" >&5 ++ echo "$as_me:18299: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fork_works=yes + else +@@ -18233,7 +18308,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:18236: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:18311: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -18247,12 +18322,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:18250: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:18325: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:18255: checking for working vfork" >&5 ++ echo "$as_me:18330: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18261,7 +18336,7 @@ + ac_cv_func_vfork_works=cross + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18264 "configure" ++#line 18339 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include <stdio.h> +@@ -18358,15 +18433,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:18361: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18436: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18364: \$? = $ac_status" >&5 ++ echo "$as_me:18439: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:18366: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18441: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18369: \$? = $ac_status" >&5 ++ echo "$as_me:18444: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -18378,13 +18453,13 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:18381: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:18456: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:18387: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:18462: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -18411,7 +18486,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:18414: checking for openpty in -lutil" >&5 ++echo "$as_me:18489: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18419,7 +18494,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18422 "configure" ++#line 18497 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18438,16 +18513,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18441: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18516: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18444: \$? = $ac_status" >&5 ++ echo "$as_me:18519: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18522: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18450: \$? = $ac_status" >&5 ++ echo "$as_me:18525: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -18458,7 +18533,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18461: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:18536: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test $ac_cv_lib_util_openpty = yes; then + cf_cv_lib_util=yes +@@ -18466,7 +18541,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:18469: checking for openpty header" >&5 ++echo "$as_me:18544: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18493,7 +18568,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18496 "configure" ++#line 18571 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -18510,16 +18585,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18513: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18588: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18516: \$? = $ac_status" >&5 ++ echo "$as_me:18591: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18519: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18594: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18522: \$? = $ac_status" >&5 ++ echo "$as_me:18597: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -18537,7 +18612,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:18540: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:18615: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -18607,7 +18682,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 18610 "configure" ++#line 18685 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -18619,16 +18694,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18697: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18625: \$? = $ac_status" >&5 ++ echo "$as_me:18700: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18628: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18703: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18631: \$? = $ac_status" >&5 ++ echo "$as_me:18706: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -18645,7 +18720,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:18648: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:18723: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -18681,7 +18756,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:18684: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:18759: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -18692,7 +18767,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:18695: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:18770: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -18761,7 +18836,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 18764 "configure" ++#line 18839 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -18773,16 +18848,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18776: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18779: \$? = $ac_status" >&5 ++ echo "$as_me:18854: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18782: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18857: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18785: \$? = $ac_status" >&5 ++ echo "$as_me:18860: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -18799,7 +18874,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:18802: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:18877: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -18879,7 +18954,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:18882: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:18957: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -18896,23 +18971,23 @@ + fi + esac + +-echo "$as_me:18899: checking for db.h" >&5 ++echo "$as_me:18974: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18905 "configure" ++#line 18980 "configure" + #include "confdefs.h" + #include <db.h> + _ACEOF +-if { (eval echo "$as_me:18909: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18984: \"$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:18915: \$? = $ac_status" >&5 ++ echo "$as_me:18990: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18931,11 +19006,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:18934: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:19009: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test $ac_cv_header_db_h = yes; then + +-echo "$as_me:18938: checking for version of db" >&5 ++echo "$as_me:19013: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18946,10 +19021,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:18949: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:19024: testing checking for db version $cf_db_version ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 18952 "configure" ++#line 19027 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -18979,16 +19054,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19057: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18985: \$? = $ac_status" >&5 ++ echo "$as_me:19060: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18988: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19063: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18991: \$? = $ac_status" >&5 ++ echo "$as_me:19066: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -19002,16 +19077,16 @@ + done + + fi +-echo "$as_me:19005: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:19080: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:19009: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:19084: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:19014: checking for db libraries" >&5 ++echo "$as_me:19089: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19041,10 +19116,10 @@ + + fi + +-echo "${as_me:-configure}:19044: testing checking for library "$cf_db_libs" ..." 1>&5 ++echo "${as_me:-configure}:19119: testing checking for library "$cf_db_libs" ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 19047 "configure" ++#line 19122 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -19099,16 +19174,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19102: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19177: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19105: \$? = $ac_status" >&5 ++ echo "$as_me:19180: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19108: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19111: \$? = $ac_status" >&5 ++ echo "$as_me:19186: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -19128,11 +19203,11 @@ + done + + fi +-echo "$as_me:19131: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:19206: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:19135: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:19210: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -19158,7 +19233,7 @@ + + else + +- { { echo "$as_me:19161: error: Cannot find db.h" >&5 ++ { { echo "$as_me:19236: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -19173,7 +19248,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:19176: checking if we should include stdbool.h" >&5 ++echo "$as_me:19251: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -19181,7 +19256,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 19184 "configure" ++#line 19259 "configure" + #include "confdefs.h" + + int +@@ -19193,23 +19268,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19196: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19199: \$? = $ac_status" >&5 ++ echo "$as_me:19274: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19202: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19277: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19205: \$? = $ac_status" >&5 ++ echo "$as_me:19280: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 19212 "configure" ++#line 19287 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -19225,16 +19300,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19228: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19231: \$? = $ac_status" >&5 ++ echo "$as_me:19306: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19234: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19309: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19237: \$? = $ac_status" >&5 ++ echo "$as_me:19312: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -19248,13 +19323,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:19251: result: yes" >&5 ++then echo "$as_me:19326: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:19253: result: no" >&5 ++else echo "$as_me:19328: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:19257: checking for builtin bool type" >&5 ++echo "$as_me:19332: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -19262,7 +19337,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 19265 "configure" ++#line 19340 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -19277,16 +19352,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19355: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19283: \$? = $ac_status" >&5 ++ echo "$as_me:19358: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19286: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19289: \$? = $ac_status" >&5 ++ echo "$as_me:19364: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -19299,9 +19374,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:19302: result: yes" >&5 ++then echo "$as_me:19377: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:19304: result: no" >&5 ++else echo "$as_me:19379: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -19318,10 +19393,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:19321: checking if we already have C++ library" >&5 ++ echo "$as_me:19396: checking if we already have C++ library" >&5 + echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 19324 "configure" ++#line 19399 "configure" + #include "confdefs.h" + + #include <iostream> +@@ -19335,16 +19410,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19338: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19413: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19341: \$? = $ac_status" >&5 ++ echo "$as_me:19416: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19347: \$? = $ac_status" >&5 ++ echo "$as_me:19422: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_libstdcpp=yes + else +@@ -19353,7 +19428,7 @@ + cf_have_libstdcpp=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:19356: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:19431: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -19368,7 +19443,7 @@ + ;; + esac + +- echo "$as_me:19371: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:19446: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19394,7 +19469,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 19397 "configure" ++#line 19472 "configure" + #include "confdefs.h" + + #include <iostream> +@@ -19408,16 +19483,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19411: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19486: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19414: \$? = $ac_status" >&5 ++ echo "$as_me:19489: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19417: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19492: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19420: \$? = $ac_status" >&5 ++ echo "$as_me:19495: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_libstdcpp=yes + else +@@ -19429,7 +19504,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:19432: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:19507: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="-l$cf_stdcpp_libname" +@@ -19451,7 +19526,7 @@ + fi + fi + +- echo "$as_me:19454: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:19529: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19467,15 +19542,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:19470: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:19545: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19473: \$? = $ac_status" >&5 ++ echo "$as_me:19548: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:19475: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:19550: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19478: \$? = $ac_status" >&5 ++ echo "$as_me:19553: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -19486,10 +19561,10 @@ + + fi + if test $cf_cv_prog_CXX_c_o = yes; then +- echo "$as_me:19489: result: yes" >&5 ++ echo "$as_me:19564: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:19492: result: no" >&5 ++ echo "$as_me:19567: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -19509,7 +19584,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:19512: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:19587: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -19530,7 +19605,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 19533 "configure" ++#line 19608 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -19544,16 +19619,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19547: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19622: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19550: \$? = $ac_status" >&5 ++ echo "$as_me:19625: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19553: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19628: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19556: \$? = $ac_status" >&5 ++ echo "$as_me:19631: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_library=yes + +@@ -19590,7 +19665,7 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 19593 "configure" ++#line 19668 "configure" + #include "confdefs.h" + + #include <builtin.h> +@@ -19604,16 +19679,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19607: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19682: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19610: \$? = $ac_status" >&5 ++ echo "$as_me:19685: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19613: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19688: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19616: \$? = $ac_status" >&5 ++ echo "$as_me:19691: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_library=yes + +@@ -19646,7 +19721,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save" +- echo "$as_me:19649: result: $cf_cxx_library" >&5 ++ echo "$as_me:19724: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -19662,7 +19737,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return=return +-echo "$as_me:19665: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:19740: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -19679,18 +19754,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 19682 "configure" ++#line 19757 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:19687: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19762: \"$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:19693: \$? = $ac_status" >&5 ++ echo "$as_me:19768: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -19713,17 +19788,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 19716 "configure" ++#line 19791 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:19720: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19795: \"$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:19726: \$? = $ac_status" >&5 ++ echo "$as_me:19801: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -19760,7 +19835,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:19763: result: $CXXCPP" >&5 ++echo "$as_me:19838: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -19770,18 +19845,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 19773 "configure" ++#line 19848 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:19778: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19853: \"$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:19784: \$? = $ac_status" >&5 ++ echo "$as_me:19859: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -19804,17 +19879,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 19807 "configure" ++#line 19882 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:19811: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19886: \"$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:19817: \$? = $ac_status" >&5 ++ echo "$as_me:19892: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -19842,7 +19917,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:19845: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:19920: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -19857,23 +19932,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:19860: checking for $ac_header" >&5 ++echo "$as_me:19935: 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 19866 "configure" ++#line 19941 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:19870: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19945: \"$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:19876: \$? = $ac_status" >&5 ++ echo "$as_me:19951: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -19892,7 +19967,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:19895: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:19970: 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 +@@ -19905,23 +19980,23 @@ + for ac_header in iostream + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:19908: checking for $ac_header" >&5 ++echo "$as_me:19983: 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 19914 "configure" ++#line 19989 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:19918: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19993: \"$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:19924: \$? = $ac_status" >&5 ++ echo "$as_me:19999: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -19940,7 +20015,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:19943: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:20018: 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 +@@ -19951,10 +20026,10 @@ + done + + if test x"$ac_cv_header_iostream" = xyes ; then +- echo "$as_me:19954: checking if iostream uses std-namespace" >&5 ++ echo "$as_me:20029: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 19957 "configure" ++#line 20032 "configure" + #include "confdefs.h" + + #include <iostream> +@@ -19971,16 +20046,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19974: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19977: \$? = $ac_status" >&5 ++ echo "$as_me:20052: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19980: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19983: \$? = $ac_status" >&5 ++ echo "$as_me:20058: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_iostream_namespace=yes + else +@@ -19989,7 +20064,7 @@ + cf_iostream_namespace=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:19992: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:20067: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -20000,7 +20075,7 @@ + fi + fi + +-echo "$as_me:20003: checking if we should include stdbool.h" >&5 ++echo "$as_me:20078: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -20008,7 +20083,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 20011 "configure" ++#line 20086 "configure" + #include "confdefs.h" + + int +@@ -20020,23 +20095,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20023: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20026: \$? = $ac_status" >&5 ++ echo "$as_me:20101: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20029: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20104: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20032: \$? = $ac_status" >&5 ++ echo "$as_me:20107: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 20039 "configure" ++#line 20114 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -20052,16 +20127,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20058: \$? = $ac_status" >&5 ++ echo "$as_me:20133: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20061: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20064: \$? = $ac_status" >&5 ++ echo "$as_me:20139: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -20075,13 +20150,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:20078: result: yes" >&5 ++then echo "$as_me:20153: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:20080: result: no" >&5 ++else echo "$as_me:20155: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:20084: checking for builtin bool type" >&5 ++echo "$as_me:20159: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -20089,7 +20164,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 20092 "configure" ++#line 20167 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -20104,16 +20179,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20107: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20182: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20110: \$? = $ac_status" >&5 ++ echo "$as_me:20185: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20113: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20188: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20116: \$? = $ac_status" >&5 ++ echo "$as_me:20191: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_builtin_bool=1 + else +@@ -20126,13 +20201,13 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:20129: result: yes" >&5 ++then echo "$as_me:20204: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:20131: result: no" >&5 ++else echo "$as_me:20206: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:20135: checking for size of bool" >&5 ++echo "$as_me:20210: checking for size of bool" >&5 + echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20143,7 +20218,7 @@ + cf_cv_type_of_bool=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 20146 "configure" ++#line 20221 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20185,15 +20260,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:20188: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20263: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20191: \$? = $ac_status" >&5 ++ echo "$as_me:20266: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:20193: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20268: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20196: \$? = $ac_status" >&5 ++ echo "$as_me:20271: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -20211,18 +20286,18 @@ + fi + + rm -f cf_test.out +-echo "$as_me:20214: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:20289: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:20220: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:20295: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:20225: checking for special defines needed for etip.h" >&5 ++echo "$as_me:20300: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" +@@ -20240,7 +20315,7 @@ + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >conftest.$ac_ext <<_ACEOF +-#line 20243 "configure" ++#line 20318 "configure" + #include "confdefs.h" + + #include <etip.h.in> +@@ -20254,16 +20329,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20257: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20332: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20260: \$? = $ac_status" >&5 ++ echo "$as_me:20335: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20263: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20338: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20266: \$? = $ac_status" >&5 ++ echo "$as_me:20341: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <<EOF +@@ -20284,12 +20359,12 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + done + done +-echo "$as_me:20287: result: $cf_result" >&5 ++echo "$as_me:20362: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:20292: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:20367: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20306,7 +20381,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 20309 "configure" ++#line 20384 "configure" + #include "confdefs.h" + + class TEST { +@@ -20325,15 +20400,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:20328: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20403: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20331: \$? = $ac_status" >&5 ++ echo "$as_me:20406: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:20333: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20408: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20336: \$? = $ac_status" >&5 ++ echo "$as_me:20411: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -20352,7 +20427,7 @@ + ac_main_return=return + + fi +-echo "$as_me:20355: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:20430: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -20362,7 +20437,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:20365: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:20440: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20376,7 +20451,7 @@ + ac_main_return=return + + cat >conftest.$ac_ext <<_ACEOF +-#line 20379 "configure" ++#line 20454 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -20420,16 +20495,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20423: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20498: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20426: \$? = $ac_status" >&5 ++ echo "$as_me:20501: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20504: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20432: \$? = $ac_status" >&5 ++ echo "$as_me:20507: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -20447,7 +20522,7 @@ + ac_main_return=return + + fi +-echo "$as_me:20450: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:20525: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -20496,7 +20571,7 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:20499: checking for size of bool" >&5 ++echo "$as_me:20574: checking for size of bool" >&5 + echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20507,7 +20582,7 @@ + cf_cv_type_of_bool=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 20510 "configure" ++#line 20585 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20549,15 +20624,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:20552: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20627: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20555: \$? = $ac_status" >&5 ++ echo "$as_me:20630: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:20557: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20632: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20560: \$? = $ac_status" >&5 ++ echo "$as_me:20635: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -20575,25 +20650,25 @@ + fi + + rm -f cf_test.out +-echo "$as_me:20578: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:20653: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:20584: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:20659: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:20590: checking for fallback type of bool" >&5 ++ echo "$as_me:20665: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:20596: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:20671: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -20622,7 +20697,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:20625: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:20700: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -20633,7 +20708,7 @@ + cf_ada_make=gnatmake + # Extract the first word of "$cf_ada_make", so it can be a program name with args. + set dummy $cf_ada_make; ac_word=$2 +-echo "$as_me:20636: checking for $ac_word" >&5 ++echo "$as_me:20711: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_gnat_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20648,7 +20723,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gnat_exists="yes" +-echo "$as_me:20651: found $ac_dir/$ac_word" >&5 ++echo "$as_me:20726: found $ac_dir/$ac_word" >&5 + break + done + +@@ -20657,10 +20732,10 @@ + fi + gnat_exists=$ac_cv_prog_gnat_exists + if test -n "$gnat_exists"; then +- echo "$as_me:20660: result: $gnat_exists" >&5 ++ echo "$as_me:20735: result: $gnat_exists" >&5 + echo "${ECHO_T}$gnat_exists" >&6 + else +- echo "$as_me:20663: result: no" >&5 ++ echo "$as_me:20738: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -20669,12 +20744,12 @@ + cf_cv_prog_gnat_correct=no + else + +-echo "$as_me:20672: checking for gnat version" >&5 ++echo "$as_me:20747: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +-echo "$as_me:20677: result: $cf_gnat_version" >&5 ++echo "$as_me:20752: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 + + case $cf_gnat_version in +@@ -20682,7 +20757,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:20685: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:20760: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -20690,7 +20765,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:20693: checking for $ac_word" >&5 ++echo "$as_me:20768: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20705,7 +20780,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:20708: found $ac_dir/$ac_word" >&5 ++echo "$as_me:20783: found $ac_dir/$ac_word" >&5 + break + done + +@@ -20714,10 +20789,10 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:20717: result: $M4_exists" >&5 ++ echo "$as_me:20792: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:20720: result: no" >&5 ++ echo "$as_me:20795: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -20726,7 +20801,7 @@ + echo Ada95 binding required program m4 not found. Ada95 binding disabled. + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:20729: checking if GNAT works" >&5 ++ echo "$as_me:20804: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -20754,7 +20829,7 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:20757: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:20832: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + fi +@@ -20763,7 +20838,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:20766: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:20841: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -20780,10 +20855,10 @@ + + ;; + esac +- echo "$as_me:20783: result: $ADAFLAGS" >&5 ++ echo "$as_me:20858: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:20786: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:20861: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20793,11 +20868,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:20796: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:20871: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:20800: checking if GNAT supports generics" >&5 ++echo "$as_me:20875: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case $cf_gnat_version in + (3.[1-9]*|[4-9].*) +@@ -20807,7 +20882,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:20810: result: $cf_gnat_generics" >&5 ++echo "$as_me:20885: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -20819,7 +20894,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:20822: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:20897: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20867,7 +20942,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:20870: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:20945: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -20880,7 +20955,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:20883: checking if GNAT supports project files" >&5 ++echo "$as_me:20958: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case $cf_gnat_version in + (3.[0-9]*) +@@ -20940,15 +21015,15 @@ + esac + ;; + esac +-echo "$as_me:20943: result: $cf_gnat_projects" >&5 ++echo "$as_me:21018: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test $cf_gnat_projects = yes + then +- echo "$as_me:20949: checking if GNAT supports libraries" >&5 ++ echo "$as_me:21024: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:20951: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:21026: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -20968,7 +21043,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:20971: checking for ada-compiler" >&5 ++echo "$as_me:21046: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -20979,12 +21054,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:20982: result: $cf_ada_compiler" >&5 ++echo "$as_me:21057: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:20987: checking for ada-include" >&5 ++echo "$as_me:21062: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -21020,7 +21095,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:21023: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:21098: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -21029,10 +21104,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:21032: result: $ADA_INCLUDE" >&5 ++echo "$as_me:21107: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:21035: checking for ada-objects" >&5 ++echo "$as_me:21110: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -21068,7 +21143,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:21071: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:21146: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -21077,10 +21152,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:21080: result: $ADA_OBJECTS" >&5 ++echo "$as_me:21155: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:21083: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:21158: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -21090,7 +21165,7 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:21093: result: $with_ada_sharedlib" >&5 ++echo "$as_me:21168: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' +@@ -21113,13 +21188,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:21116: checking for wchar_t" >&5 ++ echo "$as_me:21191: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 21122 "configure" ++#line 21197 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21134,16 +21209,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21137: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21140: \$? = $ac_status" >&5 ++ echo "$as_me:21215: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21143: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21146: \$? = $ac_status" >&5 ++ echo "$as_me:21221: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -21153,10 +21228,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:21156: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:21231: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:21159: checking size of wchar_t" >&5 ++echo "$as_me:21234: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21165,7 +21240,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 21168 "configure" ++#line 21243 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21177,21 +21252,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21180: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21255: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21183: \$? = $ac_status" >&5 ++ echo "$as_me:21258: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21186: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21261: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21189: \$? = $ac_status" >&5 ++ echo "$as_me:21264: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 21194 "configure" ++#line 21269 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21203,16 +21278,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21206: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21209: \$? = $ac_status" >&5 ++ echo "$as_me:21284: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21212: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21215: \$? = $ac_status" >&5 ++ echo "$as_me:21290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -21228,7 +21303,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 21231 "configure" ++#line 21306 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21240,16 +21315,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21246: \$? = $ac_status" >&5 ++ echo "$as_me:21321: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21249: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21324: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21252: \$? = $ac_status" >&5 ++ echo "$as_me:21327: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -21265,7 +21340,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +-#line 21268 "configure" ++#line 21343 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21277,16 +21352,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21280: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21283: \$? = $ac_status" >&5 ++ echo "$as_me:21358: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21286: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21289: \$? = $ac_status" >&5 ++ echo "$as_me:21364: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -21299,12 +21374,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:21302: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:21377: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +-#line 21307 "configure" ++#line 21382 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21320,15 +21395,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:21323: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21398: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21326: \$? = $ac_status" >&5 ++ echo "$as_me:21401: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:21328: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21403: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21331: \$? = $ac_status" >&5 ++ echo "$as_me:21406: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -21344,7 +21419,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:21347: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:21422: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <<EOF + #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t +@@ -21362,7 +21437,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:21365: checking for library subsets" >&5 ++echo "$as_me:21440: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -21404,7 +21479,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:21407: result: $LIB_SUBSETS" >&5 ++echo "$as_me:21482: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -21435,7 +21510,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:21438: checking default library suffix" >&5 ++echo "$as_me:21513: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -21446,10 +21521,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:21449: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:21524: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:21452: checking default library-dependency suffix" >&5 ++echo "$as_me:21527: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -21507,10 +21582,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:21510: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:21585: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:21513: checking default object directory" >&5 ++echo "$as_me:21588: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -21526,11 +21601,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:21529: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:21604: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:21533: checking c++ library-dependency suffix" >&5 ++echo "$as_me:21608: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -21598,7 +21673,7 @@ + fi + + fi +-echo "$as_me:21601: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:21676: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -21771,19 +21846,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:21774: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:21849: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext <<EOF +-#line 21779 "configure" ++#line 21854 "configure" + #include <stdio.h> + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:21783: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21786: \$? = $ac_status" >&5 ++ echo "$as_me:21861: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -21794,10 +21869,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 21797 "configure" ++#line 21872 "configure" + #include "confdefs.h" + +-#line 21800 "configure" ++#line 21875 "configure" + #include <stdio.h> + int cf_ldflags_static(FILE *fp); + +@@ -21812,16 +21887,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21815: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21890: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21818: \$? = $ac_status" >&5 ++ echo "$as_me:21893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21821: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21824: \$? = $ac_status" >&5 ++ echo "$as_me:21899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + # some linkers simply ignore the -dynamic +@@ -21844,7 +21919,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:21847: result: $cf_ldflags_static" >&5 ++ echo "$as_me:21922: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test $cf_ldflags_static != yes +@@ -21860,7 +21935,7 @@ + ;; + esac + +-echo "$as_me:21863: checking where we will install curses.h" >&5 ++echo "$as_me:21938: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -21870,7 +21945,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:21873: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:21948: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -21878,7 +21953,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:21881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:21956: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -21896,7 +21971,7 @@ + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:21899: checking for src modules" >&5 ++echo "$as_me:21974: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -21961,7 +22036,7 @@ + fi + fi + done +-echo "$as_me:21964: result: $cf_cv_src_modules" >&5 ++echo "$as_me:22039: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -22181,7 +22256,7 @@ + + # Extract the first word of "tic", so it can be a program name with args. + set dummy tic; ac_word=$2 +-echo "$as_me:22184: checking for $ac_word" >&5 ++echo "$as_me:22259: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_TIC_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22198,7 +22273,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TIC_PATH="$ac_dir/$ac_word" +- echo "$as_me:22201: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:22276: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -22210,10 +22285,10 @@ + TIC_PATH=$ac_cv_path_TIC_PATH + + if test -n "$TIC_PATH"; then +- echo "$as_me:22213: result: $TIC_PATH" >&5 ++ echo "$as_me:22288: result: $TIC_PATH" >&5 + echo "${ECHO_T}$TIC_PATH" >&6 + else +- echo "$as_me:22216: result: no" >&5 ++ echo "$as_me:22291: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -22221,7 +22296,7 @@ + then + if test "$TIC_PATH" = unknown + then +- { echo "$as_me:22224: WARNING: no tic program found for fallbacks" >&5 ++ { echo "$as_me:22299: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + fi +@@ -22247,7 +22322,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:22250: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:22325: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -22258,7 +22333,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:22261: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:22336: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -22274,7 +22349,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:22277: result: $PKG_CFLAGS" >&5 ++echo "$as_me:22352: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -22331,7 +22406,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + +-echo "${as_me:-configure}:22334: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:22409: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -22433,7 +22508,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:22436: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:22511: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -22565,7 +22640,7 @@ + cat >>$CONFIG_STATUS <<EOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.52.20141204, ++configured by $0, generated by GNU Autoconf 2.52.20150926, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +@@ -22609,7 +22684,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:22612: error: ambiguous option: $1 ++ { { echo "$as_me:22687: 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;} +@@ -22628,7 +22703,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:22631: error: unrecognized option: $1 ++ -*) { { echo "$as_me:22706: 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;} +@@ -22647,7 +22722,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20141204, executed with ++This file was extended by $as_me 2.52.20150926, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -22746,7 +22821,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:22749: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:22824: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -23115,10 +23190,28 @@ + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed ++ # It is possible to make a multiline substitution using escaped newlines. ++ # Ensure that we do not split the substitution between script fragments. ++ ac_BEG=$ac_end ++ ac_END=`expr $ac_end + $ac_max_sed_lines` ++ sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next ++ if test -s $tmp/subs.next; then ++ grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit ++ if test ! -s $tmp/subs.edit; then ++ grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit ++ if test ! -s $tmp/subs.edit; then ++ if test $ac_beg -gt 1; then ++ ac_end=`expr $ac_end - 1` ++ continue ++ fi ++ fi ++ fi ++ fi ++ + if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" ++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" ++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end +@@ -23201,7 +23294,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:23204: creating $ac_file" >&5 ++ { echo "$as_me:23297: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -23219,7 +23312,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:23222: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:23315: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -23232,7 +23325,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:23235: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:23328: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -23248,7 +23341,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:23251: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:23344: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -23257,7 +23350,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:23260: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:23353: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -23294,7 +23387,7 @@ + ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:23297: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:23390: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -23305,7 +23398,7 @@ + egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:23308: WARNING: Some variables may not be substituted: ++ { echo "$as_me:23401: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -23354,7 +23447,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:23357: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:23450: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -23365,7 +23458,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:23368: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:23461: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -23378,7 +23471,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:23381: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:23474: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -23436,7 +23529,7 @@ + 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:23439: $ac_file is unchanged" >&5 ++ { echo "$as_me:23532: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -23774,7 +23867,7 @@ + (cygdll|msysdll|mingw) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:23777: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:23870: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: dist.mk +Prereq: 1.1072 +--- ncurses-6.0-20150926+/dist.mk 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/dist.mk 2015-10-10 17:06:12.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $ ++# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 0 +-NCURSES_PATCH = 20150926 ++NCURSES_PATCH = 20151010 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/base/MKlib_gen.sh +Prereq: 1.51 +--- ncurses-6.0-20150926+/ncurses/base/MKlib_gen.sh 2015-08-10 08:56:39.000000000 +0000 ++++ ncurses-6.0-20151010/ncurses/base/MKlib_gen.sh 2015-10-10 19:36:47.000000000 +0000 +@@ -2,7 +2,7 @@ + # + # MKlib_gen.sh -- generate sources from curses.h macro definitions + # +-# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $) ++# ($Id: MKlib_gen.sh,v 1.52 2015/10/10 19:36:47 tom Exp $) + # + ############################################################################## + # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. # +@@ -177,6 +177,7 @@ + if test "$USE" = generated ; then + cat >$ED4 <<EOF + s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/ ++ /attr_[sg]et.* z)/s,z),z GCC_UNUSED), + EOF + else + cat >$ED4 <<EOF +Index: ncurses/base/resizeterm.c +Prereq: 1.47 +--- ncurses-6.0-20150926+/ncurses/base/resizeterm.c 2014-10-13 08:56:49.000000000 +0000 ++++ ncurses-6.0-20151010/ncurses/base/resizeterm.c 2015-10-10 19:47:25.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2011,2014 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -45,7 +45,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: resizeterm.c,v 1.47 2014/10/13 08:56:49 tom Exp $") ++MODULE_ID("$Id: resizeterm.c,v 1.48 2015/10/10 19:47:25 tom Exp $") + + /* + * If we're trying to be reentrant, do not want any local statics. +@@ -62,6 +62,12 @@ + #define EXTRA_DCLS /* nothing */ + #endif + ++#if NCURSES_SP_FUNCS && !defined(USE_SP_WINDOWLIST) ++#define UNUSED_SP (void) sp ++#else ++#define UNUSED_SP /* nothing */ ++#endif ++ + #ifdef TRACE + static void + show_window_sizes(const char *name) +@@ -276,6 +282,7 @@ + WINDOWLIST *wp; + + T((T_CALLED("decrease_size(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols)); ++ UNUSED_SP; + + do { + found = FALSE; +@@ -310,6 +317,7 @@ + WINDOWLIST *wp; + + T((T_CALLED("increase_size(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols)); ++ UNUSED_SP; + + do { + found = FALSE; +Index: package/debian-mingw/changelog +--- ncurses-6.0-20150926+/package/debian-mingw/changelog 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/package/debian-mingw/changelog 2015-10-10 17:06:12.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.0+20150926) unstable; urgency=low ++ncurses6 (6.0+20151010) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2015 14:50:05 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.0-20150926+/package/debian-mingw64/changelog 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/package/debian-mingw64/changelog 2015-10-10 17:06:12.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.0+20150926) unstable; urgency=low ++ncurses6 (6.0+20151010) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2015 14:50:05 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.0-20150926+/package/debian/changelog 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/package/debian/changelog 2015-10-10 17:06:12.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.0+20150926) unstable; urgency=low ++ncurses6 (6.0+20151010) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2015 14:50:05 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.125 +--- ncurses-6.0-20150926+/package/mingw-ncurses.nsi 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/package/mingw-ncurses.nsi 2015-10-10 17:06:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $
+
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY "2015"
+-!define VERSION_MMDD "0926"
++!define VERSION_MMDD "1010"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec +--- ncurses-6.0-20150926+/package/mingw-ncurses.spec 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/package/mingw-ncurses.spec 2015-10-10 17:06:12.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.0 +-Release: 20150926 ++Release: 20151010 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.0-20150926+/package/ncurses.spec 2015-09-26 18:50:05.000000000 +0000 ++++ ncurses-6.0-20151010/package/ncurses.spec 2015-10-10 17:06:12.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.0 +-Release: 20150926 ++Release: 20151010 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/aclocal.m4 +Prereq: 1.120 +--- ncurses-6.0-20150926+/test/aclocal.m4 2015-08-08 14:27:27.000000000 +0000 ++++ ncurses-6.0-20151010/test/aclocal.m4 2015-10-10 20:30:48.000000000 +0000 +@@ -26,7 +26,7 @@ + dnl authorization. * + dnl*************************************************************************** + dnl +-dnl $Id: aclocal.m4,v 1.120 2015/08/08 14:27:27 tom Exp $ ++dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $ + dnl + dnl Author: Thomas E. Dickey + dnl +@@ -1297,6 +1297,34 @@ + test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function]) + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50 ++dnl --------------- ++dnl Check for openpty() function, along with <pty.h> header. It may need the ++dnl "util" library as well. ++AC_DEFUN([CF_FUNC_OPENPTY], ++[ ++AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no) ++AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ ++ cf_save_LIBS="$LIBS" ++ test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) } ++ for cf_header in pty.h libutil.h util.h ++ do ++ AC_TRY_LINK([ ++#include <$cf_header> ++],[ ++ int x = openpty((int *)0, (int *)0, (char *)0, ++ (struct termios *)0, (struct winsize *)0); ++],[ ++ cf_cv_func_openpty=$cf_header ++ break ++],[ ++ cf_cv_func_openpty=no ++]) ++ done ++ LIBS="$cf_save_LIBS" ++]) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00 + dnl ----------------- + dnl Test for availability of useful gcc __attribute__ directives to quiet +Index: test/configure +--- ncurses-6.0-20150926+/test/configure 2015-08-08 20:32:27.000000000 +0000 ++++ ncurses-6.0-20151010/test/configure 2015-10-10 20:30:58.000000000 +0000 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20141204. ++# Generated by Autoconf 2.52.20150926. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -748,7 +748,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20141204. Invocation command line was ++generated by GNU Autoconf 2.52.20150926. Invocation command line was + + $ $0 $@ + +@@ -14849,7 +14849,169 @@ + #define HAVE_SYS_TIME_SELECT 1 + EOF + +-echo "$as_me:14852: checking for function curses_version" >&5 ++# special check for test/ditto.c ++ ++echo "$as_me:14854: checking for openpty in -lutil" >&5 ++echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 ++if test "${ac_cv_lib_util_openpty+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lutil $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++#line 14862 "configure" ++#include "confdefs.h" ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char openpty (); ++int ++main () ++{ ++openpty (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:14881: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:14884: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:14887: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:14890: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_util_openpty=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_lib_util_openpty=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:14901: result: $ac_cv_lib_util_openpty" >&5 ++echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 ++if test $ac_cv_lib_util_openpty = yes; then ++ cf_cv_lib_util=yes ++else ++ cf_cv_lib_util=no ++fi ++ ++echo "$as_me:14909: checking for openpty header" >&5 ++echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 ++if test "${cf_cv_func_openpty+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cf_save_LIBS="$LIBS" ++ test $cf_cv_lib_util = yes && { ++cf_add_libs="-lutil" ++# Filter out duplicates - this happens with badly-designed ".pc" files... ++for cf_add_1lib in $LIBS ++do ++ for cf_add_2lib in $cf_add_libs ++ do ++ if test "x$cf_add_1lib" = "x$cf_add_2lib" ++ then ++ cf_add_1lib= ++ break ++ fi ++ done ++ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" ++done ++LIBS="$cf_add_libs" ++ } ++ for cf_header in pty.h libutil.h util.h ++ do ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14936 "configure" ++#include "confdefs.h" ++ ++#include <$cf_header> ++ ++int ++main () ++{ ++ ++ int x = openpty((int *)0, (int *)0, (char *)0, ++ (struct termios *)0, (struct winsize *)0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:14953: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:14956: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:14959: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:14962: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ++ cf_cv_func_openpty=$cf_header ++ break ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ ++ cf_cv_func_openpty=no ++ ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ done ++ LIBS="$cf_save_LIBS" ++ ++fi ++echo "$as_me:14980: result: $cf_cv_func_openpty" >&5 ++echo "${ECHO_T}$cf_cv_func_openpty" >&6 ++ ++if test "$cf_cv_func_openpty" != no ; then ++ ++cat >>confdefs.h <<EOF ++#define USE_OPENPTY_HEADER <$cf_cv_func_openpty> ++EOF ++ ++cat >>confdefs.h <<\EOF ++#define USE_XTERM_PTY 1 ++EOF ++ ++ if test "x$cf_cv_lib_util" = xyes ; then ++ ++cf_add_libs="-lutil" ++# Filter out duplicates - this happens with badly-designed ".pc" files... ++for cf_add_1lib in $TEST_LIBS ++do ++ for cf_add_2lib in $cf_add_libs ++ do ++ if test "x$cf_add_1lib" = "x$cf_add_2lib" ++ then ++ cf_add_1lib= ++ break ++ fi ++ done ++ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" ++done ++TEST_LIBS="$cf_add_libs" ++ ++ fi ++fi ++ ++echo "$as_me:15014: checking for function curses_version" >&5 + echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 + if test "${cf_cv_func_curses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14859,7 +15021,7 @@ + cf_cv_func_curses_version=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14862 "configure" ++#line 15024 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -14872,15 +15034,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14875: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15037: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14878: \$? = $ac_status" >&5 ++ echo "$as_me:15040: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14880: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15042: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14883: \$? = $ac_status" >&5 ++ echo "$as_me:15045: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_curses_version=yes + +@@ -14895,14 +15057,14 @@ + fi + rm -f core + fi +-echo "$as_me:14898: result: $cf_cv_func_curses_version" >&5 ++echo "$as_me:15060: result: $cf_cv_func_curses_version" >&5 + echo "${ECHO_T}$cf_cv_func_curses_version" >&6 + test "$cf_cv_func_curses_version" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_CURSES_VERSION 1 + EOF + +-echo "$as_me:14905: checking for alternate character set array" >&5 ++echo "$as_me:15067: checking for alternate character set array" >&5 + echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 + if test "${cf_cv_curses_acs_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14912,7 +15074,7 @@ + for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map + do + cat >conftest.$ac_ext <<_ACEOF +-#line 14915 "configure" ++#line 15077 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -14928,16 +15090,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15093: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14934: \$? = $ac_status" >&5 ++ echo "$as_me:15096: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14937: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15099: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14940: \$? = $ac_status" >&5 ++ echo "$as_me:15102: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_acs_map=$name; break + else +@@ -14948,7 +15110,7 @@ + done + + fi +-echo "$as_me:14951: result: $cf_cv_curses_acs_map" >&5 ++echo "$as_me:15113: result: $cf_cv_curses_acs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 + + test "$cf_cv_curses_acs_map" != unknown && +@@ -14958,7 +15120,7 @@ + + if test "$cf_enable_widec" = yes; then + +-echo "$as_me:14961: checking for wide alternate character set array" >&5 ++echo "$as_me:15123: 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 +@@ -14968,7 +15130,7 @@ + for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char + do + cat >conftest.$ac_ext <<_ACEOF +-#line 14971 "configure" ++#line 15133 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14984,16 +15146,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14987: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15149: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14990: \$? = $ac_status" >&5 ++ echo "$as_me:15152: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14993: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15155: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14996: \$? = $ac_status" >&5 ++ echo "$as_me:15158: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_map=$name + break +@@ -15004,7 +15166,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + fi +-echo "$as_me:15007: result: $cf_cv_curses_wacs_map" >&5 ++echo "$as_me:15169: result: $cf_cv_curses_wacs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 + + test "$cf_cv_curses_wacs_map" != unknown && +@@ -15012,7 +15174,7 @@ + #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map + EOF + +-echo "$as_me:15015: checking for wide alternate character constants" >&5 ++echo "$as_me:15177: 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 +@@ -15022,7 +15184,7 @@ + if test "$cf_cv_curses_wacs_map" != unknown + then + cat >conftest.$ac_ext <<_ACEOF +-#line 15025 "configure" ++#line 15187 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -15039,16 +15201,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15042: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15204: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15045: \$? = $ac_status" >&5 ++ echo "$as_me:15207: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15048: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15210: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15051: \$? = $ac_status" >&5 ++ echo "$as_me:15213: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -15058,7 +15220,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15061 "configure" ++#line 15223 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -15074,16 +15236,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15077: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15239: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15080: \$? = $ac_status" >&5 ++ echo "$as_me:15242: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15083: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15245: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15086: \$? = $ac_status" >&5 ++ echo "$as_me:15248: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -15094,7 +15256,7 @@ + fi + + fi +-echo "$as_me:15097: result: $cf_cv_curses_wacs_symbols" >&5 ++echo "$as_me:15259: result: $cf_cv_curses_wacs_symbols" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 + + test "$cf_cv_curses_wacs_symbols" != no && +@@ -15104,10 +15266,10 @@ + + fi + +-echo "$as_me:15107: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15269: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 15110 "configure" ++#line 15272 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -15125,16 +15287,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15128: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15131: \$? = $ac_status" >&5 ++ echo "$as_me:15293: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15134: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15137: \$? = $ac_status" >&5 ++ echo "$as_me:15299: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15143,7 +15305,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15146: result: $cf_result" >&5 ++echo "$as_me:15308: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -15164,14 +15326,14 @@ + if test "$cf_enable_widec" = yes; then + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:15167: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:15329: 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 15174 "configure" ++#line 15336 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -15189,23 +15351,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15192: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15195: \$? = $ac_status" >&5 ++ echo "$as_me:15357: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15198: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15360: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15201: \$? = $ac_status" >&5 ++ echo "$as_me:15363: \$? = $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 15208 "configure" ++#line 15370 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -15224,16 +15386,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15227: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15230: \$? = $ac_status" >&5 ++ echo "$as_me:15392: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15395: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15236: \$? = $ac_status" >&5 ++ echo "$as_me:15398: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=yes + else +@@ -15245,7 +15407,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15248: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:15410: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -15268,14 +15430,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:15271: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:15433: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 15278 "configure" ++#line 15440 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -15293,23 +15455,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15296: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15458: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15299: \$? = $ac_status" >&5 ++ echo "$as_me:15461: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15302: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15464: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15305: \$? = $ac_status" >&5 ++ echo "$as_me:15467: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 15312 "configure" ++#line 15474 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -15328,16 +15490,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15331: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15334: \$? = $ac_status" >&5 ++ echo "$as_me:15496: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15499: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15340: \$? = $ac_status" >&5 ++ echo "$as_me:15502: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=yes + else +@@ -15349,7 +15511,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15352: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:15514: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -15372,14 +15534,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:15375: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:15537: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 15382 "configure" ++#line 15544 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -15397,23 +15559,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15403: \$? = $ac_status" >&5 ++ echo "$as_me:15565: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15406: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15568: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15409: \$? = $ac_status" >&5 ++ echo "$as_me:15571: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 15416 "configure" ++#line 15578 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -15432,16 +15594,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15435: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15597: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15438: \$? = $ac_status" >&5 ++ echo "$as_me:15600: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15441: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15603: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15444: \$? = $ac_status" >&5 ++ echo "$as_me:15606: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=yes + else +@@ -15453,7 +15615,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15456: result: $cf_cv_wint_t" >&5 ++echo "$as_me:15618: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -15477,10 +15639,10 @@ + + if test "$NCURSES_OK_MBSTATE_T" = 0 ; then + +-echo "$as_me:15480: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15642: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 15483 "configure" ++#line 15645 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -15498,16 +15660,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15501: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15504: \$? = $ac_status" >&5 ++ echo "$as_me:15666: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15507: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15669: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15510: \$? = $ac_status" >&5 ++ echo "$as_me:15672: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15516,7 +15678,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15519: result: $cf_result" >&5 ++echo "$as_me:15681: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -15538,10 +15700,10 @@ + + if test "$NCURSES_OK_WCHAR_T" = 0 ; then + +-echo "$as_me:15541: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15703: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 15544 "configure" ++#line 15706 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -15559,16 +15721,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15724: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15565: \$? = $ac_status" >&5 ++ echo "$as_me:15727: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15568: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15730: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15571: \$? = $ac_status" >&5 ++ echo "$as_me:15733: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15577,7 +15739,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15580: result: $cf_result" >&5 ++echo "$as_me:15742: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -15599,10 +15761,10 @@ + + if test "$NCURSES_OK_WINT_T" = 0 ; then + +-echo "$as_me:15602: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15764: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 15605 "configure" ++#line 15767 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -15620,16 +15782,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15626: \$? = $ac_status" >&5 ++ echo "$as_me:15788: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15629: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15791: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15632: \$? = $ac_status" >&5 ++ echo "$as_me:15794: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15638,7 +15800,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15641: result: $cf_result" >&5 ++echo "$as_me:15803: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -15659,11 +15821,11 @@ + fi + fi + +-echo "$as_me:15662: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15824: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + + cat >conftest.$ac_ext <<_ACEOF +-#line 15666 "configure" ++#line 15828 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15691,16 +15853,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15694: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15697: \$? = $ac_status" >&5 ++ echo "$as_me:15859: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15700: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15862: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15703: \$? = $ac_status" >&5 ++ echo "$as_me:15865: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15709,7 +15871,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15712: result: $cf_result" >&5 ++echo "$as_me:15874: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -15721,14 +15883,14 @@ + EOF + + else +- echo "$as_me:15724: checking for data ospeed in library" >&5 ++ echo "$as_me:15886: checking for data ospeed in library" >&5 + echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6 + # BSD linkers insist on making weak linkage, but resolve at runtime. + if test "$cross_compiling" = yes; then + + # cross-compiling + cat >conftest.$ac_ext <<_ACEOF +-#line 15731 "configure" ++#line 15893 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15761,16 +15923,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15764: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15926: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15767: \$? = $ac_status" >&5 ++ echo "$as_me:15929: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15770: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15932: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15773: \$? = $ac_status" >&5 ++ echo "$as_me:15935: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15782,7 +15944,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15785 "configure" ++#line 15947 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15808,15 +15970,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15811: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15973: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15814: \$? = $ac_status" >&5 ++ echo "$as_me:15976: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15816: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15978: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15819: \$? = $ac_status" >&5 ++ echo "$as_me:15981: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15827,7 +15989,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:15830: result: $cf_result" >&5 ++ echo "$as_me:15992: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -15840,11 +16002,11 @@ + fi + fi + +-echo "$as_me:15843: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:16005: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + + cat >conftest.$ac_ext <<_ACEOF +-#line 15847 "configure" ++#line 16009 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15872,16 +16034,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15875: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15878: \$? = $ac_status" >&5 ++ echo "$as_me:16040: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16043: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15884: \$? = $ac_status" >&5 ++ echo "$as_me:16046: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15890,7 +16052,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15893: result: $cf_result" >&5 ++echo "$as_me:16055: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -15902,14 +16064,14 @@ + EOF + + else +- echo "$as_me:15905: checking for data boolnames in library" >&5 ++ echo "$as_me:16067: checking for data boolnames in library" >&5 + echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6 + # BSD linkers insist on making weak linkage, but resolve at runtime. + if test "$cross_compiling" = yes; then + + # cross-compiling + cat >conftest.$ac_ext <<_ACEOF +-#line 15912 "configure" ++#line 16074 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15942,16 +16104,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15945: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15948: \$? = $ac_status" >&5 ++ echo "$as_me:16110: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15951: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15954: \$? = $ac_status" >&5 ++ echo "$as_me:16116: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15963,7 +16125,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15966 "configure" ++#line 16128 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15989,15 +16151,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15992: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16154: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15995: \$? = $ac_status" >&5 ++ echo "$as_me:16157: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15997: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16159: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16000: \$? = $ac_status" >&5 ++ echo "$as_me:16162: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -16008,7 +16170,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:16011: result: $cf_result" >&5 ++ echo "$as_me:16173: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -16021,11 +16183,11 @@ + fi + fi + +-echo "$as_me:16024: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:16186: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + + cat >conftest.$ac_ext <<_ACEOF +-#line 16028 "configure" ++#line 16190 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -16053,16 +16215,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16056: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16059: \$? = $ac_status" >&5 ++ echo "$as_me:16221: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16062: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16224: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16065: \$? = $ac_status" >&5 ++ echo "$as_me:16227: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -16071,7 +16233,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:16074: result: $cf_result" >&5 ++echo "$as_me:16236: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -16083,14 +16245,14 @@ + EOF + + else +- echo "$as_me:16086: checking for data boolfnames in library" >&5 ++ echo "$as_me:16248: checking for data boolfnames in library" >&5 + echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6 + # BSD linkers insist on making weak linkage, but resolve at runtime. + if test "$cross_compiling" = yes; then + + # cross-compiling + cat >conftest.$ac_ext <<_ACEOF +-#line 16093 "configure" ++#line 16255 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -16123,16 +16285,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16126: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16288: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16129: \$? = $ac_status" >&5 ++ echo "$as_me:16291: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16132: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16294: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16135: \$? = $ac_status" >&5 ++ echo "$as_me:16297: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -16144,7 +16306,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16147 "configure" ++#line 16309 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -16170,15 +16332,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16173: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16335: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16176: \$? = $ac_status" >&5 ++ echo "$as_me:16338: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16178: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16181: \$? = $ac_status" >&5 ++ echo "$as_me:16343: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -16189,7 +16351,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:16192: result: $cf_result" >&5 ++ echo "$as_me:16354: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -16204,7 +16366,7 @@ + + if ( test "$GCC" = yes || test "$GXX" = yes ) + then +-echo "$as_me:16207: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:16369: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -16221,7 +16383,7 @@ + with_warnings=no + + fi; +-echo "$as_me:16224: result: $with_warnings" >&5 ++echo "$as_me:16386: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + if test "$with_warnings" = "yes" + then +@@ -16244,10 +16406,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:16247: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:16409: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <<EOF +-#line 16250 "${as_me:-configure}" ++#line 16412 "${as_me:-configure}" + #include "confdefs.h" + #include "conftest.h" + #include "conftest.i" +@@ -16296,12 +16458,12 @@ + ;; + esac + +- if { (eval echo "$as_me:16299: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16302: \$? = $ac_status" >&5 ++ echo "$as_me:16464: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:16304: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:16466: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in +@@ -16365,12 +16527,12 @@ + if test "$GCC" = yes ; then + case $host_os in + (linux*|gnu*) +- echo "$as_me:16368: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:16530: 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 16373 "configure" ++#line 16535 "configure" + #include "confdefs.h" + + int +@@ -16387,16 +16549,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16390: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16393: \$? = $ac_status" >&5 ++ echo "$as_me:16555: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16396: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16399: \$? = $ac_status" >&5 ++ echo "$as_me:16561: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -16407,7 +16569,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:16410: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:16572: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +@@ -16416,12 +16578,12 @@ + CLANG_COMPILER=no + + if test "$GCC" = yes ; then +- echo "$as_me:16419: checking if this is really Clang C compiler" >&5 ++ echo "$as_me:16581: checking if this is really Clang C compiler" >&5 + echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Qunused-arguments" + cat >conftest.$ac_ext <<_ACEOF +-#line 16424 "configure" ++#line 16586 "configure" + #include "confdefs.h" + + int +@@ -16438,16 +16600,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16444: \$? = $ac_status" >&5 ++ echo "$as_me:16606: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16609: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16450: \$? = $ac_status" >&5 ++ echo "$as_me:16612: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + CLANG_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" +@@ -16458,12 +16620,12 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:16461: result: $CLANG_COMPILER" >&5 ++ echo "$as_me:16623: result: $CLANG_COMPILER" >&5 + echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi + + cat > conftest.$ac_ext <<EOF +-#line 16466 "${as_me:-configure}" ++#line 16628 "${as_me:-configure}" + int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } + EOF + +@@ -16480,7 +16642,7 @@ + # remark #981: operands are evaluated in unspecified order + # warning #279: controlling expression is constant + +- { echo "$as_me:16483: checking for $CC warning options..." >&5 ++ { echo "$as_me:16645: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -16496,12 +16658,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16499: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16661: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16502: \$? = $ac_status" >&5 ++ echo "$as_me:16664: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:16504: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16666: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -16510,7 +16672,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:16513: checking for $CC warning options..." >&5 ++ { echo "$as_me:16675: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -16534,12 +16696,12 @@ + Wundef $cf_gcc_warnings $cf_warn_CONST + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16537: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16540: \$? = $ac_status" >&5 ++ echo "$as_me:16702: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:16542: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16704: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in + (Wcast-qual) +@@ -16550,7 +16712,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:16553: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:16715: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -16560,7 +16722,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:16563: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:16725: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -16576,7 +16738,7 @@ + fi + fi + +-echo "$as_me:16579: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:16741: 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. +@@ -16593,7 +16755,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:16596: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:16758: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case .$with_cflags in +@@ -16687,23 +16849,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:16690: checking for dmalloc.h" >&5 ++ echo "$as_me:16852: 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 16696 "configure" ++#line 16858 "configure" + #include "confdefs.h" + #include <dmalloc.h> + _ACEOF +-if { (eval echo "$as_me:16700: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16862: \"$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:16706: \$? = $ac_status" >&5 ++ echo "$as_me:16868: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16722,11 +16884,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16725: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:16887: 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:16729: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:16891: 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 +@@ -16734,7 +16896,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16737 "configure" ++#line 16899 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16753,16 +16915,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16756: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16918: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16759: \$? = $ac_status" >&5 ++ echo "$as_me:16921: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16762: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16924: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16765: \$? = $ac_status" >&5 ++ echo "$as_me:16927: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -16773,7 +16935,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16776: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:16938: 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 +@@ -16788,7 +16950,7 @@ + + fi + +-echo "$as_me:16791: checking if you want to use dbmalloc for testing" >&5 ++echo "$as_me:16953: 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. +@@ -16805,7 +16967,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:16808: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:16970: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case .$with_cflags in +@@ -16899,23 +17061,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:16902: checking for dbmalloc.h" >&5 ++ echo "$as_me:17064: 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 16908 "configure" ++#line 17070 "configure" + #include "confdefs.h" + #include <dbmalloc.h> + _ACEOF +-if { (eval echo "$as_me:16912: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:17074: \"$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:16918: \$? = $ac_status" >&5 ++ echo "$as_me:17080: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16934,11 +17096,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16937: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:17099: 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:16941: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:17103: 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 +@@ -16946,7 +17108,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16949 "configure" ++#line 17111 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16965,16 +17127,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16968: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17130: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16971: \$? = $ac_status" >&5 ++ echo "$as_me:17133: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16974: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16977: \$? = $ac_status" >&5 ++ echo "$as_me:17139: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -16985,7 +17147,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16988: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:17150: 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 +@@ -17000,7 +17162,7 @@ + + fi + +-echo "$as_me:17003: checking if you want to use valgrind for testing" >&5 ++echo "$as_me:17165: 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. +@@ -17017,7 +17179,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:17020: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:17182: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case .$with_cflags in +@@ -17110,7 +17272,7 @@ + ;; + esac + +-echo "$as_me:17113: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:17275: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -17120,7 +17282,7 @@ + else + : ${with_no_leaks:=no} + fi; +-echo "$as_me:17123: result: $with_no_leaks" >&5 ++echo "$as_me:17285: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$with_no_leaks" = yes ; then +@@ -17136,7 +17298,7 @@ + fi + + LD_RPATH_OPT= +-echo "$as_me:17139: checking for an rpath option" >&5 ++echo "$as_me:17301: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in + (irix*) +@@ -17167,12 +17329,12 @@ + (*) + ;; + esac +-echo "$as_me:17170: result: $LD_RPATH_OPT" >&5 ++echo "$as_me:17332: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:17175: checking if we need a space after rpath option" >&5 ++ echo "$as_me:17337: 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" + +@@ -17193,7 +17355,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 17196 "configure" ++#line 17358 "configure" + #include "confdefs.h" + + int +@@ -17205,16 +17367,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17208: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17370: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17211: \$? = $ac_status" >&5 ++ echo "$as_me:17373: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17214: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17376: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17217: \$? = $ac_status" >&5 ++ echo "$as_me:17379: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -17224,13 +17386,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:17227: result: $cf_rpath_space" >&5 ++ echo "$as_me:17389: 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:17233: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:17395: 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. +@@ -17247,21 +17409,21 @@ + cf_disable_rpath_hack=no + + fi; +-echo "$as_me:17250: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:17412: 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:17254: checking for updated LDFLAGS" >&5 ++echo "$as_me:17416: 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:17257: result: maybe" >&5 ++ echo "$as_me:17419: 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:17264: checking for $ac_word" >&5 ++echo "$as_me:17426: 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 +@@ -17276,7 +17438,7 @@ + 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:17279: found $ac_dir/$ac_word" >&5 ++echo "$as_me:17441: found $ac_dir/$ac_word" >&5 + break + done + +@@ -17284,10 +17446,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:17287: result: $cf_ldd_prog" >&5 ++ echo "$as_me:17449: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:17290: result: no" >&5 ++ echo "$as_me:17452: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17301,7 +17463,7 @@ + cf_rpath_oops= + + cat >conftest.$ac_ext <<_ACEOF +-#line 17304 "configure" ++#line 17466 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -17313,16 +17475,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17316: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17478: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17319: \$? = $ac_status" >&5 ++ echo "$as_me:17481: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17322: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17484: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17325: \$? = $ac_status" >&5 ++ echo "$as_me:17487: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` +@@ -17350,7 +17512,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:17353: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:17515: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -17362,11 +17524,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:17365: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17527: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:17369: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17531: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -17403,7 +17565,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:17406: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:17568: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -17416,11 +17578,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:17419: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17581: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:17423: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:17585: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -17457,7 +17619,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:17460: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:17622: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -17470,14 +17632,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:17473: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:17635: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:17477: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17639: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:17480: result: no" >&5 ++ echo "$as_me:17642: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17567,7 +17729,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:17570: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:17732: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -17699,7 +17861,7 @@ + cat >>$CONFIG_STATUS <<EOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.52.20141204, ++configured by $0, generated by GNU Autoconf 2.52.20150926, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +@@ -17743,7 +17905,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:17746: error: ambiguous option: $1 ++ { { echo "$as_me:17908: 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;} +@@ -17762,7 +17924,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:17765: error: unrecognized option: $1 ++ -*) { { echo "$as_me:17927: 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;} +@@ -17781,7 +17943,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20141204, executed with ++This file was extended by $as_me 2.52.20150926, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -17812,7 +17974,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; +- *) { { echo "$as_me:17815: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:17977: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -17999,10 +18161,28 @@ + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed ++ # It is possible to make a multiline substitution using escaped newlines. ++ # Ensure that we do not split the substitution between script fragments. ++ ac_BEG=$ac_end ++ ac_END=`expr $ac_end + $ac_max_sed_lines` ++ sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next ++ if test -s $tmp/subs.next; then ++ grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit ++ if test ! -s $tmp/subs.edit; then ++ grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit ++ if test ! -s $tmp/subs.edit; then ++ if test $ac_beg -gt 1; then ++ ac_end=`expr $ac_end - 1` ++ continue ++ fi ++ fi ++ fi ++ fi ++ + if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" ++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" ++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end +@@ -18085,7 +18265,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:18088: creating $ac_file" >&5 ++ { echo "$as_me:18268: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -18103,7 +18283,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:18106: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:18286: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -18116,7 +18296,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:18119: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:18299: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -18132,7 +18312,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:18135: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:18315: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -18141,7 +18321,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:18144: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:18324: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -18178,7 +18358,7 @@ + ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:18181: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:18361: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -18189,7 +18369,7 @@ + egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:18192: WARNING: Some variables may not be substituted: ++ { echo "$as_me:18372: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -18238,7 +18418,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:18241: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:18421: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -18249,7 +18429,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:18252: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:18432: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -18262,7 +18442,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:18265: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:18445: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -18320,7 +18500,7 @@ + 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:18323: $ac_file is unchanged" >&5 ++ { echo "$as_me:18503: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: test/configure.in +Prereq: 1.124 +--- ncurses-6.0-20150926+/test/configure.in 2015-08-08 20:24:49.000000000 +0000 ++++ ncurses-6.0-20151010/test/configure.in 2015-10-10 20:23:49.000000000 +0000 +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey 1996, etc. + dnl +-dnl $Id: configure.in,v 1.124 2015/08/08 20:24:49 tom Exp $ ++dnl $Id: configure.in,v 1.125 2015/10/10 20:23:49 tom Exp $ + dnl This is a simple configuration-script for the ncurses test programs that + dnl allows the test-directory to be separately configured against a reference + dnl system (i.e., sysvr4 curses) +@@ -302,6 +302,17 @@ + test $cf_cv_use_pthreads = yes && AC_DEFINE(USE_PTHREADS) + + CF_SYS_TIME_SELECT ++ ++# special check for test/ditto.c ++CF_FUNC_OPENPTY ++if test "$cf_cv_func_openpty" != no ; then ++ AC_DEFINE_UNQUOTED(USE_OPENPTY_HEADER,<$cf_cv_func_openpty>,[Define to actual header for openpty function]) ++ AC_DEFINE(USE_XTERM_PTY,1,[Define to 1 if we should assume xterm pseudoterminal interface]) ++ if test "x$cf_cv_lib_util" = xyes ; then ++ CF_ADD_LIB(util,TEST_LIBS) ++ fi ++fi ++ + CF_FUNC_CURSES_VERSION + + CF_CURSES_ACS_MAP +Index: test/demo_termcap.c +Prereq: 1.48 +--- ncurses-6.0-20150926+/test/demo_termcap.c 2015-08-08 20:25:39.000000000 +0000 ++++ ncurses-6.0-20151010/test/demo_termcap.c 2015-10-10 20:41:16.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: demo_termcap.c,v 1.48 2015/08/08 20:25:39 tom Exp $ ++ * $Id: demo_termcap.c,v 1.49 2015/10/10 20:41:16 tom Exp $ + * + * A simple demo of the termcap interface. + */ +@@ -50,6 +50,8 @@ + #include <termcap.h> + #endif + ++static void failed(const char *) GCC_NORETURN; ++ + static void + failed(const char *msg) + { +Index: test/demo_terminfo.c +Prereq: 1.39 +--- ncurses-6.0-20150926+/test/demo_terminfo.c 2015-07-10 23:45:44.000000000 +0000 ++++ ncurses-6.0-20151010/test/demo_terminfo.c 2015-10-10 20:52:41.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: demo_terminfo.c,v 1.39 2015/07/10 23:45:44 tom Exp $ ++ * $Id: demo_terminfo.c,v 1.40 2015/10/10 20:52:41 tom Exp $ + * + * A simple demo of the terminfo interface. + */ +@@ -46,6 +46,8 @@ + #endif + #endif + ++static void failed(const char *) GCC_NORETURN; ++ + static void + failed(const char *msg) + { +@@ -914,7 +916,7 @@ + int + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { +- printf("This program requires the terminfo functions such as tigetstr\n"); ++ failed("This program requires the terminfo functions such as tigetstr"); + ExitProgram(EXIT_FAILURE); + } + #endif /* HAVE_TIGETSTR */ +Index: test/view.c +Prereq: 1.94 +--- ncurses-6.0-20150926+/test/view.c 2013-09-28 21:58:42.000000000 +0000 ++++ ncurses-6.0-20151010/test/view.c 2015-10-10 20:03:58.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -50,7 +50,7 @@ + * scroll operation worked, and the refresh() code only had to do a + * partial repaint. + * +- * $Id: view.c,v 1.94 2013/09/28 21:58:42 tom Exp $ ++ * $Id: view.c,v 1.95 2015/10/10 20:03:58 tom Exp $ + */ + + #include <test.priv.h> +@@ -188,20 +188,23 @@ + for (j = k = 0; j < len; j++) { + #if USE_WIDEC_SUPPORT + rc = (size_t) check_mbytes(wch, src + j, len - j, state); +- if (rc == (size_t) -1 || rc == (size_t) -2) ++ if (rc == (size_t) -1 || rc == (size_t) -2) { + break; ++ } + j += rc - 1; +- if ((width = wcwidth(wch)) < 0) +- break; +- if ((width > 0 && l > 0) || l == CCHARW_MAX) { ++ width = wcwidth(wch); ++ if (width == 0) { ++ if (l == 0) { ++ wstr[l++] = L' '; ++ } ++ } else if ((l > 0) || (l == CCHARW_MAX)) { + wstr[l] = L'\0'; + l = 0; +- if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) ++ if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) { + break; ++ } + ++k; + } +- if (width == 0 && l == 0) +- wstr[l++] = L' '; + wstr[l++] = wch; + #else + dst[k++] = (chtype) UChar(src[j]); +@@ -329,10 +332,11 @@ + /* convert tabs and nonprinting chars so that shift will work properly */ + for (s = buf, d = temp, col = 0; (*d = *s) != '\0'; s++) { + if (*d == '\r') { +- if (s[1] == '\n') ++ if (s[1] == '\n') { + continue; +- else ++ } else { + break; ++ } + } + if (*d == '\n') { + *d = '\0'; |