diff options
Diffstat (limited to 'system/ncurses/ncurses-6.3-20220205.patch')
| -rw-r--r-- | system/ncurses/ncurses-6.3-20220205.patch | 9177 |
1 files changed, 0 insertions, 9177 deletions
diff --git a/system/ncurses/ncurses-6.3-20220205.patch b/system/ncurses/ncurses-6.3-20220205.patch deleted file mode 100644 index 353def0f8..000000000 --- a/system/ncurses/ncurses-6.3-20220205.patch +++ /dev/null @@ -1,9177 +0,0 @@ -# ncurses 6.3 - patch 20220205 - Thomas E. Dickey -# -# ------------------------------------------------------------------------------ -# -# Ncurses 6.3 is at -# ftp://ftp.invisible-island.net/ncurses/ -# https://invisible-mirror.net/archives/ncurses/ -# https://ftp.gnu.org/gnu/ncurses/ -# -# Patches for ncurses 6.3 can be found at -# ftp://ftp.invisible-island.net/ncurses/6.3 -# https://invisible-mirror.net/archives/ncurses/6.3 -# -# ------------------------------------------------------------------------------ -# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220205.patch.gz -# patch by Thomas E. Dickey <dickey@invisible-island.net> -# created Sun Feb 6 01:46:24 UTC 2022 -# ------------------------------------------------------------------------------ -# Ada95/make-tar.sh | 7 -# NEWS | 7 -# VERSION | 2 -# aclocal.m4 | 7 -# config.guess | 16 -# config.sub | 20 -# configure | 2469 ++++++++++++++++++------------------- -# dist.mk | 4 -# include/MKkey_defs.sh | 7 -# include/edit_cfg.sh | 7 -# man/make_sed.sh | 7 -# ncurses/base/MKlib_gen.sh | 7 -# ncurses/tinfo/MKkeys_list.sh | 7 -# ncurses/tty/MKexpanded.sh | 5 -# 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 -# package/ncursest.spec | 2 -# progs/MKtermsort.sh | 6 -# progs/capconvert | 7 -# test/make-tar.sh | 7 -# test/picsmap.c | 65 -# test/savescreen.sh | 7 -# 26 files changed, 1382 insertions(+), 1304 deletions(-) -# ------------------------------------------------------------------------------ -Index: Ada95/make-tar.sh -Prereq: 1.20 ---- ncurses-6.3-20220129+/Ada95/make-tar.sh 2021-10-12 21:11:33.000000000 +0000 -+++ ncurses-6.3-20220205/Ada95/make-tar.sh 2022-02-05 17:57:20.000000000 +0000 -@@ -1,7 +1,7 @@ - #!/bin/sh --# $Id: make-tar.sh,v 1.20 2021/10/12 21:11:33 tom Exp $ -+# $Id: make-tar.sh,v 1.21 2022/02/05 17:57:20 tom Exp $ - ############################################################################## --# Copyright 2019-2020,2021 Thomas E. Dickey # -+# Copyright 2019-2021,2022 Thomas E. Dickey # - # Copyright 2010-2015,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -84,7 +84,8 @@ - SOURCE=`cd ..;pwd` - - BUILD=$TMPDIR/make-tar$$ --trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP -+trap "cd /; rm -rf $BUILD; exit 1" 1 2 3 15 -+trap "cd /; rm -rf $BUILD" 0 - - umask 077 - if ! ( mkdir $BUILD ) -Index: NEWS -Prereq: 1.3774 ---- ncurses-6.3-20220129+/NEWS 2022-01-30 01:11:51.000000000 +0000 -+++ ncurses-6.3-20220205/NEWS 2022-02-06 00:37:58.000000000 +0000 -@@ -26,7 +26,7 @@ - -- sale, use or other dealings in this Software without prior written -- - -- authorization. -- - ------------------------------------------------------------------------------- ---- $Id: NEWS,v 1.3774 2022/01/30 01:11:51 tom Exp $ -+-- $Id: NEWS,v 1.3776 2022/02/06 00:37:58 tom Exp $ - ------------------------------------------------------------------------------- - - This is a log of changes that ncurses has gone through since Zeyd started -@@ -46,6 +46,11 @@ - Changes through 1.9.9e did not credit all contributions; - it is not possible to add this information. - -+20220205 -+ + workaround in test/picsmap.c for use of floating point for rgb values -+ by ImageMagick 6.9.11, which appears to use the wrong upper limit. -+ + improve use of "trap" in shell scripts, using "fixup-trap". -+ - 20220129 - + minor updates for test-packages - + improve handling of --with-pkg-config-libdir option, allowing for the -Index: VERSION ---- ncurses-6.3-20220129+/VERSION 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/VERSION 2022-02-05 11:10:39.000000000 +0000 -@@ -1 +1 @@ --5:0:10 6.3 20220129 -+5:0:10 6.3 20220205 -Index: aclocal.m4 -Prereq: 1.1003 ---- ncurses-6.3-20220129+/aclocal.m4 2022-01-29 22:05:06.000000000 +0000 -+++ ncurses-6.3-20220205/aclocal.m4 2022-02-05 17:48:07.000000000 +0000 -@@ -29,7 +29,7 @@ - dnl - dnl Author: Thomas E. Dickey 1995-on - dnl --dnl $Id: aclocal.m4,v 1.1003 2022/01/29 22:05:06 tom Exp $ -+dnl $Id: aclocal.m4,v 1.1004 2022/02/05 17:48:07 tom Exp $ - dnl Macros used in NCURSES auto-configuration script. - dnl - dnl These macros are maintained separately from NCURSES. The copyright on -@@ -5740,7 +5740,7 @@ - AC_MSG_RESULT($MANPAGE_TBL) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_MAN_PAGES version: 51 updated: 2021/01/05 16:29:19 -+dnl CF_MAN_PAGES version: 52 updated: 2022/02/05 12:31:08 - dnl ------------ - dnl Try to determine if the man-pages on the system are compressed, and if - dnl so, what format is used. Use this information to construct a script that -@@ -5813,7 +5813,8 @@ - transform="$program_transform_name" - - TMP=\${TMPDIR:=/tmp}/man\$\$ --trap "rm -f \$TMP" 0 1 2 3 15 -+trap "rm -f \$TMP; exit 1" 1 2 3 15 -+trap "rm -f \$TMP" 0 - - form=\[$]1 - shift || exit 1 -Index: config.guess ---- ncurses-6.3-20220129+/config.guess 2021-06-04 04:01:25.000000000 +0000 -+++ ncurses-6.3-20220205/config.guess 2022-01-09 21:53:25.000000000 +0000 -@@ -1,14 +1,14 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright 1992-2021 Free Software Foundation, Inc. -+# Copyright 1992-2022 Free Software Foundation, Inc. - - # shellcheck disable=SC2006,SC2268 # see below for rationale - --timestamp='2021-06-03' -+timestamp='2022-01-09' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 3 of the License, or -+# the Free Software Foundation, either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -60,7 +60,7 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright 1992-2021 Free Software Foundation, Inc. -+Copyright 1992-2022 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -437,7 +437,7 @@ - # This test works for both compilers. - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 -@@ -929,6 +929,9 @@ - i*:PW*:*) - GUESS=$UNAME_MACHINE-pc-pw32 - ;; -+ *:SerenityOS:*:*) -+ GUESS=$UNAME_MACHINE-pc-serenity -+ ;; - *:Interix*:*) - case $UNAME_MACHINE in - x86) -@@ -1522,6 +1525,9 @@ - i*86:rdos:*:*) - GUESS=$UNAME_MACHINE-pc-rdos - ;; -+ i*86:Fiwix:*:*) -+ GUESS=$UNAME_MACHINE-pc-fiwix -+ ;; - *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros - ;; -Index: config.sub ---- ncurses-6.3-20220129+/config.sub 2021-08-14 16:20:38.000000000 +0000 -+++ ncurses-6.3-20220205/config.sub 2022-01-03 23:16:50.000000000 +0000 -@@ -1,14 +1,14 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2021 Free Software Foundation, Inc. -+# Copyright 1992-2022 Free Software Foundation, Inc. - - # shellcheck disable=SC2006,SC2268 # see below for rationale - --timestamp='2021-08-14' -+timestamp='2022-01-03' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 3 of the License, or -+# the Free Software Foundation, either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -76,7 +76,7 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2021 Free Software Foundation, Inc. -+Copyright 1992-2022 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -1020,6 +1020,11 @@ - ;; - - # Here we normalize CPU types with a missing or matching vendor -+ armh-unknown | armh-alt) -+ cpu=armv7l -+ vendor=alt -+ basic_os=${basic_os:-linux-gnueabihf} -+ ;; - dpx20-unknown | dpx20-bull) - cpu=rs6000 - vendor=bull -@@ -1121,7 +1126,7 @@ - xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` - ;; -- arm64-*) -+ arm64-* | aarch64le-*) - cpu=aarch64 - ;; - -@@ -1304,7 +1309,7 @@ - if test x$basic_os != x - then - --# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just -+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just - # set os. - case $basic_os in - gnu/linux*) -@@ -1748,7 +1753,8 @@ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) -+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ -+ | fiwix* ) - ;; - # This one is extra strict with allowed versions - sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -Index: configure ---- ncurses-6.3-20220129+/configure 2022-01-29 22:05:31.000000000 +0000 -+++ ncurses-6.3-20220205/configure 2022-02-05 17:56:41.000000000 +0000 -@@ -14775,7 +14775,8 @@ - transform="$program_transform_name" - - TMP=\${TMPDIR:=/tmp}/man\$\$ --trap "rm -f \$TMP" 0 1 2 3 15 -+trap "rm -f \$TMP; exit 1" 1 2 3 15 -+trap "rm -f \$TMP" 0 - - form=\$1 - shift || exit 1 -@@ -15045,7 +15046,7 @@ - ############################################################################### - - ### Note that some functions (such as const) are normally disabled anyway. --echo "$as_me:15048: checking if you want to build with function extensions" >&5 -+echo "$as_me:15049: checking if you want to build with function extensions" >&5 - echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 - - # Check whether --enable-ext-funcs or --disable-ext-funcs was given. -@@ -15055,7 +15056,7 @@ - else - with_ext_funcs=yes - fi; --echo "$as_me:15058: result: $with_ext_funcs" >&5 -+echo "$as_me:15059: result: $with_ext_funcs" >&5 - echo "${ECHO_T}$with_ext_funcs" >&6 - if test "x$with_ext_funcs" = xyes ; then - NCURSES_EXT_FUNCS=1 -@@ -15115,7 +15116,7 @@ - GENERATED_EXT_FUNCS= - fi - --echo "$as_me:15118: checking if you want to build with SCREEN extensions" >&5 -+echo "$as_me:15119: checking if you want to build with SCREEN extensions" >&5 - echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 - - # Check whether --enable-sp-funcs or --disable-sp-funcs was given. -@@ -15125,7 +15126,7 @@ - else - with_sp_funcs=$cf_dft_ext_spfuncs - fi; --echo "$as_me:15128: result: $with_sp_funcs" >&5 -+echo "$as_me:15129: result: $with_sp_funcs" >&5 - echo "${ECHO_T}$with_sp_funcs" >&6 - if test "x$with_sp_funcs" = xyes ; then - NCURSES_SP_FUNCS=1 -@@ -15144,7 +15145,7 @@ - GENERATED_SP_FUNCS= - fi - --echo "$as_me:15147: checking if you want to build with terminal-driver" >&5 -+echo "$as_me:15148: checking if you want to build with terminal-driver" >&5 - echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 - - # Check whether --enable-term-driver or --disable-term-driver was given. -@@ -15154,7 +15155,7 @@ - else - with_term_driver=no - fi; --echo "$as_me:15157: result: $with_term_driver" >&5 -+echo "$as_me:15158: result: $with_term_driver" >&5 - echo "${ECHO_T}$with_term_driver" >&6 - if test "x$with_term_driver" = xyes ; then - -@@ -15163,19 +15164,19 @@ - EOF - - if test "x$with_termlib" != xno ; then -- { { echo "$as_me:15166: error: The term-driver option conflicts with the termlib option" >&5 -+ { { echo "$as_me:15167: error: The term-driver option conflicts with the termlib option" >&5 - echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} - { (exit 1); exit 1; }; } - fi - if test "x$with_sp_funcs" != xyes ; then -- { { echo "$as_me:15171: error: The term-driver option relies upon sp-funcs" >&5 -+ { { echo "$as_me:15172: error: The term-driver option relies upon sp-funcs" >&5 - echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - ### use option --enable-const to turn on use of const beyond that in XSI. --echo "$as_me:15178: checking for extended use of const keyword" >&5 -+echo "$as_me:15179: checking for extended use of const keyword" >&5 - echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 - - # Check whether --enable-const or --disable-const was given. -@@ -15185,7 +15186,7 @@ - else - with_ext_const=$cf_dft_ext_const - fi; --echo "$as_me:15188: result: $with_ext_const" >&5 -+echo "$as_me:15189: result: $with_ext_const" >&5 - echo "${ECHO_T}$with_ext_const" >&6 - NCURSES_CONST='/*nothing*/' - if test "x$with_ext_const" = xyes ; then -@@ -15193,7 +15194,7 @@ - fi - - ### use option --enable-ext-colors to turn on use of colors beyond 16. --echo "$as_me:15196: checking if you want to use extended colors" >&5 -+echo "$as_me:15197: checking if you want to use extended colors" >&5 - echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 - - # Check whether --enable-ext-colors or --disable-ext-colors was given. -@@ -15203,12 +15204,12 @@ - else - with_ext_colors=$cf_dft_ext_colors - fi; --echo "$as_me:15206: result: $with_ext_colors" >&5 -+echo "$as_me:15207: result: $with_ext_colors" >&5 - echo "${ECHO_T}$with_ext_colors" >&6 - NCURSES_EXT_COLORS=0 - if test "x$with_ext_colors" = xyes ; then - if test "x$with_widec" != xyes ; then -- { echo "$as_me:15211: WARNING: This option applies only to wide-character library" >&5 -+ { echo "$as_me:15212: WARNING: This option applies only to wide-character library" >&5 - echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} - else - # cannot be ABI 5 since it changes sizeof(cchar_t) -@@ -15218,7 +15219,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:15221: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:15222: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -15246,7 +15247,7 @@ - fi - - ### use option --enable-ext-mouse to modify coding to support 5-button mice --echo "$as_me:15249: checking if you want to use extended mouse encoding" >&5 -+echo "$as_me:15250: checking if you want to use extended mouse encoding" >&5 - echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 - - # Check whether --enable-ext-mouse or --disable-ext-mouse was given. -@@ -15256,7 +15257,7 @@ - else - with_ext_mouse=$cf_dft_ext_mouse - fi; --echo "$as_me:15259: result: $with_ext_mouse" >&5 -+echo "$as_me:15260: result: $with_ext_mouse" >&5 - echo "${ECHO_T}$with_ext_mouse" >&6 - if test "x$with_ext_mouse" = xyes ; then - -@@ -15265,7 +15266,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:15268: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:15269: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -15286,7 +15287,7 @@ - esac - - ### use option --enable-ext-putwin to turn on extended screendumps --echo "$as_me:15289: checking if you want to use extended putwin/screendump" >&5 -+echo "$as_me:15290: checking if you want to use extended putwin/screendump" >&5 - echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 - - # Check whether --enable-ext-putwin or --disable-ext-putwin was given. -@@ -15296,7 +15297,7 @@ - else - with_ext_putwin=$cf_dft_ext_putwin - fi; --echo "$as_me:15299: result: $with_ext_putwin" >&5 -+echo "$as_me:15300: result: $with_ext_putwin" >&5 - echo "${ECHO_T}$with_ext_putwin" >&6 - if test "x$with_ext_putwin" = xyes ; then - -@@ -15306,7 +15307,7 @@ - - fi - --echo "$as_me:15309: checking if you want \$NCURSES_NO_PADDING code" >&5 -+echo "$as_me:15310: checking if you want \$NCURSES_NO_PADDING code" >&5 - echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 - - # Check whether --enable-no-padding or --disable-no-padding was given. -@@ -15316,7 +15317,7 @@ - else - with_no_padding=$with_ext_funcs - fi; --echo "$as_me:15319: result: $with_no_padding" >&5 -+echo "$as_me:15320: result: $with_no_padding" >&5 - echo "${ECHO_T}$with_no_padding" >&6 - test "x$with_no_padding" = xyes && - cat >>confdefs.h <<\EOF -@@ -15324,7 +15325,7 @@ - EOF - - ### use option --enable-sigwinch to turn on use of SIGWINCH logic --echo "$as_me:15327: checking if you want SIGWINCH handler" >&5 -+echo "$as_me:15328: checking if you want SIGWINCH handler" >&5 - echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 - - # Check whether --enable-sigwinch or --disable-sigwinch was given. -@@ -15334,7 +15335,7 @@ - else - with_sigwinch=$with_ext_funcs - fi; --echo "$as_me:15337: result: $with_sigwinch" >&5 -+echo "$as_me:15338: result: $with_sigwinch" >&5 - echo "${ECHO_T}$with_sigwinch" >&6 - test "x$with_sigwinch" = xyes && - cat >>confdefs.h <<\EOF -@@ -15342,7 +15343,7 @@ - EOF - - ### use option --enable-tcap-names to allow user to define new capabilities --echo "$as_me:15345: checking if you want user-definable terminal capabilities like termcap" >&5 -+echo "$as_me:15346: checking if you want user-definable terminal capabilities like termcap" >&5 - echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 - - # Check whether --enable-tcap-names or --disable-tcap-names was given. -@@ -15352,14 +15353,14 @@ - else - with_tcap_names=$with_ext_funcs - fi; --echo "$as_me:15355: result: $with_tcap_names" >&5 -+echo "$as_me:15356: result: $with_tcap_names" >&5 - echo "${ECHO_T}$with_tcap_names" >&6 - NCURSES_XNAMES=0 - test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 - - ############################################################################## - --echo "$as_me:15362: checking if you want to link with the pthread library" >&5 -+echo "$as_me:15363: checking if you want to link with the pthread library" >&5 - echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 - - # Check whether --with-pthread or --without-pthread was given. -@@ -15369,27 +15370,27 @@ - else - with_pthread=no - fi; --echo "$as_me:15372: result: $with_pthread" >&5 -+echo "$as_me:15373: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - - if test "$with_pthread" != no ; then -- echo "$as_me:15376: checking for pthread.h" >&5 -+ echo "$as_me:15377: checking for pthread.h" >&5 - echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 - if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 15382 "configure" -+#line 15383 "configure" - #include "confdefs.h" - #include <pthread.h> - _ACEOF --if { (eval echo "$as_me:15386: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:15387: \"$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:15392: \$? = $ac_status" >&5 -+ echo "$as_me:15393: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -15408,7 +15409,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:15411: result: $ac_cv_header_pthread_h" >&5 -+echo "$as_me:15412: result: $ac_cv_header_pthread_h" >&5 - echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - if test "$ac_cv_header_pthread_h" = yes; then - -@@ -15418,7 +15419,7 @@ - - for cf_lib_pthread in pthread c_r - do -- echo "$as_me:15421: checking if we can link with the $cf_lib_pthread library" >&5 -+ echo "$as_me:15422: checking if we can link with the $cf_lib_pthread library" >&5 - echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - -@@ -15439,7 +15440,7 @@ - LIBS="$cf_add_libs" - - cat >"conftest.$ac_ext" <<_ACEOF --#line 15442 "configure" -+#line 15443 "configure" - #include "confdefs.h" - - #include <pthread.h> -@@ -15456,16 +15457,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:15459: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15460: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15462: \$? = $ac_status" >&5 -+ echo "$as_me:15463: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:15465: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15466: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15468: \$? = $ac_status" >&5 -+ echo "$as_me:15469: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - with_pthread=yes - else -@@ -15475,7 +15476,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS="$cf_save_LIBS" -- echo "$as_me:15478: result: $with_pthread" >&5 -+ echo "$as_me:15479: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - test "$with_pthread" = yes && break - done -@@ -15503,7 +15504,7 @@ - EOF - - else -- { { echo "$as_me:15506: error: Cannot link with pthread library" >&5 -+ { { echo "$as_me:15507: error: Cannot link with pthread library" >&5 - echo "$as_me: error: Cannot link with pthread library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -15513,13 +15514,13 @@ - fi - - if test "x$with_pthread" != xno; then -- echo "$as_me:15516: checking for pthread_kill" >&5 -+ echo "$as_me:15517: checking for pthread_kill" >&5 - echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 - if test "${ac_cv_func_pthread_kill+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 15522 "configure" -+#line 15523 "configure" - #include "confdefs.h" - #define pthread_kill autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -15550,16 +15551,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:15553: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15554: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15556: \$? = $ac_status" >&5 -+ echo "$as_me:15557: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:15559: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15560: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15562: \$? = $ac_status" >&5 -+ echo "$as_me:15563: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_pthread_kill=yes - else -@@ -15569,11 +15570,11 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:15572: result: $ac_cv_func_pthread_kill" >&5 -+echo "$as_me:15573: result: $ac_cv_func_pthread_kill" >&5 - echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 - if test "$ac_cv_func_pthread_kill" = yes; then - -- echo "$as_me:15576: checking if you want to allow EINTR in wgetch with pthreads" >&5 -+ echo "$as_me:15577: checking if you want to allow EINTR in wgetch with pthreads" >&5 - echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 - - # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. -@@ -15583,7 +15584,7 @@ - else - use_pthreads_eintr=no - fi; -- echo "$as_me:15586: result: $use_pthreads_eintr" >&5 -+ echo "$as_me:15587: result: $use_pthreads_eintr" >&5 - echo "${ECHO_T}$use_pthreads_eintr" >&6 - if test "x$use_pthreads_eintr" = xyes ; then - -@@ -15594,7 +15595,7 @@ - fi - fi - -- echo "$as_me:15597: checking if you want to use weak-symbols for pthreads" >&5 -+ echo "$as_me:15598: checking if you want to use weak-symbols for pthreads" >&5 - echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 - - # Check whether --enable-weak-symbols or --disable-weak-symbols was given. -@@ -15604,18 +15605,18 @@ - else - use_weak_symbols=no - fi; -- echo "$as_me:15607: result: $use_weak_symbols" >&5 -+ echo "$as_me:15608: result: $use_weak_symbols" >&5 - echo "${ECHO_T}$use_weak_symbols" >&6 - if test "x$use_weak_symbols" = xyes ; then - --echo "$as_me:15611: checking if $CC supports weak symbols" >&5 -+echo "$as_me:15612: checking if $CC supports weak symbols" >&5 - echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 - if test "${cf_cv_weak_symbols+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 15618 "configure" -+#line 15619 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -15641,16 +15642,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15647: \$? = $ac_status" >&5 -+ echo "$as_me:15648: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:15650: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15651: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15653: \$? = $ac_status" >&5 -+ echo "$as_me:15654: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_weak_symbols=yes - else -@@ -15661,7 +15662,7 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - fi --echo "$as_me:15664: result: $cf_cv_weak_symbols" >&5 -+echo "$as_me:15665: result: $cf_cv_weak_symbols" >&5 - echo "${ECHO_T}$cf_cv_weak_symbols" >&6 - - else -@@ -15711,7 +15712,7 @@ - # opaque outside of that, so there is no --enable-opaque option. We can use - # this option without --with-pthreads, but this will be always set for - # pthreads. --echo "$as_me:15714: checking if you want reentrant code" >&5 -+echo "$as_me:15715: checking if you want reentrant code" >&5 - echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 - - # Check whether --enable-reentrant or --disable-reentrant was given. -@@ -15721,7 +15722,7 @@ - else - with_reentrant=no - fi; --echo "$as_me:15724: result: $with_reentrant" >&5 -+echo "$as_me:15725: result: $with_reentrant" >&5 - echo "${ECHO_T}$with_reentrant" >&6 - if test "x$with_reentrant" = xyes ; then - cf_cv_enable_reentrant=1 -@@ -15809,7 +15810,7 @@ - (5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 -- { echo "$as_me:15812: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 -+ { echo "$as_me:15813: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 - echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} - ;; - esac -@@ -15821,7 +15822,7 @@ - NCURSES_SIZE_T=$cf_dft_ordinate_type - fi - --echo "$as_me:15824: checking if you want opaque curses-library structures" >&5 -+echo "$as_me:15825: checking if you want opaque curses-library structures" >&5 - echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 - - # Check whether --enable-opaque-curses or --disable-opaque-curses was given. -@@ -15843,16 +15844,16 @@ - test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses - - fi; --echo "$as_me:15846: result: $enable_opaque_curses" >&5 -+echo "$as_me:15847: result: $enable_opaque_curses" >&5 - echo "${ECHO_T}$enable_opaque_curses" >&6 - - test "$cf_cv_enable_reentrant" = 1 && \ - test "$enable_opaque_curses" = no && \ --{ { echo "$as_me:15851: error: reentrant configuration requires opaque library" >&5 -+{ { echo "$as_me:15852: error: reentrant configuration requires opaque library" >&5 - echo "$as_me: error: reentrant configuration requires opaque library" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:15855: checking if you want opaque form-library structures" >&5 -+echo "$as_me:15856: checking if you want opaque form-library structures" >&5 - echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 - - # Check whether --enable-opaque-form or --disable-opaque-form was given. -@@ -15862,10 +15863,10 @@ - else - enable_opaque_form=no - fi; --echo "$as_me:15865: result: $enable_opaque_form" >&5 -+echo "$as_me:15866: result: $enable_opaque_form" >&5 - echo "${ECHO_T}$enable_opaque_form" >&6 - --echo "$as_me:15868: checking if you want opaque menu-library structures" >&5 -+echo "$as_me:15869: checking if you want opaque menu-library structures" >&5 - echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 - - # Check whether --enable-opaque-menu or --disable-opaque-menu was given. -@@ -15875,10 +15876,10 @@ - else - enable_opaque_menu=no - fi; --echo "$as_me:15878: result: $enable_opaque_menu" >&5 -+echo "$as_me:15879: result: $enable_opaque_menu" >&5 - echo "${ECHO_T}$enable_opaque_menu" >&6 - --echo "$as_me:15881: checking if you want opaque panel-library structures" >&5 -+echo "$as_me:15882: checking if you want opaque panel-library structures" >&5 - echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 - - # Check whether --enable-opaque-panel or --disable-opaque-panel was given. -@@ -15888,7 +15889,7 @@ - else - enable_opaque_panel=no - fi; --echo "$as_me:15891: result: $enable_opaque_panel" >&5 -+echo "$as_me:15892: result: $enable_opaque_panel" >&5 - echo "${ECHO_T}$enable_opaque_panel" >&6 - - NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 -@@ -15898,7 +15899,7 @@ - - ### Allow using a different wrap-prefix - if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then -- echo "$as_me:15901: checking for prefix used to wrap public variables" >&5 -+ echo "$as_me:15902: checking for prefix used to wrap public variables" >&5 - echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 - - # Check whether --with-wrap-prefix or --without-wrap-prefix was given. -@@ -15908,7 +15909,7 @@ - else - NCURSES_WRAP_PREFIX=_nc_ - fi; -- echo "$as_me:15911: result: $NCURSES_WRAP_PREFIX" >&5 -+ echo "$as_me:15912: result: $NCURSES_WRAP_PREFIX" >&5 - echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 - else - NCURSES_WRAP_PREFIX=_nc_ -@@ -15921,7 +15922,7 @@ - ############################################################################### - # These options are relatively safe to experiment with. - --echo "$as_me:15924: checking if you want all development code" >&5 -+echo "$as_me:15925: checking if you want all development code" >&5 - echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 - - # Check whether --with-develop or --without-develop was given. -@@ -15931,11 +15932,11 @@ - else - with_develop=no - fi; --echo "$as_me:15934: result: $with_develop" >&5 -+echo "$as_me:15935: result: $with_develop" >&5 - echo "${ECHO_T}$with_develop" >&6 - - ### use option --enable-hard-tabs to turn on use of hard-tabs optimize --echo "$as_me:15938: checking if you want hard-tabs code" >&5 -+echo "$as_me:15939: checking if you want hard-tabs code" >&5 - echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 - - # Check whether --enable-hard-tabs or --disable-hard-tabs was given. -@@ -15945,7 +15946,7 @@ - else - enable_hard_tabs=$with_develop - fi; --echo "$as_me:15948: result: $enable_hard_tabs" >&5 -+echo "$as_me:15949: result: $enable_hard_tabs" >&5 - echo "${ECHO_T}$enable_hard_tabs" >&6 - test "x$enable_hard_tabs" = xyes && - cat >>confdefs.h <<\EOF -@@ -15953,7 +15954,7 @@ - EOF - - ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize --echo "$as_me:15956: checking if you want limited support for xmc" >&5 -+echo "$as_me:15957: checking if you want limited support for xmc" >&5 - echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 - - # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. -@@ -15963,7 +15964,7 @@ - else - enable_xmc_glitch=$with_develop - fi; --echo "$as_me:15966: result: $enable_xmc_glitch" >&5 -+echo "$as_me:15967: result: $enable_xmc_glitch" >&5 - echo "${ECHO_T}$enable_xmc_glitch" >&6 - test "x$enable_xmc_glitch" = xyes && - cat >>confdefs.h <<\EOF -@@ -15973,7 +15974,7 @@ - ############################################################################### - # These are just experimental, probably should not be in a package: - --echo "$as_me:15976: checking if you do not want to assume colors are white-on-black" >&5 -+echo "$as_me:15977: checking if you do not want to assume colors are white-on-black" >&5 - echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 - - # Check whether --enable-assumed-color or --disable-assumed-color was given. -@@ -15983,7 +15984,7 @@ - else - with_assumed_color=yes - fi; --echo "$as_me:15986: result: $with_assumed_color" >&5 -+echo "$as_me:15987: result: $with_assumed_color" >&5 - echo "${ECHO_T}$with_assumed_color" >&6 - test "x$with_assumed_color" = xyes && - cat >>confdefs.h <<\EOF -@@ -15991,7 +15992,7 @@ - EOF - - ### use option --enable-hashmap to turn on use of hashmap scrolling logic --echo "$as_me:15994: checking if you want hashmap scrolling-optimization code" >&5 -+echo "$as_me:15995: checking if you want hashmap scrolling-optimization code" >&5 - echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 - - # Check whether --enable-hashmap or --disable-hashmap was given. -@@ -16001,7 +16002,7 @@ - else - with_hashmap=yes - fi; --echo "$as_me:16004: result: $with_hashmap" >&5 -+echo "$as_me:16005: result: $with_hashmap" >&5 - echo "${ECHO_T}$with_hashmap" >&6 - test "x$with_hashmap" = xyes && - cat >>confdefs.h <<\EOF -@@ -16009,7 +16010,7 @@ - EOF - - ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment --echo "$as_me:16012: checking if you want colorfgbg code" >&5 -+echo "$as_me:16013: checking if you want colorfgbg code" >&5 - echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 - - # Check whether --enable-colorfgbg or --disable-colorfgbg was given. -@@ -16019,7 +16020,7 @@ - else - with_colorfgbg=no - fi; --echo "$as_me:16022: result: $with_colorfgbg" >&5 -+echo "$as_me:16023: result: $with_colorfgbg" >&5 - echo "${ECHO_T}$with_colorfgbg" >&6 - test "x$with_colorfgbg" = xyes && - cat >>confdefs.h <<\EOF -@@ -16027,7 +16028,7 @@ - EOF - - ### use option --enable-fvisibility to turn on use of gcc-specific feature --echo "$as_me:16030: checking if you want to use gcc -fvisibility option" >&5 -+echo "$as_me:16031: checking if you want to use gcc -fvisibility option" >&5 - echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 - - # Check whether --enable-fvisibility or --disable-fvisibility was given. -@@ -16037,14 +16038,14 @@ - else - cf_with_fvisibility=no - fi; --echo "$as_me:16040: result: $cf_with_fvisibility" >&5 -+echo "$as_me:16041: result: $cf_with_fvisibility" >&5 - echo "${ECHO_T}$cf_with_fvisibility" >&6 - - NCURSES_IMPEXP= - NCURSES_CXX_IMPEXP= - if test "x$cf_with_fvisibility" = xyes; then - --echo "$as_me:16047: checking if $CC -fvisibility=hidden option works" >&5 -+echo "$as_me:16048: checking if $CC -fvisibility=hidden option works" >&5 - echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 - if test "${cf_cv_fvisibility_hidden+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16053,7 +16054,7 @@ - cf_save_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - cat >"conftest.$ac_ext" <<_ACEOF --#line 16056 "configure" -+#line 16057 "configure" - #include "confdefs.h" - - __attribute__ ((visibility("default"))) int somefunc() {return 42;} -@@ -16069,16 +16070,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:16072: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16073: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16075: \$? = $ac_status" >&5 -+ echo "$as_me:16076: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:16078: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16079: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16081: \$? = $ac_status" >&5 -+ echo "$as_me:16082: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_fvisibility_hidden=yes - else -@@ -16090,7 +16091,7 @@ - CFLAGS=$cf_save_cflags - - fi --echo "$as_me:16093: result: $cf_cv_fvisibility_hidden" >&5 -+echo "$as_me:16094: result: $cf_cv_fvisibility_hidden" >&5 - echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 - - if test "x$cf_cv_fvisibility_hidden" = xyes -@@ -16205,7 +16206,7 @@ - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_main_return="return" - --echo "$as_me:16208: checking if $CXX -fvisibility=hidden option works" >&5 -+echo "$as_me:16209: checking if $CXX -fvisibility=hidden option works" >&5 - echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 - if test "${cf_cv_fvisibility_hidden2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16214,7 +16215,7 @@ - cf_save_cflags="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fvisibility=hidden" - cat >"conftest.$ac_ext" <<_ACEOF --#line 16217 "configure" -+#line 16218 "configure" - #include "confdefs.h" - - __attribute__ ((visibility("default"))) int somefunc() {return 42;} -@@ -16230,16 +16231,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:16233: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16234: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16236: \$? = $ac_status" >&5 -+ echo "$as_me:16237: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:16239: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16240: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16242: \$? = $ac_status" >&5 -+ echo "$as_me:16243: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_fvisibility_hidden2=yes - else -@@ -16251,7 +16252,7 @@ - CXXFLAGS=$cf_save_cflags - - fi --echo "$as_me:16254: result: $cf_cv_fvisibility_hidden2" >&5 -+echo "$as_me:16255: result: $cf_cv_fvisibility_hidden2" >&5 - echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 - - if test "x$cf_cv_fvisibility_hidden2" = xyes -@@ -16374,7 +16375,7 @@ - fi - - ### use option --enable-interop to turn on use of bindings used for interop --echo "$as_me:16377: checking if you want interop bindings" >&5 -+echo "$as_me:16378: checking if you want interop bindings" >&5 - echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 - - # Check whether --enable-interop or --disable-interop was given. -@@ -16384,13 +16385,13 @@ - else - with_exp_interop=$cf_dft_interop - fi; --echo "$as_me:16387: result: $with_exp_interop" >&5 -+echo "$as_me:16388: result: $with_exp_interop" >&5 - echo "${ECHO_T}$with_exp_interop" >&6 - - NCURSES_INTEROP_FUNCS=0 - test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 - --echo "$as_me:16393: checking if you want experimental safe-sprintf code" >&5 -+echo "$as_me:16394: checking if you want experimental safe-sprintf code" >&5 - echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 - - # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. -@@ -16400,13 +16401,13 @@ - else - with_safe_sprintf=no - fi; --echo "$as_me:16403: result: $with_safe_sprintf" >&5 -+echo "$as_me:16404: result: $with_safe_sprintf" >&5 - echo "${ECHO_T}$with_safe_sprintf" >&6 - - ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic - # when hashmap is used scroll hints are useless - if test "$with_hashmap" = no ; then --echo "$as_me:16409: checking if you want to experiment without scrolling-hints code" >&5 -+echo "$as_me:16410: checking if you want to experiment without scrolling-hints code" >&5 - echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 - - # Check whether --enable-scroll-hints or --disable-scroll-hints was given. -@@ -16416,7 +16417,7 @@ - else - with_scroll_hints=yes - fi; --echo "$as_me:16419: result: $with_scroll_hints" >&5 -+echo "$as_me:16420: result: $with_scroll_hints" >&5 - echo "${ECHO_T}$with_scroll_hints" >&6 - test "x$with_scroll_hints" = xyes && - cat >>confdefs.h <<\EOF -@@ -16425,7 +16426,7 @@ - - fi - --echo "$as_me:16428: checking if you want wgetch-events code" >&5 -+echo "$as_me:16429: checking if you want wgetch-events code" >&5 - echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 - - # Check whether --enable-wgetch-events or --disable-wgetch-events was given. -@@ -16435,7 +16436,7 @@ - else - with_wgetch_events=no - fi; --echo "$as_me:16438: result: $with_wgetch_events" >&5 -+echo "$as_me:16439: result: $with_wgetch_events" >&5 - echo "${ECHO_T}$with_wgetch_events" >&6 - if test "x$with_wgetch_events" = xyes ; then - -@@ -16450,7 +16451,7 @@ - - case "$cf_cv_system_name" in - (*mingw32*|*mingw64*|*-msvc*) -- echo "$as_me:16453: checking if you want experimental-Windows driver" >&5 -+ echo "$as_me:16454: checking if you want experimental-Windows driver" >&5 - echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 - - # Check whether --enable-exp-win32 or --disable-exp-win32 was given. -@@ -16460,7 +16461,7 @@ - else - with_exp_win32=no - fi; -- echo "$as_me:16463: result: $with_exp_win32" >&5 -+ echo "$as_me:16464: result: $with_exp_win32" >&5 - echo "${ECHO_T}$with_exp_win32" >&6 - if test "x$with_exp_win32" = xyes - then -@@ -16486,7 +16487,7 @@ - - ### use option --disable-echo to suppress full display compiling commands - --echo "$as_me:16489: checking if you want to see long compiling messages" >&5 -+echo "$as_me:16490: checking if you want to see long compiling messages" >&5 - echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 - - # Check whether --enable-echo or --disable-echo was given. -@@ -16520,7 +16521,7 @@ - ECHO_CC='' - - fi; --echo "$as_me:16523: result: $enableval" >&5 -+echo "$as_me:16524: result: $enableval" >&5 - echo "${ECHO_T}$enableval" >&6 - - if test "x$enable_echo" = xyes; then -@@ -16533,7 +16534,7 @@ - - # --disable-stripping is used for debugging - --echo "$as_me:16536: checking if you want to install stripped executables" >&5 -+echo "$as_me:16537: checking if you want to install stripped executables" >&5 - echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 - - # Check whether --enable-stripping or --disable-stripping was given. -@@ -16550,7 +16551,7 @@ - enable_stripping=yes - - fi; --echo "$as_me:16553: result: $enable_stripping" >&5 -+echo "$as_me:16554: result: $enable_stripping" >&5 - echo "${ECHO_T}$enable_stripping" >&6 - - if test "$enable_stripping" = yes -@@ -16561,7 +16562,7 @@ - fi - - : "${INSTALL:=install}" --echo "$as_me:16564: checking if install accepts -p option" >&5 -+echo "$as_me:16565: checking if install accepts -p option" >&5 - echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 - if test "${cf_cv_install_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16592,10 +16593,10 @@ - rm -rf ./conftest* - - fi --echo "$as_me:16595: result: $cf_cv_install_p" >&5 -+echo "$as_me:16596: result: $cf_cv_install_p" >&5 - echo "${ECHO_T}$cf_cv_install_p" >&6 - --echo "$as_me:16598: checking if install needs to be told about ownership" >&5 -+echo "$as_me:16599: checking if install needs to be told about ownership" >&5 - echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 - case `$ac_config_guess` in - (*minix) -@@ -16606,7 +16607,7 @@ - ;; - esac - --echo "$as_me:16609: result: $with_install_o" >&5 -+echo "$as_me:16610: result: $with_install_o" >&5 - echo "${ECHO_T}$with_install_o" >&6 - if test "x$with_install_o" = xyes - then -@@ -16631,7 +16632,7 @@ - - ### use option --enable-warnings to turn on all gcc warnings - --echo "$as_me:16634: checking if you want to use C11 _Noreturn feature" >&5 -+echo "$as_me:16635: checking if you want to use C11 _Noreturn feature" >&5 - echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 - - # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. -@@ -16648,17 +16649,17 @@ - enable_stdnoreturn=no - - fi; --echo "$as_me:16651: result: $enable_stdnoreturn" >&5 -+echo "$as_me:16652: result: $enable_stdnoreturn" >&5 - echo "${ECHO_T}$enable_stdnoreturn" >&6 - - if test $enable_stdnoreturn = yes; then --echo "$as_me:16655: checking for C11 _Noreturn feature" >&5 -+echo "$as_me:16656: checking for C11 _Noreturn feature" >&5 - echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 - if test "${cf_cv_c11_noreturn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 16661 "configure" -+#line 16662 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -16675,16 +16676,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:16678: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16679: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16681: \$? = $ac_status" >&5 -+ echo "$as_me:16682: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:16684: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16685: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16687: \$? = $ac_status" >&5 -+ echo "$as_me:16688: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_c11_noreturn=yes - else -@@ -16695,7 +16696,7 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - fi --echo "$as_me:16698: result: $cf_cv_c11_noreturn" >&5 -+echo "$as_me:16699: result: $cf_cv_c11_noreturn" >&5 - echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 - else - cf_cv_c11_noreturn=no, -@@ -16751,16 +16752,16 @@ - then - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - --echo "${as_me:-configure}:16754: testing repairing CFLAGS: $CFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16755: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 - --echo "${as_me:-configure}:16759: testing ... fixed $CFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16760: testing ... fixed $CFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 - --echo "${as_me:-configure}:16763: testing ... extra $EXTRA_CFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16764: testing ... extra $EXTRA_CFLAGS ..." 1>&5 - - fi - ;; -@@ -16799,16 +16800,16 @@ - then - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - --echo "${as_me:-configure}:16802: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16803: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 - --echo "${as_me:-configure}:16807: testing ... fixed $CPPFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16808: testing ... fixed $CPPFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 - --echo "${as_me:-configure}:16811: testing ... extra $EXTRA_CFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16812: testing ... extra $EXTRA_CFLAGS ..." 1>&5 - - fi - ;; -@@ -16847,23 +16848,23 @@ - then - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - --echo "${as_me:-configure}:16850: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16851: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - --echo "${as_me:-configure}:16855: testing ... fixed $LDFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16856: testing ... fixed $LDFLAGS ..." 1>&5 - - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 - --echo "${as_me:-configure}:16859: testing ... extra $EXTRA_CFLAGS ..." 1>&5 -+echo "${as_me:-configure}:16860: testing ... extra $EXTRA_CFLAGS ..." 1>&5 - - fi - ;; - esac - fi - --echo "$as_me:16866: checking if you want to turn on gcc warnings" >&5 -+echo "$as_me:16867: 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. -@@ -16880,7 +16881,7 @@ - enable_warnings=no - - fi; --echo "$as_me:16883: result: $enable_warnings" >&5 -+echo "$as_me:16884: result: $enable_warnings" >&5 - echo "${ECHO_T}$enable_warnings" >&6 - if test "$enable_warnings" = "yes" - then -@@ -16904,7 +16905,7 @@ - done - - cat >"conftest.$ac_ext" <<_ACEOF --#line 16907 "configure" -+#line 16908 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -16919,26 +16920,26 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16923: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16925: \$? = $ac_status" >&5 -+ echo "$as_me:16926: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:16928: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16929: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16931: \$? = $ac_status" >&5 -+ echo "$as_me:16932: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - --echo "$as_me:16934: checking for X11/Xt const-feature" >&5 -+echo "$as_me:16935: checking for X11/Xt const-feature" >&5 - echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 - if test "${cf_cv_const_x_string+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 16941 "configure" -+#line 16942 "configure" - #include "confdefs.h" - - #define _CONST_X_STRING /* X11R7.8 (perhaps) */ -@@ -16955,16 +16956,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:16958: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16959: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16961: \$? = $ac_status" >&5 -+ echo "$as_me:16962: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:16964: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16965: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16967: \$? = $ac_status" >&5 -+ echo "$as_me:16968: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_const_x_string=no -@@ -16979,7 +16980,7 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - fi --echo "$as_me:16982: result: $cf_cv_const_x_string" >&5 -+echo "$as_me:16983: result: $cf_cv_const_x_string" >&5 - echo "${ECHO_T}$cf_cv_const_x_string" >&6 - - LIBS="$cf_save_LIBS_CF_CONST_X_STRING" -@@ -17008,7 +17009,7 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi - cat > "conftest.$ac_ext" <<EOF --#line 17011 "${as_me:-configure}" -+#line 17012 "${as_me:-configure}" - int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } - EOF - if test "$INTEL_COMPILER" = yes -@@ -17024,7 +17025,7 @@ - # remark #981: operands are evaluated in unspecified order - # warning #279: controlling expression is constant - -- { echo "$as_me:17027: checking for $CC warning options..." >&5 -+ { echo "$as_me:17028: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" -@@ -17040,12 +17041,12 @@ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:17043: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:17044: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17046: \$? = $ac_status" >&5 -+ echo "$as_me:17047: \$? = $ac_status" >&5 - (exit "$ac_status"); }; then -- test -n "$verbose" && echo "$as_me:17048: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:17049: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi -@@ -17053,7 +17054,7 @@ - CFLAGS="$cf_save_CFLAGS" - elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" - then -- { echo "$as_me:17056: checking for $CC warning options..." >&5 -+ { echo "$as_me:17057: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - cf_warn_CONST="" -@@ -17076,12 +17077,12 @@ - Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:17079: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:17080: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17082: \$? = $ac_status" >&5 -+ echo "$as_me:17083: \$? = $ac_status" >&5 - (exit "$ac_status"); }; then -- test -n "$verbose" && echo "$as_me:17084: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:17085: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - case "$cf_opt" in - (Winline) -@@ -17089,7 +17090,7 @@ - ([34].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:17092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:17093: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -17099,7 +17100,7 @@ - ([12].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:17102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:17103: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -17132,10 +17133,10 @@ - EOF - if test "$GCC" = yes - then -- { echo "$as_me:17135: checking for $CC __attribute__ directives..." >&5 -+ { echo "$as_me:17136: checking for $CC __attribute__ directives..." >&5 - echo "$as_me: checking for $CC __attribute__ directives..." >&6;} - cat > "conftest.$ac_ext" <<EOF --#line 17138 "${as_me:-configure}" -+#line 17139 "${as_me:-configure}" - #include "confdefs.h" - #include "conftest.h" - #include "conftest.i" -@@ -17184,12 +17185,12 @@ - ;; - esac - -- if { (eval echo "$as_me:17187: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:17188: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17190: \$? = $ac_status" >&5 -+ echo "$as_me:17191: \$? = $ac_status" >&5 - (exit "$ac_status"); }; then -- test -n "$verbose" && echo "$as_me:17192: result: ... $cf_attribute" >&5 -+ test -n "$verbose" && echo "$as_me:17193: result: ... $cf_attribute" >&5 - echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case "$cf_attribute" in -@@ -17261,12 +17262,12 @@ - if test "$GCC" = yes ; then - case "$host_os" in - (linux*|gnu*) -- echo "$as_me:17264: checking if this is really Intel C++ compiler" >&5 -+ echo "$as_me:17265: checking if this is really Intel C++ compiler" >&5 - echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -no-gcc" - cat >"conftest.$ac_ext" <<_ACEOF --#line 17269 "configure" -+#line 17270 "configure" - #include "confdefs.h" - - int -@@ -17283,16 +17284,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:17286: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17289: \$? = $ac_status" >&5 -+ echo "$as_me:17290: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:17292: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17293: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17295: \$? = $ac_status" >&5 -+ echo "$as_me:17296: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - INTEL_CPLUSPLUS=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147" -@@ -17303,7 +17304,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CXXFLAGS="$cf_save_CFLAGS" -- echo "$as_me:17306: result: $INTEL_CPLUSPLUS" >&5 -+ echo "$as_me:17307: result: $INTEL_CPLUSPLUS" >&5 - echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 - ;; - esac -@@ -17312,11 +17313,11 @@ - CLANG_CPLUSPLUS=no - - if test "$GCC" = yes ; then -- echo "$as_me:17315: checking if this is really Clang C++ compiler" >&5 -+ echo "$as_me:17316: 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="$CXXFLAGS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 17319 "configure" -+#line 17320 "configure" - #include "confdefs.h" - - int -@@ -17333,16 +17334,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:17336: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17337: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17339: \$? = $ac_status" >&5 -+ echo "$as_me:17340: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:17342: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17343: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17345: \$? = $ac_status" >&5 -+ echo "$as_me:17346: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - CLANG_CPLUSPLUS=yes - -@@ -17352,7 +17353,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CXXFLAGS="$cf_save_CFLAGS" -- echo "$as_me:17355: result: $CLANG_CPLUSPLUS" >&5 -+ echo "$as_me:17356: result: $CLANG_CPLUSPLUS" >&5 - echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 - fi - -@@ -17361,30 +17362,30 @@ - if test "x$CLANG_CPLUSPLUS" = "xyes" ; then - case "$CC" in - (c[1-9][0-9]|*/c[1-9][0-9]) -- { echo "$as_me:17364: WARNING: replacing broken compiler alias $CC" >&5 -+ { echo "$as_me:17365: WARNING: replacing broken compiler alias $CC" >&5 - echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} - CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" - CC=clang - ;; - esac - -- echo "$as_me:17371: checking version of $CC" >&5 -+ echo "$as_me:17372: checking version of $CC" >&5 - echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" - test -z "$CLANG_VERSION" && CLANG_VERSION=unknown -- echo "$as_me:17375: result: $CLANG_VERSION" >&5 -+ echo "$as_me:17376: result: $CLANG_VERSION" >&5 - echo "${ECHO_T}$CLANG_VERSION" >&6 - - for cf_clang_opt in \ - -Qunused-arguments \ - -Wno-error=implicit-function-declaration - do -- echo "$as_me:17382: checking if option $cf_clang_opt works" >&5 -+ echo "$as_me:17383: checking if option $cf_clang_opt works" >&5 - echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $cf_clang_opt" - cat >"conftest.$ac_ext" <<_ACEOF --#line 17387 "configure" -+#line 17388 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -17398,16 +17399,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:17401: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17402: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17404: \$? = $ac_status" >&5 -+ echo "$as_me:17405: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:17407: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17408: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17410: \$? = $ac_status" >&5 -+ echo "$as_me:17411: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_clang_optok=yes -@@ -17418,13 +17419,13 @@ - cf_clang_optok=no - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -- echo "$as_me:17421: result: $cf_clang_optok" >&5 -+ echo "$as_me:17422: result: $cf_clang_optok" >&5 - echo "${ECHO_T}$cf_clang_optok" >&6 - CFLAGS="$cf_save_CFLAGS" - if test "$cf_clang_optok" = yes; then - test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 - --echo "${as_me:-configure}:17427: testing adding option $cf_clang_opt ..." 1>&5 -+echo "${as_me:-configure}:17428: testing adding option $cf_clang_opt ..." 1>&5 - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_clang_opt" -@@ -17441,7 +17442,7 @@ - ac_main_return="return" - - cat > conftest.$ac_ext <<EOF --#line 17444 "configure" -+#line 17445 "configure" - int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } - EOF - -@@ -17459,7 +17460,7 @@ - # remark #981: operands are evaluated in unspecified order - # warning #269: invalid format string conversion - -- { echo "$as_me:17462: checking for $CC warning options..." >&5 -+ { echo "$as_me:17463: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CXXFLAGS="$CXXFLAGS" - EXTRA_CXXFLAGS="-Wall" -@@ -17476,12 +17477,12 @@ - wd981 - do - CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" -- if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:17480: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17482: \$? = $ac_status" >&5 -+ echo "$as_me:17483: \$? = $ac_status" >&5 - (exit "$ac_status"); }; then -- test -n "$verbose" && echo "$as_me:17484: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:17485: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" - fi -@@ -17490,7 +17491,7 @@ - - elif test "$GXX" = yes - then -- { echo "$as_me:17493: checking for $CXX warning options..." >&5 -+ { echo "$as_me:17494: checking for $CXX warning options..." >&5 - echo "$as_me: checking for $CXX warning options..." >&6;} - cf_save_CXXFLAGS="$CXXFLAGS" - EXTRA_CXXFLAGS="-W -Wall" -@@ -17520,16 +17521,16 @@ - Wundef $cf_gxx_extra_warnings Wno-unused - do - CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" -- if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17526: \$? = $ac_status" >&5 -+ echo "$as_me:17527: \$? = $ac_status" >&5 - (exit "$ac_status"); }; then -- test -n "$verbose" && echo "$as_me:17528: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:17529: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" - else -- test -n "$verbose" && echo "$as_me:17532: result: ... no -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:17533: result: ... no -$cf_opt" >&5 - echo "${ECHO_T}... no -$cf_opt" >&6 - fi - done -@@ -17547,7 +17548,7 @@ - fi - fi - --echo "$as_me:17550: checking if you want to work around bogus compiler/loader warnings" >&5 -+echo "$as_me:17551: checking if you want to work around bogus compiler/loader warnings" >&5 - echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 - - # Check whether --enable-string-hacks or --disable-string-hacks was given. -@@ -17557,7 +17558,7 @@ - else - enable_string_hacks=no - fi; --echo "$as_me:17560: result: $enable_string_hacks" >&5 -+echo "$as_me:17561: result: $enable_string_hacks" >&5 - echo "${ECHO_T}$enable_string_hacks" >&6 - - if test "x$enable_string_hacks" = "xyes"; then -@@ -17566,15 +17567,15 @@ - #define USE_STRING_HACKS 1 - EOF - -- { echo "$as_me:17569: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 -+ { echo "$as_me:17570: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 - echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} -- echo "$as_me:17571: checking for strlcat" >&5 -+ echo "$as_me:17572: checking for strlcat" >&5 - echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 - if test "${ac_cv_func_strlcat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 17577 "configure" -+#line 17578 "configure" - #include "confdefs.h" - #define strlcat autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -17605,16 +17606,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:17608: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17609: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17611: \$? = $ac_status" >&5 -+ echo "$as_me:17612: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:17614: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17615: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17617: \$? = $ac_status" >&5 -+ echo "$as_me:17618: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_strlcat=yes - else -@@ -17624,7 +17625,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:17627: result: $ac_cv_func_strlcat" >&5 -+echo "$as_me:17628: result: $ac_cv_func_strlcat" >&5 - echo "${ECHO_T}$ac_cv_func_strlcat" >&6 - if test "$ac_cv_func_strlcat" = yes; then - -@@ -17634,7 +17635,7 @@ - - else - -- echo "$as_me:17637: checking for strlcat in -lbsd" >&5 -+ echo "$as_me:17638: checking for strlcat in -lbsd" >&5 - echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 - if test "${ac_cv_lib_bsd_strlcat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -17642,7 +17643,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 17645 "configure" -+#line 17646 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -17661,16 +17662,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:17664: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17665: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17667: \$? = $ac_status" >&5 -+ echo "$as_me:17668: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:17670: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17671: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17673: \$? = $ac_status" >&5 -+ echo "$as_me:17674: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_bsd_strlcat=yes - else -@@ -17681,7 +17682,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:17684: result: $ac_cv_lib_bsd_strlcat" >&5 -+echo "$as_me:17685: result: $ac_cv_lib_bsd_strlcat" >&5 - echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 - if test "$ac_cv_lib_bsd_strlcat" = yes; then - -@@ -17704,23 +17705,23 @@ - for ac_header in bsd/string.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:17707: checking for $ac_header" >&5 -+echo "$as_me:17708: 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 17713 "configure" -+#line 17714 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:17717: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:17718: \"$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:17723: \$? = $ac_status" >&5 -+ echo "$as_me:17724: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -17739,7 +17740,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:17742: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:17743: 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 -@@ -17760,13 +17761,13 @@ - for ac_func in strlcpy snprintf - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:17763: checking for $ac_func" >&5 -+echo "$as_me:17764: 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 17769 "configure" -+#line 17770 "configure" - #include "confdefs.h" - #define $ac_func autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -17797,16 +17798,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:17800: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17801: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17803: \$? = $ac_status" >&5 -+ echo "$as_me:17804: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:17806: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17807: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17809: \$? = $ac_status" >&5 -+ echo "$as_me:17810: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" - else -@@ -17816,7 +17817,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:17819: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -+echo "$as_me:17820: 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 -@@ -17829,7 +17830,7 @@ - fi - - ### use option --enable-assertions to turn on generation of assertion code --echo "$as_me:17832: checking if you want to enable runtime assertions" >&5 -+echo "$as_me:17833: checking if you want to enable runtime assertions" >&5 - echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 - - # Check whether --enable-assertions or --disable-assertions was given. -@@ -17839,7 +17840,7 @@ - else - with_assertions=no - fi; --echo "$as_me:17842: result: $with_assertions" >&5 -+echo "$as_me:17843: result: $with_assertions" >&5 - echo "${ECHO_T}$with_assertions" >&6 - if test -n "$GCC" - then -@@ -17855,7 +17856,7 @@ - - ### use option --disable-leaks to suppress "permanent" leaks, for testing - --echo "$as_me:17858: checking if you want to use dmalloc for testing" >&5 -+echo "$as_me:17859: 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. -@@ -17877,7 +17878,7 @@ - else - with_dmalloc= - fi; --echo "$as_me:17880: result: ${with_dmalloc:-no}" >&5 -+echo "$as_me:17881: result: ${with_dmalloc:-no}" >&5 - echo "${ECHO_T}${with_dmalloc:-no}" >&6 - - case ".$with_cflags" in -@@ -17991,23 +17992,23 @@ - esac - - if test "$with_dmalloc" = yes ; then -- echo "$as_me:17994: checking for dmalloc.h" >&5 -+ echo "$as_me:17995: 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 18000 "configure" -+#line 18001 "configure" - #include "confdefs.h" - #include <dmalloc.h> - _ACEOF --if { (eval echo "$as_me:18004: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:18005: \"$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:18010: \$? = $ac_status" >&5 -+ echo "$as_me:18011: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -18026,11 +18027,11 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:18029: result: $ac_cv_header_dmalloc_h" >&5 -+echo "$as_me:18030: 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:18033: checking for dmalloc_debug in -ldmalloc" >&5 -+echo "$as_me:18034: 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 -@@ -18038,7 +18039,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldmalloc $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 18041 "configure" -+#line 18042 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -18057,16 +18058,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18060: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18061: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18063: \$? = $ac_status" >&5 -+ echo "$as_me:18064: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18066: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18067: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18069: \$? = $ac_status" >&5 -+ echo "$as_me:18070: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_dmalloc_dmalloc_debug=yes - else -@@ -18077,7 +18078,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:18080: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 -+echo "$as_me:18081: 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 -@@ -18092,7 +18093,7 @@ - - fi - --echo "$as_me:18095: checking if you want to use dbmalloc for testing" >&5 -+echo "$as_me:18096: 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. -@@ -18114,7 +18115,7 @@ - else - with_dbmalloc= - fi; --echo "$as_me:18117: result: ${with_dbmalloc:-no}" >&5 -+echo "$as_me:18118: result: ${with_dbmalloc:-no}" >&5 - echo "${ECHO_T}${with_dbmalloc:-no}" >&6 - - case ".$with_cflags" in -@@ -18228,23 +18229,23 @@ - esac - - if test "$with_dbmalloc" = yes ; then -- echo "$as_me:18231: checking for dbmalloc.h" >&5 -+ echo "$as_me:18232: 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 18237 "configure" -+#line 18238 "configure" - #include "confdefs.h" - #include <dbmalloc.h> - _ACEOF --if { (eval echo "$as_me:18241: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:18242: \"$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:18247: \$? = $ac_status" >&5 -+ echo "$as_me:18248: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -18263,11 +18264,11 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:18266: result: $ac_cv_header_dbmalloc_h" >&5 -+echo "$as_me:18267: 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:18270: checking for debug_malloc in -ldbmalloc" >&5 -+echo "$as_me:18271: 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 -@@ -18275,7 +18276,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldbmalloc $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 18278 "configure" -+#line 18279 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -18294,16 +18295,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18297: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18298: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18300: \$? = $ac_status" >&5 -+ echo "$as_me:18301: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18303: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18304: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18306: \$? = $ac_status" >&5 -+ echo "$as_me:18307: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_dbmalloc_debug_malloc=yes - else -@@ -18314,7 +18315,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:18317: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 -+echo "$as_me:18318: 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 -@@ -18329,7 +18330,7 @@ - - fi - --echo "$as_me:18332: checking if you want to use valgrind for testing" >&5 -+echo "$as_me:18333: 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. -@@ -18351,7 +18352,7 @@ - else - with_valgrind= - fi; --echo "$as_me:18354: result: ${with_valgrind:-no}" >&5 -+echo "$as_me:18355: result: ${with_valgrind:-no}" >&5 - echo "${ECHO_T}${with_valgrind:-no}" >&6 - - case ".$with_cflags" in -@@ -18464,7 +18465,7 @@ - ;; - esac - --echo "$as_me:18467: checking if you want to perform memory-leak testing" >&5 -+echo "$as_me:18468: 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. -@@ -18475,7 +18476,7 @@ - enable_leaks=yes - fi; - if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi --echo "$as_me:18478: result: $with_no_leaks" >&5 -+echo "$as_me:18479: result: $with_no_leaks" >&5 - echo "${ECHO_T}$with_no_leaks" >&6 - - if test "$enable_leaks" = no ; then -@@ -18527,7 +18528,7 @@ - ;; - esac - --echo "$as_me:18530: checking whether to add trace feature to all models" >&5 -+echo "$as_me:18531: checking whether to add trace feature to all models" >&5 - echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 - - # Check whether --with-trace or --without-trace was given. -@@ -18537,7 +18538,7 @@ - else - cf_with_trace=$cf_all_traces - fi; --echo "$as_me:18540: result: $cf_with_trace" >&5 -+echo "$as_me:18541: result: $cf_with_trace" >&5 - echo "${ECHO_T}$cf_with_trace" >&6 - - if test "x$cf_with_trace" = xyes ; then -@@ -18651,7 +18652,7 @@ - ADA_TRACE=FALSE - fi - --echo "$as_me:18654: checking if we want to use GNAT projects" >&5 -+echo "$as_me:18655: checking if we want to use GNAT projects" >&5 - echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 - - # Check whether --enable-gnat-projects or --disable-gnat-projects was given. -@@ -18668,7 +18669,7 @@ - enable_gnat_projects=yes - - fi; --echo "$as_me:18671: result: $enable_gnat_projects" >&5 -+echo "$as_me:18672: result: $enable_gnat_projects" >&5 - echo "${ECHO_T}$enable_gnat_projects" >&6 - - ### Checks for libraries. -@@ -18681,14 +18682,14 @@ - CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" - fi - --echo "$as_me:18684: checking if ssp library is needed" >&5 -+echo "$as_me:18685: checking if ssp library is needed" >&5 - echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 - if test "${cf_cv_need_libssp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 18691 "configure" -+#line 18692 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -18705,16 +18706,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18708: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18709: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18711: \$? = $ac_status" >&5 -+ echo "$as_me:18712: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18714: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18715: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18717: \$? = $ac_status" >&5 -+ echo "$as_me:18718: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_need_libssp=no - else -@@ -18724,7 +18725,7 @@ - cf_save_LIBS="$LIBS" - LIBS="$LIBS -lssp" - cat >"conftest.$ac_ext" <<_ACEOF --#line 18727 "configure" -+#line 18728 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -18741,16 +18742,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18744: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18745: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18747: \$? = $ac_status" >&5 -+ echo "$as_me:18748: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18750: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18751: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18753: \$? = $ac_status" >&5 -+ echo "$as_me:18754: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_need_libssp=yes - else -@@ -18764,7 +18765,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:18767: result: $cf_cv_need_libssp" >&5 -+echo "$as_me:18768: result: $cf_cv_need_libssp" >&5 - echo "${ECHO_T}$cf_cv_need_libssp" >&6 - - if test "x$cf_cv_need_libssp" = xyes -@@ -18790,13 +18791,13 @@ - - ;; - (*) --echo "$as_me:18793: checking for gettimeofday" >&5 -+echo "$as_me:18794: checking for gettimeofday" >&5 - echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 - if test "${ac_cv_func_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 18799 "configure" -+#line 18800 "configure" - #include "confdefs.h" - #define gettimeofday autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -18827,16 +18828,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18830: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18831: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18833: \$? = $ac_status" >&5 -+ echo "$as_me:18834: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18836: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18837: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18839: \$? = $ac_status" >&5 -+ echo "$as_me:18840: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_gettimeofday=yes - else -@@ -18846,7 +18847,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:18849: result: $ac_cv_func_gettimeofday" >&5 -+echo "$as_me:18850: result: $ac_cv_func_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 - if test "$ac_cv_func_gettimeofday" = yes; then - -@@ -18856,7 +18857,7 @@ - - else - --echo "$as_me:18859: checking for gettimeofday in -lbsd" >&5 -+echo "$as_me:18860: checking for gettimeofday in -lbsd" >&5 - echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 - if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -18864,7 +18865,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 18867 "configure" -+#line 18868 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -18883,16 +18884,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18886: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18887: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18889: \$? = $ac_status" >&5 -+ echo "$as_me:18890: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18892: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18893: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18895: \$? = $ac_status" >&5 -+ echo "$as_me:18896: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_bsd_gettimeofday=yes - else -@@ -18903,7 +18904,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:18906: result: $ac_cv_lib_bsd_gettimeofday" >&5 -+echo "$as_me:18907: result: $ac_cv_lib_bsd_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 - if test "$ac_cv_lib_bsd_gettimeofday" = yes; then - -@@ -18933,14 +18934,14 @@ - ;; - esac - --echo "$as_me:18936: checking if -lm needed for math functions" >&5 -+echo "$as_me:18937: checking if -lm needed for math functions" >&5 - echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 - if test "${cf_cv_need_libm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 18943 "configure" -+#line 18944 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -18956,16 +18957,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:18959: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18960: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18962: \$? = $ac_status" >&5 -+ echo "$as_me:18963: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:18965: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18966: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18968: \$? = $ac_status" >&5 -+ echo "$as_me:18969: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_need_libm=no - else -@@ -18975,7 +18976,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:18978: result: $cf_cv_need_libm" >&5 -+echo "$as_me:18979: result: $cf_cv_need_libm" >&5 - echo "${ECHO_T}$cf_cv_need_libm" >&6 - if test "$cf_cv_need_libm" = yes - then -@@ -18983,13 +18984,13 @@ - fi - - ### Checks for header files. --echo "$as_me:18986: checking for ANSI C header files" >&5 -+echo "$as_me:18987: checking for ANSI C header files" >&5 - echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 - if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 18992 "configure" -+#line 18993 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -18997,13 +18998,13 @@ - #include <float.h> - - _ACEOF --if { (eval echo "$as_me:19000: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:19001: \"$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:19006: \$? = $ac_status" >&5 -+ echo "$as_me:19007: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -19025,7 +19026,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >"conftest.$ac_ext" <<_ACEOF --#line 19028 "configure" -+#line 19029 "configure" - #include "confdefs.h" - #include <string.h> - -@@ -19043,7 +19044,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >"conftest.$ac_ext" <<_ACEOF --#line 19046 "configure" -+#line 19047 "configure" - #include "confdefs.h" - #include <stdlib.h> - -@@ -19064,7 +19065,7 @@ - : - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 19067 "configure" -+#line 19068 "configure" - #include "confdefs.h" - #include <ctype.h> - #if ((' ' & 0x0FF) == 0x020) -@@ -19090,15 +19091,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:19093: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19094: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19096: \$? = $ac_status" >&5 -+ echo "$as_me:19097: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:19098: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19099: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19101: \$? = $ac_status" >&5 -+ echo "$as_me:19102: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : - else -@@ -19111,7 +19112,7 @@ - fi - fi - fi --echo "$as_me:19114: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:19115: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -19124,13 +19125,13 @@ - ac_header_dirent=no - for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` --echo "$as_me:19127: checking for $ac_hdr that defines DIR" >&5 -+echo "$as_me:19128: checking for $ac_hdr that defines DIR" >&5 - echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 19133 "configure" -+#line 19134 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -19145,16 +19146,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:19148: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19149: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19151: \$? = $ac_status" >&5 -+ echo "$as_me:19152: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:19154: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19155: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19157: \$? = $ac_status" >&5 -+ echo "$as_me:19158: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_Header=yes" - else -@@ -19164,7 +19165,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:19167: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:19168: 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 -@@ -19177,7 +19178,7 @@ - done - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then -- echo "$as_me:19180: checking for opendir in -ldir" >&5 -+ echo "$as_me:19181: checking for opendir in -ldir" >&5 - echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 - if test "${ac_cv_lib_dir_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19185,7 +19186,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldir $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19188 "configure" -+#line 19189 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19204,16 +19205,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19207: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19208: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19210: \$? = $ac_status" >&5 -+ echo "$as_me:19211: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19213: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19214: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19216: \$? = $ac_status" >&5 -+ echo "$as_me:19217: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_dir_opendir=yes - else -@@ -19224,14 +19225,14 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19227: result: $ac_cv_lib_dir_opendir" >&5 -+echo "$as_me:19228: result: $ac_cv_lib_dir_opendir" >&5 - echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 - if test "$ac_cv_lib_dir_opendir" = yes; then - LIBS="$LIBS -ldir" - fi - - else -- echo "$as_me:19234: checking for opendir in -lx" >&5 -+ echo "$as_me:19235: checking for opendir in -lx" >&5 - echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 - if test "${ac_cv_lib_x_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19239,7 +19240,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lx $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19242 "configure" -+#line 19243 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19258,16 +19259,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19261: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19262: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19264: \$? = $ac_status" >&5 -+ echo "$as_me:19265: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19267: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19268: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19270: \$? = $ac_status" >&5 -+ echo "$as_me:19271: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_x_opendir=yes - else -@@ -19278,7 +19279,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19281: result: $ac_cv_lib_x_opendir" >&5 -+echo "$as_me:19282: result: $ac_cv_lib_x_opendir" >&5 - echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 - if test "$ac_cv_lib_x_opendir" = yes; then - LIBS="$LIBS -lx" -@@ -19286,13 +19287,13 @@ - - fi - --echo "$as_me:19289: checking whether time.h and sys/time.h may both be included" >&5 -+echo "$as_me:19290: checking whether time.h and sys/time.h may both be included" >&5 - echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 - if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 19295 "configure" -+#line 19296 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -19308,16 +19309,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:19312: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:19314: \$? = $ac_status" >&5 -+ echo "$as_me:19315: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:19317: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19318: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19320: \$? = $ac_status" >&5 -+ echo "$as_me:19321: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_header_time=yes - else -@@ -19327,7 +19328,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:19330: result: $ac_cv_header_time" >&5 -+echo "$as_me:19331: result: $ac_cv_header_time" >&5 - echo "${ECHO_T}$ac_cv_header_time" >&6 - if test $ac_cv_header_time = yes; then - -@@ -19342,7 +19343,7 @@ - case "$host_os" in - (mingw*) - # -lsystre -ltre -lintl -liconv -- echo "$as_me:19345: checking for regcomp in -lsystre" >&5 -+ echo "$as_me:19346: checking for regcomp in -lsystre" >&5 - echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 - if test "${ac_cv_lib_systre_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19350,7 +19351,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsystre $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19353 "configure" -+#line 19354 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19369,16 +19370,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19372: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19373: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19375: \$? = $ac_status" >&5 -+ echo "$as_me:19376: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19378: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19379: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19381: \$? = $ac_status" >&5 -+ echo "$as_me:19382: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_systre_regcomp=yes - else -@@ -19389,11 +19390,11 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19392: result: $ac_cv_lib_systre_regcomp" >&5 -+echo "$as_me:19393: result: $ac_cv_lib_systre_regcomp" >&5 - echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 - if test "$ac_cv_lib_systre_regcomp" = yes; then - -- echo "$as_me:19396: checking for libiconv_open in -liconv" >&5 -+ echo "$as_me:19397: checking for libiconv_open in -liconv" >&5 - echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 - if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19401,7 +19402,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-liconv $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19404 "configure" -+#line 19405 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19420,16 +19421,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19423: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19424: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19426: \$? = $ac_status" >&5 -+ echo "$as_me:19427: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19429: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19430: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19432: \$? = $ac_status" >&5 -+ echo "$as_me:19433: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_iconv_libiconv_open=yes - else -@@ -19440,7 +19441,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19443: result: $ac_cv_lib_iconv_libiconv_open" >&5 -+echo "$as_me:19444: result: $ac_cv_lib_iconv_libiconv_open" >&5 - echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 - if test "$ac_cv_lib_iconv_libiconv_open" = yes; then - -@@ -19462,7 +19463,7 @@ - - fi - -- echo "$as_me:19465: checking for libintl_gettext in -lintl" >&5 -+ echo "$as_me:19466: checking for libintl_gettext in -lintl" >&5 - echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 - if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19470,7 +19471,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19473 "configure" -+#line 19474 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19489,16 +19490,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19492: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19493: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19495: \$? = $ac_status" >&5 -+ echo "$as_me:19496: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19498: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19499: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19501: \$? = $ac_status" >&5 -+ echo "$as_me:19502: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_intl_libintl_gettext=yes - else -@@ -19509,7 +19510,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19512: result: $ac_cv_lib_intl_libintl_gettext" >&5 -+echo "$as_me:19513: result: $ac_cv_lib_intl_libintl_gettext" >&5 - echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 - if test "$ac_cv_lib_intl_libintl_gettext" = yes; then - -@@ -19531,7 +19532,7 @@ - - fi - -- echo "$as_me:19534: checking for tre_regcomp in -ltre" >&5 -+ echo "$as_me:19535: checking for tre_regcomp in -ltre" >&5 - echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 - if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19539,7 +19540,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ltre $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19542 "configure" -+#line 19543 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19558,16 +19559,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19561: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19562: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19564: \$? = $ac_status" >&5 -+ echo "$as_me:19565: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19567: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19568: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19570: \$? = $ac_status" >&5 -+ echo "$as_me:19571: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_tre_tre_regcomp=yes - else -@@ -19578,7 +19579,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19581: result: $ac_cv_lib_tre_tre_regcomp" >&5 -+echo "$as_me:19582: result: $ac_cv_lib_tre_tre_regcomp" >&5 - echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 - if test "$ac_cv_lib_tre_tre_regcomp" = yes; then - -@@ -19620,7 +19621,7 @@ - - else - -- echo "$as_me:19623: checking for regcomp in -lgnurx" >&5 -+ echo "$as_me:19624: checking for regcomp in -lgnurx" >&5 - echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 - if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19628,7 +19629,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgnurx $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19631 "configure" -+#line 19632 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19647,16 +19648,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19650: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19651: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19653: \$? = $ac_status" >&5 -+ echo "$as_me:19654: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19656: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19657: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19659: \$? = $ac_status" >&5 -+ echo "$as_me:19660: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_gnurx_regcomp=yes - else -@@ -19667,7 +19668,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19670: result: $ac_cv_lib_gnurx_regcomp" >&5 -+echo "$as_me:19671: result: $ac_cv_lib_gnurx_regcomp" >&5 - echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 - if test "$ac_cv_lib_gnurx_regcomp" = yes; then - -@@ -19695,13 +19696,13 @@ - ;; - (*) - cf_regex_libs="regex re" -- echo "$as_me:19698: checking for regcomp" >&5 -+ echo "$as_me:19699: checking for regcomp" >&5 - echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 - if test "${ac_cv_func_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 19704 "configure" -+#line 19705 "configure" - #include "confdefs.h" - #define regcomp autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -19732,16 +19733,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19735: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19736: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19738: \$? = $ac_status" >&5 -+ echo "$as_me:19739: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19741: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19742: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19744: \$? = $ac_status" >&5 -+ echo "$as_me:19745: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_regcomp=yes - else -@@ -19751,7 +19752,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:19754: result: $ac_cv_func_regcomp" >&5 -+echo "$as_me:19755: result: $ac_cv_func_regcomp" >&5 - echo "${ECHO_T}$ac_cv_func_regcomp" >&6 - if test "$ac_cv_func_regcomp" = yes; then - cf_regex_func=regcomp -@@ -19760,7 +19761,7 @@ - for cf_regex_lib in $cf_regex_libs - do - as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` --echo "$as_me:19763: checking for regcomp in -l$cf_regex_lib" >&5 -+echo "$as_me:19764: checking for regcomp in -l$cf_regex_lib" >&5 - echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19768,7 +19769,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-l$cf_regex_lib $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19771 "configure" -+#line 19772 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19787,16 +19788,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19790: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19791: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19793: \$? = $ac_status" >&5 -+ echo "$as_me:19794: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19796: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19797: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19799: \$? = $ac_status" >&5 -+ echo "$as_me:19800: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_Lib=yes" - else -@@ -19807,7 +19808,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19810: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 -+echo "$as_me:19811: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 - echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 - if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then - -@@ -19839,13 +19840,13 @@ - esac - - if test "$cf_regex_func" = no ; then -- echo "$as_me:19842: checking for compile" >&5 -+ echo "$as_me:19843: checking for compile" >&5 - echo $ECHO_N "checking for compile... $ECHO_C" >&6 - if test "${ac_cv_func_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 19848 "configure" -+#line 19849 "configure" - #include "confdefs.h" - #define compile autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -19876,16 +19877,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19879: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19880: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19882: \$? = $ac_status" >&5 -+ echo "$as_me:19883: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19885: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19886: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19888: \$? = $ac_status" >&5 -+ echo "$as_me:19889: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_compile=yes - else -@@ -19895,13 +19896,13 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:19898: result: $ac_cv_func_compile" >&5 -+echo "$as_me:19899: result: $ac_cv_func_compile" >&5 - echo "${ECHO_T}$ac_cv_func_compile" >&6 - if test "$ac_cv_func_compile" = yes; then - cf_regex_func=compile - else - -- echo "$as_me:19904: checking for compile in -lgen" >&5 -+ echo "$as_me:19905: checking for compile in -lgen" >&5 - echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 - if test "${ac_cv_lib_gen_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19909,7 +19910,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgen $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 19912 "configure" -+#line 19913 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -19928,16 +19929,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:19931: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:19932: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:19934: \$? = $ac_status" >&5 -+ echo "$as_me:19935: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:19937: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:19938: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:19940: \$? = $ac_status" >&5 -+ echo "$as_me:19941: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_gen_compile=yes - else -@@ -19948,7 +19949,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:19951: result: $ac_cv_lib_gen_compile" >&5 -+echo "$as_me:19952: result: $ac_cv_lib_gen_compile" >&5 - echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 - if test "$ac_cv_lib_gen_compile" = yes; then - -@@ -19976,11 +19977,11 @@ - fi - - if test "$cf_regex_func" = no ; then -- { echo "$as_me:19979: WARNING: cannot find regular expression library" >&5 -+ { echo "$as_me:19980: WARNING: cannot find regular expression library" >&5 - echo "$as_me: WARNING: cannot find regular expression library" >&2;} - fi - --echo "$as_me:19983: checking for regular-expression headers" >&5 -+echo "$as_me:19984: checking for regular-expression headers" >&5 - echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 - if test "${cf_cv_regex_hdrs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -19992,7 +19993,7 @@ - for cf_regex_hdr in regexp.h regexpr.h - do - cat >"conftest.$ac_ext" <<_ACEOF --#line 19995 "configure" -+#line 19996 "configure" - #include "confdefs.h" - #include <$cf_regex_hdr> - int -@@ -20009,16 +20010,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:20012: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20013: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20015: \$? = $ac_status" >&5 -+ echo "$as_me:20016: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:20018: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20019: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20021: \$? = $ac_status" >&5 -+ echo "$as_me:20022: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr -@@ -20035,7 +20036,7 @@ - for cf_regex_hdr in regex.h - do - cat >"conftest.$ac_ext" <<_ACEOF --#line 20038 "configure" -+#line 20039 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$cf_regex_hdr> -@@ -20055,16 +20056,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:20058: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20059: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20061: \$? = $ac_status" >&5 -+ echo "$as_me:20062: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:20064: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20065: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20067: \$? = $ac_status" >&5 -+ echo "$as_me:20068: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr -@@ -20080,11 +20081,11 @@ - esac - - fi --echo "$as_me:20083: result: $cf_cv_regex_hdrs" >&5 -+echo "$as_me:20084: result: $cf_cv_regex_hdrs" >&5 - echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 - - case "$cf_cv_regex_hdrs" in -- (no) { echo "$as_me:20087: WARNING: no regular expression header found" >&5 -+ (no) { echo "$as_me:20088: WARNING: no regular expression header found" >&5 - echo "$as_me: WARNING: no regular expression header found" >&2;} ;; - (regex.h) - cat >>confdefs.h <<\EOF -@@ -20121,23 +20122,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:20124: checking for $ac_header" >&5 -+echo "$as_me:20125: 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 20130 "configure" -+#line 20131 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:20134: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:20135: \"$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:20140: \$? = $ac_status" >&5 -+ echo "$as_me:20141: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -20156,7 +20157,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:20159: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:20160: 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 -@@ -20169,23 +20170,23 @@ - for ac_header in unistd.h getopt.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:20172: checking for $ac_header" >&5 -+echo "$as_me:20173: 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 20178 "configure" -+#line 20179 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:20182: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:20183: \"$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:20188: \$? = $ac_status" >&5 -+ echo "$as_me:20189: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -20204,7 +20205,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:20207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:20208: 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 -@@ -20214,7 +20215,7 @@ - fi - done - --echo "$as_me:20217: checking for header declaring getopt variables" >&5 -+echo "$as_me:20218: checking for header declaring getopt variables" >&5 - echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 - if test "${cf_cv_getopt_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20224,7 +20225,7 @@ - for cf_header in stdio.h stdlib.h unistd.h getopt.h - do - cat >"conftest.$ac_ext" <<_ACEOF --#line 20227 "configure" -+#line 20228 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -20237,16 +20238,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20241: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20243: \$? = $ac_status" >&5 -+ echo "$as_me:20244: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:20246: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20247: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20249: \$? = $ac_status" >&5 -+ echo "$as_me:20250: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_getopt_header=$cf_header - break -@@ -20258,7 +20259,7 @@ - done - - fi --echo "$as_me:20261: result: $cf_cv_getopt_header" >&5 -+echo "$as_me:20262: result: $cf_cv_getopt_header" >&5 - echo "${ECHO_T}$cf_cv_getopt_header" >&6 - if test "$cf_cv_getopt_header" != none ; then - -@@ -20275,14 +20276,14 @@ - - fi - --echo "$as_me:20278: checking if external environ is declared" >&5 -+echo "$as_me:20279: checking if external environ is declared" >&5 - echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 - if test "${cf_cv_dcl_environ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 20285 "configure" -+#line 20286 "configure" - #include "confdefs.h" - - #ifdef HAVE_STDLIB_H -@@ -20298,16 +20299,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20304: \$? = $ac_status" >&5 -+ echo "$as_me:20305: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:20307: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20308: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20310: \$? = $ac_status" >&5 -+ echo "$as_me:20311: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_dcl_environ=yes - else -@@ -20318,7 +20319,7 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - fi --echo "$as_me:20321: result: $cf_cv_dcl_environ" >&5 -+echo "$as_me:20322: result: $cf_cv_dcl_environ" >&5 - echo "${ECHO_T}$cf_cv_dcl_environ" >&6 - - if test "$cf_cv_dcl_environ" = no ; then -@@ -20333,14 +20334,14 @@ - - # It's possible (for near-UNIX clones) that the data doesn't exist - --echo "$as_me:20336: checking if external environ exists" >&5 -+echo "$as_me:20337: checking if external environ exists" >&5 - echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 - if test "${cf_cv_have_environ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 20343 "configure" -+#line 20344 "configure" - #include "confdefs.h" - - #undef environ -@@ -20355,16 +20356,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:20358: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20359: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20361: \$? = $ac_status" >&5 -+ echo "$as_me:20362: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:20364: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20365: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20367: \$? = $ac_status" >&5 -+ echo "$as_me:20368: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have_environ=yes - else -@@ -20375,7 +20376,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - - fi --echo "$as_me:20378: result: $cf_cv_have_environ" >&5 -+echo "$as_me:20379: result: $cf_cv_have_environ" >&5 - echo "${ECHO_T}$cf_cv_have_environ" >&6 - - if test "$cf_cv_have_environ" = yes ; then -@@ -20388,13 +20389,13 @@ - - fi - --echo "$as_me:20391: checking for getenv" >&5 -+echo "$as_me:20392: checking for getenv" >&5 - echo $ECHO_N "checking for getenv... $ECHO_C" >&6 - if test "${ac_cv_func_getenv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 20397 "configure" -+#line 20398 "configure" - #include "confdefs.h" - #define getenv autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -20425,16 +20426,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:20428: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20429: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20431: \$? = $ac_status" >&5 -+ echo "$as_me:20432: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:20434: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20435: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20437: \$? = $ac_status" >&5 -+ echo "$as_me:20438: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_getenv=yes - else -@@ -20444,19 +20445,19 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:20447: result: $ac_cv_func_getenv" >&5 -+echo "$as_me:20448: result: $ac_cv_func_getenv" >&5 - echo "${ECHO_T}$ac_cv_func_getenv" >&6 - - for ac_func in putenv setenv strdup - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:20453: checking for $ac_func" >&5 -+echo "$as_me:20454: 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 20459 "configure" -+#line 20460 "configure" - #include "confdefs.h" - #define $ac_func autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -20487,16 +20488,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:20490: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20491: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20493: \$? = $ac_status" >&5 -+ echo "$as_me:20494: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:20496: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20497: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20499: \$? = $ac_status" >&5 -+ echo "$as_me:20500: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" - else -@@ -20506,7 +20507,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:20509: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -+echo "$as_me:20510: 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 -@@ -20516,7 +20517,7 @@ - fi - done - --echo "$as_me:20519: checking if getenv returns consistent values" >&5 -+echo "$as_me:20520: checking if getenv returns consistent values" >&5 - echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 - if test "${cf_cv_consistent_getenv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20526,7 +20527,7 @@ - cf_cv_consistent_getenv=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 20529 "configure" -+#line 20530 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -20635,15 +20636,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:20638: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:20639: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:20641: \$? = $ac_status" >&5 -+ echo "$as_me:20642: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:20643: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20644: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20646: \$? = $ac_status" >&5 -+ echo "$as_me:20647: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_consistent_getenv=yes - else -@@ -20656,7 +20657,7 @@ - fi - - fi --echo "$as_me:20659: result: $cf_cv_consistent_getenv" >&5 -+echo "$as_me:20660: result: $cf_cv_consistent_getenv" >&5 - echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 - - if test "x$cf_cv_consistent_getenv" = xno -@@ -20671,18 +20672,18 @@ - if test "x$cf_cv_consistent_getenv" = xno && \ - test "x$cf_with_trace" = xyes - then -- { echo "$as_me:20674: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 -+ { echo "$as_me:20675: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 - echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} - fi - --echo "$as_me:20678: checking if sys/time.h works with sys/select.h" >&5 -+echo "$as_me:20679: checking if sys/time.h works with sys/select.h" >&5 - echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 - if test "${cf_cv_sys_time_select+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 20685 "configure" -+#line 20686 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -20702,16 +20703,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:20705: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20706: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20708: \$? = $ac_status" >&5 -+ echo "$as_me:20709: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:20711: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20712: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20714: \$? = $ac_status" >&5 -+ echo "$as_me:20715: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_sys_time_select=yes - else -@@ -20723,7 +20724,7 @@ - - fi - --echo "$as_me:20726: result: $cf_cv_sys_time_select" >&5 -+echo "$as_me:20727: result: $cf_cv_sys_time_select" >&5 - echo "${ECHO_T}$cf_cv_sys_time_select" >&6 - test "$cf_cv_sys_time_select" = yes && - cat >>confdefs.h <<\EOF -@@ -20738,13 +20739,13 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return="return" - --echo "$as_me:20741: checking for an ANSI C-conforming const" >&5 -+echo "$as_me:20742: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 20747 "configure" -+#line 20748 "configure" - #include "confdefs.h" - - int -@@ -20802,16 +20803,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:20805: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20806: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20808: \$? = $ac_status" >&5 -+ echo "$as_me:20809: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:20811: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20812: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20814: \$? = $ac_status" >&5 -+ echo "$as_me:20815: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_c_const=yes - else -@@ -20821,7 +20822,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:20824: result: $ac_cv_c_const" >&5 -+echo "$as_me:20825: result: $ac_cv_c_const" >&5 - echo "${ECHO_T}$ac_cv_c_const" >&6 - if test $ac_cv_c_const = no; then - -@@ -20831,7 +20832,7 @@ - - fi - --echo "$as_me:20834: checking for inline" >&5 -+echo "$as_me:20835: checking for inline" >&5 - echo $ECHO_N "checking for inline... $ECHO_C" >&6 - if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20839,7 +20840,7 @@ - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 20842 "configure" -+#line 20843 "configure" - #include "confdefs.h" - #ifndef __cplusplus - static $ac_kw int static_foo () {return 0; } -@@ -20848,16 +20849,16 @@ - - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:20851: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20852: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20854: \$? = $ac_status" >&5 -+ echo "$as_me:20855: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:20857: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20858: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20860: \$? = $ac_status" >&5 -+ echo "$as_me:20861: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_c_inline=$ac_kw; break - else -@@ -20868,7 +20869,7 @@ - done - - fi --echo "$as_me:20871: result: $ac_cv_c_inline" >&5 -+echo "$as_me:20872: result: $ac_cv_c_inline" >&5 - echo "${ECHO_T}$ac_cv_c_inline" >&6 - case $ac_cv_c_inline in - inline | yes) ;; -@@ -20894,7 +20895,7 @@ - : - elif test "$GCC" = yes - then -- echo "$as_me:20897: checking if $CC supports options to tune inlining" >&5 -+ echo "$as_me:20898: checking if $CC supports options to tune inlining" >&5 - echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 - if test "${cf_cv_gcc_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -20903,7 +20904,7 @@ - cf_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --param max-inline-insns-single=1200" - cat >"conftest.$ac_ext" <<_ACEOF --#line 20906 "configure" -+#line 20907 "configure" - #include "confdefs.h" - inline int foo(void) { return 1; } - int -@@ -20915,16 +20916,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:20918: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:20921: \$? = $ac_status" >&5 -+ echo "$as_me:20922: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:20924: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:20925: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:20927: \$? = $ac_status" >&5 -+ echo "$as_me:20928: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_gcc_inline=yes - else -@@ -20936,7 +20937,7 @@ - CFLAGS=$cf_save_CFLAGS - - fi --echo "$as_me:20939: result: $cf_cv_gcc_inline" >&5 -+echo "$as_me:20940: result: $cf_cv_gcc_inline" >&5 - echo "${ECHO_T}$cf_cv_gcc_inline" >&6 - if test "$cf_cv_gcc_inline" = yes ; then - -@@ -21042,7 +21043,7 @@ - fi - fi - --echo "$as_me:21045: checking for signal global datatype" >&5 -+echo "$as_me:21046: checking for signal global datatype" >&5 - echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 - if test "${cf_cv_sig_atomic_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21054,7 +21055,7 @@ - "int" - do - cat >"conftest.$ac_ext" <<_ACEOF --#line 21057 "configure" -+#line 21058 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -21078,16 +21079,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:21081: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21082: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21084: \$? = $ac_status" >&5 -+ echo "$as_me:21085: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:21087: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21088: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21090: \$? = $ac_status" >&5 -+ echo "$as_me:21091: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_sig_atomic_t=$cf_type - else -@@ -21101,7 +21102,7 @@ - - fi - --echo "$as_me:21104: result: $cf_cv_sig_atomic_t" >&5 -+echo "$as_me:21105: result: $cf_cv_sig_atomic_t" >&5 - echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 - test "$cf_cv_sig_atomic_t" != no && - cat >>confdefs.h <<EOF -@@ -21110,7 +21111,7 @@ - - if test "$NCURSES_CHTYPE" = auto ; then - --echo "$as_me:21113: checking for type of chtype" >&5 -+echo "$as_me:21114: checking for type of chtype" >&5 - echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 - if test "${cf_cv_typeof_chtype+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21120,7 +21121,7 @@ - cf_cv_typeof_chtype=long - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 21123 "configure" -+#line 21124 "configure" - #include "confdefs.h" - - #define WANT_BITS 31 -@@ -21155,15 +21156,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:21158: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21159: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21161: \$? = $ac_status" >&5 -+ echo "$as_me:21162: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:21163: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21164: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21166: \$? = $ac_status" >&5 -+ echo "$as_me:21167: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_typeof_chtype=`cat cf_test.out` - else -@@ -21178,7 +21179,7 @@ - - fi - --echo "$as_me:21181: result: $cf_cv_typeof_chtype" >&5 -+echo "$as_me:21182: result: $cf_cv_typeof_chtype" >&5 - echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 - - cat >>confdefs.h <<EOF -@@ -21190,14 +21191,14 @@ - fi - test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" - --echo "$as_me:21193: checking if unsigned literals are legal" >&5 -+echo "$as_me:21194: checking if unsigned literals are legal" >&5 - echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 - if test "${cf_cv_unsigned_literals+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21200 "configure" -+#line 21201 "configure" - #include "confdefs.h" - - int -@@ -21209,16 +21210,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21213: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21215: \$? = $ac_status" >&5 -+ echo "$as_me:21216: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:21218: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21219: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21221: \$? = $ac_status" >&5 -+ echo "$as_me:21222: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_unsigned_literals=yes - else -@@ -21230,7 +21231,7 @@ - - fi - --echo "$as_me:21233: result: $cf_cv_unsigned_literals" >&5 -+echo "$as_me:21234: result: $cf_cv_unsigned_literals" >&5 - echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 - - cf_cv_1UL="1" -@@ -21246,14 +21247,14 @@ - - ### Checks for external-data - --echo "$as_me:21249: checking if external errno is declared" >&5 -+echo "$as_me:21250: checking if external errno is declared" >&5 - echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 - if test "${cf_cv_dcl_errno+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21256 "configure" -+#line 21257 "configure" - #include "confdefs.h" - - #ifdef HAVE_STDLIB_H -@@ -21271,16 +21272,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:21274: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21275: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21277: \$? = $ac_status" >&5 -+ echo "$as_me:21278: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:21280: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21281: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21283: \$? = $ac_status" >&5 -+ echo "$as_me:21284: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_dcl_errno=yes - else -@@ -21291,7 +21292,7 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - fi --echo "$as_me:21294: result: $cf_cv_dcl_errno" >&5 -+echo "$as_me:21295: result: $cf_cv_dcl_errno" >&5 - echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - - if test "$cf_cv_dcl_errno" = no ; then -@@ -21306,14 +21307,14 @@ - - # It's possible (for near-UNIX clones) that the data doesn't exist - --echo "$as_me:21309: checking if external errno exists" >&5 -+echo "$as_me:21310: checking if external errno exists" >&5 - echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 - if test "${cf_cv_have_errno+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21316 "configure" -+#line 21317 "configure" - #include "confdefs.h" - - #undef errno -@@ -21328,16 +21329,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:21331: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21332: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21334: \$? = $ac_status" >&5 -+ echo "$as_me:21335: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:21337: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21338: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21340: \$? = $ac_status" >&5 -+ echo "$as_me:21341: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have_errno=yes - else -@@ -21348,7 +21349,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - - fi --echo "$as_me:21351: result: $cf_cv_have_errno" >&5 -+echo "$as_me:21352: result: $cf_cv_have_errno" >&5 - echo "${ECHO_T}$cf_cv_have_errno" >&6 - - if test "$cf_cv_have_errno" = yes ; then -@@ -21361,7 +21362,7 @@ - - fi - --echo "$as_me:21364: checking if data-only library module links" >&5 -+echo "$as_me:21365: checking if data-only library module links" >&5 - echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 - if test "${cf_cv_link_dataonly+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21369,20 +21370,20 @@ - - rm -f conftest.a - cat >conftest.$ac_ext <<EOF --#line 21372 "configure" -+#line 21373 "configure" - int testdata[3] = { 123, 456, 789 }; - EOF -- if { (eval echo "$as_me:21375: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:21376: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21378: \$? = $ac_status" >&5 -+ echo "$as_me:21379: \$? = $ac_status" >&5 - (exit "$ac_status"); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null - fi - rm -f conftest.$ac_ext data.o - cat >conftest.$ac_ext <<EOF --#line 21385 "configure" -+#line 21386 "configure" - int testfunc(void) - { - #if defined(NeXT) -@@ -21395,10 +21396,10 @@ - #endif - } - EOF -- if { (eval echo "$as_me:21398: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:21399: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21401: \$? = $ac_status" >&5 -+ echo "$as_me:21402: \$? = $ac_status" >&5 - (exit "$ac_status"); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null -@@ -21411,7 +21412,7 @@ - cf_cv_link_dataonly=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 21414 "configure" -+#line 21415 "configure" - #include "confdefs.h" - - int main(void) -@@ -21422,15 +21423,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:21425: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21426: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21428: \$? = $ac_status" >&5 -+ echo "$as_me:21429: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:21430: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21431: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21433: \$? = $ac_status" >&5 -+ echo "$as_me:21434: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_link_dataonly=yes - else -@@ -21445,7 +21446,7 @@ - - fi - --echo "$as_me:21448: result: $cf_cv_link_dataonly" >&5 -+echo "$as_me:21449: result: $cf_cv_link_dataonly" >&5 - echo "${ECHO_T}$cf_cv_link_dataonly" >&6 - - if test "$cf_cv_link_dataonly" = no ; then -@@ -21488,13 +21489,13 @@ - - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:21491: checking for $ac_func" >&5 -+echo "$as_me:21492: 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 21497 "configure" -+#line 21498 "configure" - #include "confdefs.h" - #define $ac_func autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -21525,16 +21526,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:21528: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21529: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21531: \$? = $ac_status" >&5 -+ echo "$as_me:21532: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:21534: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21535: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21537: \$? = $ac_status" >&5 -+ echo "$as_me:21538: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" - else -@@ -21544,7 +21545,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:21547: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -+echo "$as_me:21548: 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 -@@ -21554,14 +21555,14 @@ - fi - done - --echo "$as_me:21557: checking if _PATH_TTYS is defined in ttyent.h" >&5 -+echo "$as_me:21558: checking if _PATH_TTYS is defined in ttyent.h" >&5 - echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6 - if test "${cf_cv_PATH_TTYS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21564 "configure" -+#line 21565 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -21576,16 +21577,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:21579: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21580: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21582: \$? = $ac_status" >&5 -+ echo "$as_me:21583: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:21585: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21586: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21588: \$? = $ac_status" >&5 -+ echo "$as_me:21589: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_PATH_TTYS=yes - else -@@ -21595,7 +21596,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:21598: result: $cf_cv_PATH_TTYS" >&5 -+echo "$as_me:21599: result: $cf_cv_PATH_TTYS" >&5 - echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6 - - if test $cf_cv_PATH_TTYS = no -@@ -21617,7 +21618,7 @@ - - if test $cf_cv_PATH_TTYS != no - then -- echo "$as_me:21620: checking if _PATH_TTYS file exists" >&5 -+ echo "$as_me:21621: checking if _PATH_TTYS file exists" >&5 - echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6 - if test "${cf_cv_have_PATH_TTYS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21627,7 +21628,7 @@ - cf_cv_have_PATH_TTYS=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 21630 "configure" -+#line 21631 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -21638,15 +21639,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:21641: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21642: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21644: \$? = $ac_status" >&5 -+ echo "$as_me:21645: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:21646: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21647: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21649: \$? = $ac_status" >&5 -+ echo "$as_me:21650: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have_PATH_TTYS=yes - else -@@ -21658,7 +21659,7 @@ - rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" - fi - fi --echo "$as_me:21661: result: $cf_cv_have_PATH_TTYS" >&5 -+echo "$as_me:21662: result: $cf_cv_have_PATH_TTYS" >&5 - echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6 - test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no - fi -@@ -21670,14 +21671,14 @@ - #define HAVE_PATH_TTYS 1 - EOF - -- echo "$as_me:21673: checking for getttynam" >&5 -+ echo "$as_me:21674: checking for getttynam" >&5 - echo $ECHO_N "checking for getttynam... $ECHO_C" >&6 - if test "${cf_cv_func_getttynam+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21680 "configure" -+#line 21681 "configure" - #include "confdefs.h" - #include <ttyent.h> - int -@@ -21689,16 +21690,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:21692: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21693: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21695: \$? = $ac_status" >&5 -+ echo "$as_me:21696: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:21698: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21699: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21701: \$? = $ac_status" >&5 -+ echo "$as_me:21702: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_func_getttynam=yes - else -@@ -21708,7 +21709,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:21711: result: $cf_cv_func_getttynam" >&5 -+echo "$as_me:21712: result: $cf_cv_func_getttynam" >&5 - echo "${ECHO_T}$cf_cv_func_getttynam" >&6 - test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF - #define HAVE_GETTTYNAM 1 -@@ -21718,7 +21719,7 @@ - - if test "x$ac_cv_func_getopt" = xno && \ - test "x$cf_with_progs$cf_with_tests" != xnono; then -- { { echo "$as_me:21721: error: getopt is required for building programs" >&5 -+ { { echo "$as_me:21722: error: getopt is required for building programs" >&5 - echo "$as_me: error: getopt is required for building programs" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -21727,7 +21728,7 @@ - then - if test "x$ac_cv_func_vsnprintf" = xyes - then -- { echo "$as_me:21730: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 -+ { echo "$as_me:21731: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 - echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} - else - -@@ -21740,14 +21741,14 @@ - - if test "x$with_getcap" = "xyes" ; then - --echo "$as_me:21743: checking for terminal-capability database functions" >&5 -+echo "$as_me:21744: checking for terminal-capability database functions" >&5 - echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 - if test "${cf_cv_cgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21750 "configure" -+#line 21751 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -21767,16 +21768,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:21770: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21771: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21773: \$? = $ac_status" >&5 -+ echo "$as_me:21774: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:21776: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21777: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21779: \$? = $ac_status" >&5 -+ echo "$as_me:21780: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_cgetent=yes - else -@@ -21787,7 +21788,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - - fi --echo "$as_me:21790: result: $cf_cv_cgetent" >&5 -+echo "$as_me:21791: result: $cf_cv_cgetent" >&5 - echo "${ECHO_T}$cf_cv_cgetent" >&6 - - if test "$cf_cv_cgetent" = yes -@@ -21797,14 +21798,14 @@ - #define HAVE_BSD_CGETENT 1 - EOF - --echo "$as_me:21800: checking if cgetent uses const parameter" >&5 -+echo "$as_me:21801: checking if cgetent uses const parameter" >&5 - echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 - if test "${cf_cv_cgetent_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21807 "configure" -+#line 21808 "configure" - #include "confdefs.h" - - #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" -@@ -21827,16 +21828,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:21830: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21831: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21833: \$? = $ac_status" >&5 -+ echo "$as_me:21834: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:21836: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21837: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21839: \$? = $ac_status" >&5 -+ echo "$as_me:21840: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_cgetent_const=yes - else -@@ -21847,7 +21848,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - - fi --echo "$as_me:21850: result: $cf_cv_cgetent_const" >&5 -+echo "$as_me:21851: result: $cf_cv_cgetent_const" >&5 - echo "${ECHO_T}$cf_cv_cgetent_const" >&6 - if test "$cf_cv_cgetent_const" = yes - then -@@ -21861,14 +21862,14 @@ - - fi - --echo "$as_me:21864: checking for isascii" >&5 -+echo "$as_me:21865: checking for isascii" >&5 - echo $ECHO_N "checking for isascii... $ECHO_C" >&6 - if test "${cf_cv_have_isascii+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21871 "configure" -+#line 21872 "configure" - #include "confdefs.h" - #include <ctype.h> - int -@@ -21880,16 +21881,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:21883: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:21884: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:21886: \$? = $ac_status" >&5 -+ echo "$as_me:21887: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:21889: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21890: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21892: \$? = $ac_status" >&5 -+ echo "$as_me:21893: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have_isascii=yes - else -@@ -21900,7 +21901,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - - fi --echo "$as_me:21903: result: $cf_cv_have_isascii" >&5 -+echo "$as_me:21904: result: $cf_cv_have_isascii" >&5 - echo "${ECHO_T}$cf_cv_have_isascii" >&6 - test "$cf_cv_have_isascii" = yes && - cat >>confdefs.h <<\EOF -@@ -21908,10 +21909,10 @@ - EOF - - if test "$ac_cv_func_sigaction" = yes; then --echo "$as_me:21911: checking whether sigaction needs _POSIX_SOURCE" >&5 -+echo "$as_me:21912: checking whether sigaction needs _POSIX_SOURCE" >&5 - echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >"conftest.$ac_ext" <<_ACEOF --#line 21914 "configure" -+#line 21915 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -21925,16 +21926,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:21928: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21929: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21931: \$? = $ac_status" >&5 -+ echo "$as_me:21932: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:21934: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21935: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21937: \$? = $ac_status" >&5 -+ echo "$as_me:21938: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - sigact_bad=no - else -@@ -21942,7 +21943,7 @@ - cat "conftest.$ac_ext" >&5 - - cat >"conftest.$ac_ext" <<_ACEOF --#line 21945 "configure" -+#line 21946 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -21957,16 +21958,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:21960: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:21961: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:21963: \$? = $ac_status" >&5 -+ echo "$as_me:21964: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:21966: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:21967: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:21969: \$? = $ac_status" >&5 -+ echo "$as_me:21970: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - sigact_bad=yes - -@@ -21982,11 +21983,11 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" --echo "$as_me:21985: result: $sigact_bad" >&5 -+echo "$as_me:21986: result: $sigact_bad" >&5 - echo "${ECHO_T}$sigact_bad" >&6 - fi - --echo "$as_me:21989: checking if nanosleep really works" >&5 -+echo "$as_me:21990: checking if nanosleep really works" >&5 - echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 - if test "${cf_cv_func_nanosleep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -21996,7 +21997,7 @@ - cf_cv_func_nanosleep=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 21999 "configure" -+#line 22000 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -22021,15 +22022,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:22024: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22025: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22027: \$? = $ac_status" >&5 -+ echo "$as_me:22028: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:22029: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22030: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22032: \$? = $ac_status" >&5 -+ echo "$as_me:22033: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_func_nanosleep=yes - else -@@ -22041,7 +22042,7 @@ - rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" - fi - fi --echo "$as_me:22044: result: $cf_cv_func_nanosleep" >&5 -+echo "$as_me:22045: result: $cf_cv_func_nanosleep" >&5 - echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 - - test "$cf_cv_func_nanosleep" = "yes" && -@@ -22058,23 +22059,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:22061: checking for $ac_header" >&5 -+echo "$as_me:22062: 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 22067 "configure" -+#line 22068 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:22071: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:22072: \"$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:22077: \$? = $ac_status" >&5 -+ echo "$as_me:22078: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -22093,7 +22094,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:22096: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:22097: 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 -@@ -22110,10 +22111,10 @@ - (*) termios_bad=maybe ;; - esac - if test "$termios_bad" = maybe ; then -- echo "$as_me:22113: checking whether termios.h needs _POSIX_SOURCE" >&5 -+ echo "$as_me:22114: checking whether termios.h needs _POSIX_SOURCE" >&5 - echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >"conftest.$ac_ext" <<_ACEOF --#line 22116 "configure" -+#line 22117 "configure" - #include "confdefs.h" - #include <termios.h> - int -@@ -22125,16 +22126,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:22128: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:22129: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:22131: \$? = $ac_status" >&5 -+ echo "$as_me:22132: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:22134: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22135: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22137: \$? = $ac_status" >&5 -+ echo "$as_me:22138: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - termios_bad=no - else -@@ -22142,7 +22143,7 @@ - cat "conftest.$ac_ext" >&5 - - cat >"conftest.$ac_ext" <<_ACEOF --#line 22145 "configure" -+#line 22146 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -22156,16 +22157,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:22159: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:22160: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:22162: \$? = $ac_status" >&5 -+ echo "$as_me:22163: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:22165: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22166: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22168: \$? = $ac_status" >&5 -+ echo "$as_me:22169: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - termios_bad=unknown - else -@@ -22181,19 +22182,19 @@ - - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" -- echo "$as_me:22184: result: $termios_bad" >&5 -+ echo "$as_me:22185: result: $termios_bad" >&5 - echo "${ECHO_T}$termios_bad" >&6 - fi - fi - --echo "$as_me:22189: checking for tcgetattr" >&5 -+echo "$as_me:22190: checking for tcgetattr" >&5 - echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 - if test "${cf_cv_have_tcgetattr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 22196 "configure" -+#line 22197 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -22221,16 +22222,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:22224: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22225: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22227: \$? = $ac_status" >&5 -+ echo "$as_me:22228: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:22230: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22231: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22233: \$? = $ac_status" >&5 -+ echo "$as_me:22234: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have_tcgetattr=yes - else -@@ -22240,21 +22241,21 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:22243: result: $cf_cv_have_tcgetattr" >&5 -+echo "$as_me:22244: result: $cf_cv_have_tcgetattr" >&5 - echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 - test "$cf_cv_have_tcgetattr" = yes && - cat >>confdefs.h <<\EOF - #define HAVE_TCGETATTR 1 - EOF - --echo "$as_me:22250: checking for vsscanf function or workaround" >&5 -+echo "$as_me:22251: checking for vsscanf function or workaround" >&5 - echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 - if test "${cf_cv_func_vsscanf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 22257 "configure" -+#line 22258 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -22270,16 +22271,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:22273: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22274: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22276: \$? = $ac_status" >&5 -+ echo "$as_me:22277: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:22279: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22280: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22282: \$? = $ac_status" >&5 -+ echo "$as_me:22283: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_func_vsscanf=vsscanf - else -@@ -22287,7 +22288,7 @@ - cat "conftest.$ac_ext" >&5 - - cat >"conftest.$ac_ext" <<_ACEOF --#line 22290 "configure" -+#line 22291 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -22309,16 +22310,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:22312: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22313: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22315: \$? = $ac_status" >&5 -+ echo "$as_me:22316: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:22318: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22319: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22321: \$? = $ac_status" >&5 -+ echo "$as_me:22322: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_func_vsscanf=vfscanf - else -@@ -22326,7 +22327,7 @@ - cat "conftest.$ac_ext" >&5 - - cat >"conftest.$ac_ext" <<_ACEOF --#line 22329 "configure" -+#line 22330 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -22348,16 +22349,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:22351: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22352: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22354: \$? = $ac_status" >&5 -+ echo "$as_me:22355: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:22357: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22358: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22360: \$? = $ac_status" >&5 -+ echo "$as_me:22361: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_func_vsscanf=_doscan - else -@@ -22372,7 +22373,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:22375: result: $cf_cv_func_vsscanf" >&5 -+echo "$as_me:22376: result: $cf_cv_func_vsscanf" >&5 - echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 - - case "$cf_cv_func_vsscanf" in -@@ -22398,23 +22399,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:22401: checking for $ac_header" >&5 -+echo "$as_me:22402: 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 22407 "configure" -+#line 22408 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:22411: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:22412: \"$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:22417: \$? = $ac_status" >&5 -+ echo "$as_me:22418: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -22433,7 +22434,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:22436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:22437: 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 -@@ -22443,7 +22444,7 @@ - fi - done - --echo "$as_me:22446: checking for working mkstemp" >&5 -+echo "$as_me:22447: checking for working mkstemp" >&5 - echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 - if test "${cf_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -22454,7 +22455,7 @@ - cf_cv_func_mkstemp=maybe - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 22457 "configure" -+#line 22458 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -22495,15 +22496,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:22498: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22499: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22501: \$? = $ac_status" >&5 -+ echo "$as_me:22502: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:22503: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22504: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22506: \$? = $ac_status" >&5 -+ echo "$as_me:22507: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_func_mkstemp=yes - -@@ -22518,16 +22519,16 @@ - fi - - fi --echo "$as_me:22521: result: $cf_cv_func_mkstemp" >&5 -+echo "$as_me:22522: result: $cf_cv_func_mkstemp" >&5 - echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 - if test "x$cf_cv_func_mkstemp" = xmaybe ; then -- echo "$as_me:22524: checking for mkstemp" >&5 -+ echo "$as_me:22525: checking for mkstemp" >&5 - echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 - if test "${ac_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 22530 "configure" -+#line 22531 "configure" - #include "confdefs.h" - #define mkstemp autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -22558,16 +22559,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:22561: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22562: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22564: \$? = $ac_status" >&5 -+ echo "$as_me:22565: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:22567: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22568: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22570: \$? = $ac_status" >&5 -+ echo "$as_me:22571: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_mkstemp=yes - else -@@ -22577,7 +22578,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:22580: result: $ac_cv_func_mkstemp" >&5 -+echo "$as_me:22581: result: $ac_cv_func_mkstemp" >&5 - echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - - fi -@@ -22598,21 +22599,21 @@ - fi - - if test "x$cross_compiling" = xyes ; then -- { echo "$as_me:22601: WARNING: cross compiling: assume setvbuf params not reversed" >&5 -+ { echo "$as_me:22602: WARNING: cross compiling: assume setvbuf params not reversed" >&5 - echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} - else -- echo "$as_me:22604: checking whether setvbuf arguments are reversed" >&5 -+ echo "$as_me:22605: checking whether setvbuf arguments are reversed" >&5 - echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 - if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:22610: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:22611: 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 22615 "configure" -+#line 22616 "configure" - #include "confdefs.h" - #include <stdio.h> - /* If setvbuf has the reversed format, exit 0. */ -@@ -22629,15 +22630,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:22632: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22633: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22635: \$? = $ac_status" >&5 -+ echo "$as_me:22636: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:22637: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22638: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22640: \$? = $ac_status" >&5 -+ echo "$as_me:22641: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_setvbuf_reversed=yes - else -@@ -22650,7 +22651,7 @@ - fi - rm -f core ./core.* ./*.core - fi --echo "$as_me:22653: result: $ac_cv_func_setvbuf_reversed" >&5 -+echo "$as_me:22654: result: $ac_cv_func_setvbuf_reversed" >&5 - echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 - if test $ac_cv_func_setvbuf_reversed = yes; then - -@@ -22661,13 +22662,13 @@ - fi - - fi --echo "$as_me:22664: checking for intptr_t" >&5 -+echo "$as_me:22665: checking for intptr_t" >&5 - echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 - if test "${ac_cv_type_intptr_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 22670 "configure" -+#line 22671 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -22682,16 +22683,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:22688: \$? = $ac_status" >&5 -+ echo "$as_me:22689: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:22691: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22692: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22694: \$? = $ac_status" >&5 -+ echo "$as_me:22695: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_intptr_t=yes - else -@@ -22701,7 +22702,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:22704: result: $ac_cv_type_intptr_t" >&5 -+echo "$as_me:22705: result: $ac_cv_type_intptr_t" >&5 - echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 - if test "$ac_cv_type_intptr_t" = yes; then - : -@@ -22713,13 +22714,13 @@ - - fi - --echo "$as_me:22716: checking for ssize_t" >&5 -+echo "$as_me:22717: checking for ssize_t" >&5 - echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 - if test "${ac_cv_type_ssize_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 22722 "configure" -+#line 22723 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -22734,16 +22735,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:22737: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:22740: \$? = $ac_status" >&5 -+ echo "$as_me:22741: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:22743: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22744: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22746: \$? = $ac_status" >&5 -+ echo "$as_me:22747: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_ssize_t=yes - else -@@ -22753,7 +22754,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:22756: result: $ac_cv_type_ssize_t" >&5 -+echo "$as_me:22757: result: $ac_cv_type_ssize_t" >&5 - echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 - if test "$ac_cv_type_ssize_t" = yes; then - : -@@ -22765,14 +22766,14 @@ - - fi - --echo "$as_me:22768: checking for type sigaction_t" >&5 -+echo "$as_me:22769: checking for type sigaction_t" >&5 - echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 - if test "${cf_cv_type_sigaction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 22775 "configure" -+#line 22776 "configure" - #include "confdefs.h" - - #include <signal.h> -@@ -22785,16 +22786,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:22788: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:22789: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:22791: \$? = $ac_status" >&5 -+ echo "$as_me:22792: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:22794: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22795: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22797: \$? = $ac_status" >&5 -+ echo "$as_me:22798: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_type_sigaction=yes - else -@@ -22805,14 +22806,14 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi - --echo "$as_me:22808: result: $cf_cv_type_sigaction" >&5 -+echo "$as_me:22809: result: $cf_cv_type_sigaction" >&5 - echo "${ECHO_T}$cf_cv_type_sigaction" >&6 - test "$cf_cv_type_sigaction" = yes && - cat >>confdefs.h <<\EOF - #define HAVE_TYPE_SIGACTION 1 - EOF - --echo "$as_me:22815: checking declaration of size-change" >&5 -+echo "$as_me:22816: checking declaration of size-change" >&5 - echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 - if test "${cf_cv_sizechange+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -22833,7 +22834,7 @@ - - fi - cat >"conftest.$ac_ext" <<_ACEOF --#line 22836 "configure" -+#line 22837 "configure" - #include "confdefs.h" - #include <sys/types.h> - #ifdef HAVE_TERMIOS_H -@@ -22883,16 +22884,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:22886: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:22889: \$? = $ac_status" >&5 -+ echo "$as_me:22890: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:22892: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22893: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22895: \$? = $ac_status" >&5 -+ echo "$as_me:22896: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_sizechange=yes - else -@@ -22911,7 +22912,7 @@ - done - - fi --echo "$as_me:22914: result: $cf_cv_sizechange" >&5 -+echo "$as_me:22915: result: $cf_cv_sizechange" >&5 - echo "${ECHO_T}$cf_cv_sizechange" >&6 - if test "$cf_cv_sizechange" != no ; then - -@@ -22929,13 +22930,13 @@ - esac - fi - --echo "$as_me:22932: checking for memmove" >&5 -+echo "$as_me:22933: checking for memmove" >&5 - echo $ECHO_N "checking for memmove... $ECHO_C" >&6 - if test "${ac_cv_func_memmove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 22938 "configure" -+#line 22939 "configure" - #include "confdefs.h" - #define memmove autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -22966,16 +22967,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:22969: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:22970: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:22972: \$? = $ac_status" >&5 -+ echo "$as_me:22973: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:22975: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:22976: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:22978: \$? = $ac_status" >&5 -+ echo "$as_me:22979: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_memmove=yes - else -@@ -22985,19 +22986,19 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:22988: result: $ac_cv_func_memmove" >&5 -+echo "$as_me:22989: result: $ac_cv_func_memmove" >&5 - echo "${ECHO_T}$ac_cv_func_memmove" >&6 - if test "$ac_cv_func_memmove" = yes; then - : - else - --echo "$as_me:22994: checking for bcopy" >&5 -+echo "$as_me:22995: checking for bcopy" >&5 - echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 - if test "${ac_cv_func_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 23000 "configure" -+#line 23001 "configure" - #include "confdefs.h" - #define bcopy autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -23028,16 +23029,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23031: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23032: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23034: \$? = $ac_status" >&5 -+ echo "$as_me:23035: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23037: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23038: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23040: \$? = $ac_status" >&5 -+ echo "$as_me:23041: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_bcopy=yes - else -@@ -23047,11 +23048,11 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23050: result: $ac_cv_func_bcopy" >&5 -+echo "$as_me:23051: result: $ac_cv_func_bcopy" >&5 - echo "${ECHO_T}$ac_cv_func_bcopy" >&6 - if test "$ac_cv_func_bcopy" = yes; then - -- echo "$as_me:23054: checking if bcopy does overlapping moves" >&5 -+ echo "$as_me:23055: checking if bcopy does overlapping moves" >&5 - echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 - if test "${cf_cv_good_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -23061,7 +23062,7 @@ - cf_cv_good_bcopy=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 23064 "configure" -+#line 23065 "configure" - #include "confdefs.h" - - int main(void) { -@@ -23075,15 +23076,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:23078: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23079: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23081: \$? = $ac_status" >&5 -+ echo "$as_me:23082: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:23083: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23084: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23086: \$? = $ac_status" >&5 -+ echo "$as_me:23087: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_good_bcopy=yes - else -@@ -23096,7 +23097,7 @@ - fi - - fi --echo "$as_me:23099: result: $cf_cv_good_bcopy" >&5 -+echo "$as_me:23100: result: $cf_cv_good_bcopy" >&5 - echo "${ECHO_T}$cf_cv_good_bcopy" >&6 - - else -@@ -23123,13 +23124,13 @@ - for ac_func in posix_openpt - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:23126: checking for $ac_func" >&5 -+echo "$as_me:23127: 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 23132 "configure" -+#line 23133 "configure" - #include "confdefs.h" - #define $ac_func autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -23160,16 +23161,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23163: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23164: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23166: \$? = $ac_status" >&5 -+ echo "$as_me:23167: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23169: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23170: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23172: \$? = $ac_status" >&5 -+ echo "$as_me:23173: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" - else -@@ -23179,7 +23180,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23182: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -+echo "$as_me:23183: 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 -@@ -23189,7 +23190,7 @@ - fi - done - } --echo "$as_me:23192: checking if poll really works" >&5 -+echo "$as_me:23193: 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 -@@ -23199,7 +23200,7 @@ - cf_cv_working_poll=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 23202 "configure" -+#line 23203 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -23251,15 +23252,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:23254: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23255: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23257: \$? = $ac_status" >&5 -+ echo "$as_me:23258: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:23259: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23260: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23262: \$? = $ac_status" >&5 -+ echo "$as_me:23263: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_working_poll=yes - else -@@ -23271,21 +23272,21 @@ - rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" - fi - fi --echo "$as_me:23274: result: $cf_cv_working_poll" >&5 -+echo "$as_me:23275: 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:23281: checking for va_copy" >&5 -+echo "$as_me:23282: 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 23288 "configure" -+#line 23289 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -23302,16 +23303,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23305: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23306: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23308: \$? = $ac_status" >&5 -+ echo "$as_me:23309: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23311: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23312: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23314: \$? = $ac_status" >&5 -+ echo "$as_me:23315: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have_va_copy=yes - else -@@ -23321,7 +23322,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23324: result: $cf_cv_have_va_copy" >&5 -+echo "$as_me:23325: result: $cf_cv_have_va_copy" >&5 - echo "${ECHO_T}$cf_cv_have_va_copy" >&6 - - if test "$cf_cv_have_va_copy" = yes; -@@ -23333,14 +23334,14 @@ - - else # !cf_cv_have_va_copy - --echo "$as_me:23336: checking for __va_copy" >&5 -+echo "$as_me:23337: 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 23343 "configure" -+#line 23344 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -23357,16 +23358,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23360: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23361: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23363: \$? = $ac_status" >&5 -+ echo "$as_me:23364: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23366: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23367: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23369: \$? = $ac_status" >&5 -+ echo "$as_me:23370: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have___va_copy=yes - else -@@ -23376,7 +23377,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23379: result: $cf_cv_have___va_copy" >&5 -+echo "$as_me:23380: result: $cf_cv_have___va_copy" >&5 - echo "${ECHO_T}$cf_cv_have___va_copy" >&6 - - if test "$cf_cv_have___va_copy" = yes -@@ -23388,14 +23389,14 @@ - - else # !cf_cv_have___va_copy - --echo "$as_me:23391: checking for __builtin_va_copy" >&5 -+echo "$as_me:23392: checking for __builtin_va_copy" >&5 - echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 - if test "${cf_cv_have___builtin_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 23398 "configure" -+#line 23399 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -23412,16 +23413,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23415: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23416: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23418: \$? = $ac_status" >&5 -+ echo "$as_me:23419: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23421: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23422: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23424: \$? = $ac_status" >&5 -+ echo "$as_me:23425: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_have___builtin_va_copy=yes - else -@@ -23431,7 +23432,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23434: result: $cf_cv_have___builtin_va_copy" >&5 -+echo "$as_me:23435: result: $cf_cv_have___builtin_va_copy" >&5 - echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 - - test "$cf_cv_have___builtin_va_copy" = yes && -@@ -23449,14 +23450,14 @@ - ;; - - (*) -- echo "$as_me:23452: checking if we can simply copy va_list" >&5 -+ echo "$as_me:23453: checking if we can simply copy va_list" >&5 - echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 - if test "${cf_cv_pointer_va_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 23459 "configure" -+#line 23460 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -23473,16 +23474,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23476: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23477: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23479: \$? = $ac_status" >&5 -+ echo "$as_me:23480: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23482: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23483: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23485: \$? = $ac_status" >&5 -+ echo "$as_me:23486: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_pointer_va_list=yes - else -@@ -23492,19 +23493,19 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23495: result: $cf_cv_pointer_va_list" >&5 -+echo "$as_me:23496: result: $cf_cv_pointer_va_list" >&5 - echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 - - if test "$cf_cv_pointer_va_list" = no - then -- echo "$as_me:23500: checking if we can copy va_list indirectly" >&5 -+ echo "$as_me:23501: checking if we can copy va_list indirectly" >&5 - echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 - if test "${cf_cv_array_va_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 23507 "configure" -+#line 23508 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -23521,16 +23522,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23524: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23525: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23527: \$? = $ac_status" >&5 -+ echo "$as_me:23528: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23530: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23531: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23533: \$? = $ac_status" >&5 -+ echo "$as_me:23534: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_array_va_list=yes - else -@@ -23540,7 +23541,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23543: result: $cf_cv_array_va_list" >&5 -+echo "$as_me:23544: result: $cf_cv_array_va_list" >&5 - echo "${ECHO_T}$cf_cv_array_va_list" >&6 - test "$cf_cv_array_va_list" = yes && - cat >>confdefs.h <<\EOF -@@ -23551,13 +23552,13 @@ - ;; - esac - --echo "$as_me:23554: checking for pid_t" >&5 -+echo "$as_me:23555: 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 23560 "configure" -+#line 23561 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -23572,16 +23573,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:23575: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:23576: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:23578: \$? = $ac_status" >&5 -+ echo "$as_me:23579: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:23581: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23582: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23584: \$? = $ac_status" >&5 -+ echo "$as_me:23585: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_pid_t=yes - else -@@ -23591,7 +23592,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:23594: result: $ac_cv_type_pid_t" >&5 -+echo "$as_me:23595: 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 - : -@@ -23606,23 +23607,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:23609: checking for $ac_header" >&5 -+echo "$as_me:23610: 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 23615 "configure" -+#line 23616 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:23619: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:23620: \"$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:23625: \$? = $ac_status" >&5 -+ echo "$as_me:23626: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -23641,7 +23642,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:23644: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:23645: 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 -@@ -23654,13 +23655,13 @@ - for ac_func in fork vfork - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:23657: checking for $ac_func" >&5 -+echo "$as_me:23658: 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 23663 "configure" -+#line 23664 "configure" - #include "confdefs.h" - #define $ac_func autoconf_temporary - #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ -@@ -23691,16 +23692,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:23694: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23695: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23697: \$? = $ac_status" >&5 -+ echo "$as_me:23698: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:23700: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23701: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23703: \$? = $ac_status" >&5 -+ echo "$as_me:23704: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" - else -@@ -23710,7 +23711,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi --echo "$as_me:23713: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -+echo "$as_me:23714: 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 -@@ -23722,7 +23723,7 @@ - - ac_cv_func_fork_works=$ac_cv_func_fork - if test "x$ac_cv_func_fork" = xyes; then -- echo "$as_me:23725: checking for working fork" >&5 -+ echo "$as_me:23726: 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 -@@ -23745,15 +23746,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:23748: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23749: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23751: \$? = $ac_status" >&5 -+ echo "$as_me:23752: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:23753: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23754: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23756: \$? = $ac_status" >&5 -+ echo "$as_me:23757: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_fork_works=yes - else -@@ -23765,7 +23766,7 @@ - rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" - fi - fi --echo "$as_me:23768: result: $ac_cv_func_fork_works" >&5 -+echo "$as_me:23769: result: $ac_cv_func_fork_works" >&5 - echo "${ECHO_T}$ac_cv_func_fork_works" >&6 - - fi -@@ -23779,12 +23780,12 @@ - ac_cv_func_fork_works=yes - ;; - esac -- { echo "$as_me:23782: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:23783: 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:23787: checking for working vfork" >&5 -+ echo "$as_me:23788: 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 -@@ -23793,7 +23794,7 @@ - ac_cv_func_vfork_works=cross - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 23796 "configure" -+#line 23797 "configure" - #include "confdefs.h" - /* Thanks to Paul Eggert for this test. */ - #include <stdio.h> -@@ -23890,15 +23891,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:23893: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23894: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23896: \$? = $ac_status" >&5 -+ echo "$as_me:23897: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:23898: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23899: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23901: \$? = $ac_status" >&5 -+ echo "$as_me:23902: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_vfork_works=yes - else -@@ -23910,13 +23911,13 @@ - rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" - fi - fi --echo "$as_me:23913: result: $ac_cv_func_vfork_works" >&5 -+echo "$as_me:23914: 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:23919: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:23920: 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 - -@@ -23941,7 +23942,7 @@ - - fi - --echo "$as_me:23944: checking if fopen accepts explicit binary mode" >&5 -+echo "$as_me:23945: checking if fopen accepts explicit binary mode" >&5 - echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 - if test "${cf_cv_fopen_bin_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -23951,7 +23952,7 @@ - cf_cv_fopen_bin_r=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 23954 "configure" -+#line 23955 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -23984,15 +23985,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:23987: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:23988: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:23990: \$? = $ac_status" >&5 -+ echo "$as_me:23991: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:23992: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:23993: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23995: \$? = $ac_status" >&5 -+ echo "$as_me:23996: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_fopen_bin_r=yes - else -@@ -24005,7 +24006,7 @@ - fi - - fi --echo "$as_me:24008: result: $cf_cv_fopen_bin_r" >&5 -+echo "$as_me:24009: result: $cf_cv_fopen_bin_r" >&5 - echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 - test "x$cf_cv_fopen_bin_r" != xno && - cat >>confdefs.h <<\EOF -@@ -24014,7 +24015,7 @@ - - # special check for test/ditto.c - --echo "$as_me:24017: checking for openpty in -lutil" >&5 -+echo "$as_me:24018: 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 -@@ -24022,7 +24023,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lutil $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 24025 "configure" -+#line 24026 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -24041,16 +24042,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:24044: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:24045: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:24047: \$? = $ac_status" >&5 -+ echo "$as_me:24048: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:24050: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24051: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24053: \$? = $ac_status" >&5 -+ echo "$as_me:24054: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_util_openpty=yes - else -@@ -24061,7 +24062,7 @@ - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:24064: result: $ac_cv_lib_util_openpty" >&5 -+echo "$as_me:24065: 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 -@@ -24069,7 +24070,7 @@ - cf_cv_lib_util=no - fi - --echo "$as_me:24072: checking for openpty header" >&5 -+echo "$as_me:24073: 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 -@@ -24096,7 +24097,7 @@ - for cf_header in pty.h libutil.h util.h - do - cat >"conftest.$ac_ext" <<_ACEOF --#line 24099 "configure" -+#line 24100 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -24113,16 +24114,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:24116: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:24117: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:24119: \$? = $ac_status" >&5 -+ echo "$as_me:24120: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:24122: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24123: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24125: \$? = $ac_status" >&5 -+ echo "$as_me:24126: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_func_openpty=$cf_header -@@ -24140,7 +24141,7 @@ - LIBS="$cf_save_LIBS" - - fi --echo "$as_me:24143: result: $cf_cv_func_openpty" >&5 -+echo "$as_me:24144: result: $cf_cv_func_openpty" >&5 - echo "${ECHO_T}$cf_cv_func_openpty" >&6 - - if test "$cf_cv_func_openpty" != no ; then -@@ -24213,7 +24214,7 @@ - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - - cat >"conftest.$ac_ext" <<_ACEOF --#line 24216 "configure" -+#line 24217 "configure" - #include "confdefs.h" - #include <stdio.h> - int -@@ -24225,16 +24226,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:24228: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:24229: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:24231: \$? = $ac_status" >&5 -+ echo "$as_me:24232: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:24234: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24235: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24237: \$? = $ac_status" >&5 -+ echo "$as_me:24238: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : - else -@@ -24251,7 +24252,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}:24254: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:24255: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -24287,7 +24288,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}:24290: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:24291: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -24298,7 +24299,7 @@ - else - case "$with_hashed_db" in - (./*|../*|/*) -- { echo "$as_me:24301: WARNING: no such directory $with_hashed_db" >&5 -+ { echo "$as_me:24302: WARNING: no such directory $with_hashed_db" >&5 - echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} - ;; - (*) -@@ -24370,7 +24371,7 @@ - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - - cat >"conftest.$ac_ext" <<_ACEOF --#line 24373 "configure" -+#line 24374 "configure" - #include "confdefs.h" - #include <stdio.h> - int -@@ -24382,16 +24383,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:24385: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:24386: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:24388: \$? = $ac_status" >&5 -+ echo "$as_me:24389: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:24391: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24392: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24394: \$? = $ac_status" >&5 -+ echo "$as_me:24395: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : - else -@@ -24408,7 +24409,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}:24411: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:24412: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -24488,7 +24489,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}:24491: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:24492: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -24505,23 +24506,23 @@ - fi - esac - --echo "$as_me:24508: checking for db.h" >&5 -+echo "$as_me:24509: 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 24514 "configure" -+#line 24515 "configure" - #include "confdefs.h" - #include <db.h> - _ACEOF --if { (eval echo "$as_me:24518: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:24519: \"$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:24524: \$? = $ac_status" >&5 -+ echo "$as_me:24525: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -24540,11 +24541,11 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:24543: result: $ac_cv_header_db_h" >&5 -+echo "$as_me:24544: 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:24547: checking for version of db" >&5 -+echo "$as_me:24548: 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 -@@ -24555,10 +24556,10 @@ - for cf_db_version in 1 2 3 4 5 6 - do - --echo "${as_me:-configure}:24558: testing checking for db version $cf_db_version ..." 1>&5 -+echo "${as_me:-configure}:24559: testing checking for db version $cf_db_version ..." 1>&5 - - cat >"conftest.$ac_ext" <<_ACEOF --#line 24561 "configure" -+#line 24562 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -24588,16 +24589,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:24591: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:24592: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:24594: \$? = $ac_status" >&5 -+ echo "$as_me:24595: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:24597: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24598: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24600: \$? = $ac_status" >&5 -+ echo "$as_me:24601: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_hashed_db_version=$cf_db_version -@@ -24611,16 +24612,16 @@ - done - - fi --echo "$as_me:24614: result: $cf_cv_hashed_db_version" >&5 -+echo "$as_me:24615: 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:24618: error: Cannot determine version of db" >&5 -+ { { echo "$as_me:24619: 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:24623: checking for db libraries" >&5 -+echo "$as_me:24624: 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 -@@ -24650,10 +24651,10 @@ - - fi - --echo "${as_me:-configure}:24653: testing checking for library $cf_db_libs ..." 1>&5 -+echo "${as_me:-configure}:24654: testing checking for library $cf_db_libs ..." 1>&5 - - cat >"conftest.$ac_ext" <<_ACEOF --#line 24656 "configure" -+#line 24657 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -24708,16 +24709,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:24711: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:24712: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:24714: \$? = $ac_status" >&5 -+ echo "$as_me:24715: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:24717: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24718: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24720: \$? = $ac_status" >&5 -+ echo "$as_me:24721: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - if test -n "$cf_db_libs" ; then -@@ -24737,11 +24738,11 @@ - done - - fi --echo "$as_me:24740: result: $cf_cv_hashed_db_libs" >&5 -+echo "$as_me:24741: 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:24744: error: Cannot determine library for db" >&5 -+ { { echo "$as_me:24745: 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 -@@ -24767,7 +24768,7 @@ - - else - -- { { echo "$as_me:24770: error: Cannot find db.h" >&5 -+ { { echo "$as_me:24771: error: Cannot find db.h" >&5 - echo "$as_me: error: Cannot find db.h" >&2;} - { (exit 1); exit 1; }; } - -@@ -24782,7 +24783,7 @@ - - # Just in case, check if the C compiler has a bool type. - --echo "$as_me:24785: checking if we should include stdbool.h" >&5 -+echo "$as_me:24786: 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 -@@ -24790,7 +24791,7 @@ - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 24793 "configure" -+#line 24794 "configure" - #include "confdefs.h" - - int -@@ -24802,23 +24803,23 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:24805: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:24806: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:24808: \$? = $ac_status" >&5 -+ echo "$as_me:24809: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:24811: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24812: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24814: \$? = $ac_status" >&5 -+ echo "$as_me:24815: \$? = $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 24821 "configure" -+#line 24822 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -24834,16 +24835,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:24837: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:24838: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:24840: \$? = $ac_status" >&5 -+ echo "$as_me:24841: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:24843: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24844: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24846: \$? = $ac_status" >&5 -+ echo "$as_me:24847: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -24857,13 +24858,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:24860: result: yes" >&5 -+then echo "$as_me:24861: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:24862: result: no" >&5 -+else echo "$as_me:24863: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:24866: checking for builtin bool type" >&5 -+echo "$as_me:24867: 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 -@@ -24871,7 +24872,7 @@ - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 24874 "configure" -+#line 24875 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -24886,16 +24887,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:24889: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:24890: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:24892: \$? = $ac_status" >&5 -+ echo "$as_me:24893: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:24895: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24896: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24898: \$? = $ac_status" >&5 -+ echo "$as_me:24899: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_cc_bool_type=1 - else -@@ -24908,9 +24909,9 @@ - fi - - if test "$cf_cv_cc_bool_type" = 1 --then echo "$as_me:24911: result: yes" >&5 -+then echo "$as_me:24912: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:24913: result: no" >&5 -+else echo "$as_me:24914: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -24927,10 +24928,10 @@ - - cf_save="$LIBS" - LIBS="$LIBS $CXXLIBS" -- echo "$as_me:24930: checking if we already have C++ library" >&5 -+ echo "$as_me:24931: 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 24933 "configure" -+#line 24934 "configure" - #include "confdefs.h" - - #include <iostream> -@@ -24944,16 +24945,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:24947: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:24948: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:24950: \$? = $ac_status" >&5 -+ echo "$as_me:24951: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:24953: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:24954: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:24956: \$? = $ac_status" >&5 -+ echo "$as_me:24957: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_have_libstdcpp=yes - else -@@ -24962,7 +24963,7 @@ - cf_have_libstdcpp=no - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -- echo "$as_me:24965: result: $cf_have_libstdcpp" >&5 -+ echo "$as_me:24966: result: $cf_have_libstdcpp" >&5 - echo "${ECHO_T}$cf_have_libstdcpp" >&6 - LIBS="$cf_save" - -@@ -24981,7 +24982,7 @@ - ;; - esac - -- echo "$as_me:24984: checking for library $cf_stdcpp_libname" >&5 -+ echo "$as_me:24985: 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 -@@ -25007,7 +25008,7 @@ - LIBS="$cf_add_libs" - - cat >"conftest.$ac_ext" <<_ACEOF --#line 25010 "configure" -+#line 25011 "configure" - #include "confdefs.h" - - #include <iostream> -@@ -25021,16 +25022,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:25024: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:25025: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:25027: \$? = $ac_status" >&5 -+ echo "$as_me:25028: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:25030: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25031: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25033: \$? = $ac_status" >&5 -+ echo "$as_me:25034: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_libstdcpp=yes - else -@@ -25042,7 +25043,7 @@ - LIBS="$cf_save" - - fi --echo "$as_me:25045: result: $cf_cv_libstdcpp" >&5 -+echo "$as_me:25046: result: $cf_cv_libstdcpp" >&5 - echo "${ECHO_T}$cf_cv_libstdcpp" >&6 - test "$cf_cv_libstdcpp" = yes && { - cf_add_libs="$CXXLIBS" -@@ -25064,7 +25065,7 @@ - fi - fi - -- echo "$as_me:25067: checking whether $CXX understands -c and -o together" >&5 -+ echo "$as_me:25068: 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 -@@ -25079,15 +25080,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 $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' --if { (eval echo "$as_me:25082: \"$ac_try\"") >&5 -+if { (eval echo "$as_me:25083: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25085: \$? = $ac_status" >&5 -+ echo "$as_me:25086: \$? = $ac_status" >&5 - (exit "$ac_status"); } && -- test -f conftest2.$ac_objext && { (eval echo "$as_me:25087: \"$ac_try\"") >&5 -+ test -f conftest2.$ac_objext && { (eval echo "$as_me:25088: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25090: \$? = $ac_status" >&5 -+ echo "$as_me:25091: \$? = $ac_status" >&5 - (exit "$ac_status"); }; - then - eval cf_cv_prog_CXX_c_o=yes -@@ -25098,10 +25099,10 @@ - - fi - if test "$cf_cv_prog_CXX_c_o" = yes; then -- echo "$as_me:25101: result: yes" >&5 -+ echo "$as_me:25102: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -- echo "$as_me:25104: result: no" >&5 -+ echo "$as_me:25105: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -25121,7 +25122,7 @@ - ;; - esac - if test "$GXX" = yes; then -- echo "$as_me:25124: checking for lib$cf_gpp_libname" >&5 -+ echo "$as_me:25125: checking for lib$cf_gpp_libname" >&5 - echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 - cf_save="$LIBS" - -@@ -25142,7 +25143,7 @@ - LIBS="$cf_add_libs" - - cat >"conftest.$ac_ext" <<_ACEOF --#line 25145 "configure" -+#line 25146 "configure" - #include "confdefs.h" - - #include <$cf_gpp_libname/builtin.h> -@@ -25156,16 +25157,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:25159: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:25160: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:25162: \$? = $ac_status" >&5 -+ echo "$as_me:25163: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:25165: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25166: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25168: \$? = $ac_status" >&5 -+ echo "$as_me:25169: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cxx_library=yes - -@@ -25202,7 +25203,7 @@ - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - cat >"conftest.$ac_ext" <<_ACEOF --#line 25205 "configure" -+#line 25206 "configure" - #include "confdefs.h" - - #include <builtin.h> -@@ -25216,16 +25217,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:25219: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:25220: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:25222: \$? = $ac_status" >&5 -+ echo "$as_me:25223: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:25225: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25226: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25228: \$? = $ac_status" >&5 -+ echo "$as_me:25229: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cxx_library=yes - -@@ -25258,7 +25259,7 @@ - fi - rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - LIBS="$cf_save" -- echo "$as_me:25261: result: $cf_cxx_library" >&5 -+ echo "$as_me:25262: result: $cf_cxx_library" >&5 - echo "${ECHO_T}$cf_cxx_library" >&6 - fi - -@@ -25274,7 +25275,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:25277: checking how to run the C++ preprocessor" >&5 -+echo "$as_me:25278: 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 -@@ -25291,18 +25292,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 25294 "configure" -+#line 25295 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax error - _ACEOF --if { (eval echo "$as_me:25299: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:25300: \"$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:25305: \$? = $ac_status" >&5 -+ echo "$as_me:25306: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -25325,17 +25326,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >"conftest.$ac_ext" <<_ACEOF --#line 25328 "configure" -+#line 25329 "configure" - #include "confdefs.h" - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:25332: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:25333: \"$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:25338: \$? = $ac_status" >&5 -+ echo "$as_me:25339: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -25372,7 +25373,7 @@ - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --echo "$as_me:25375: result: $CXXCPP" >&5 -+echo "$as_me:25376: result: $CXXCPP" >&5 - echo "${ECHO_T}$CXXCPP" >&6 - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes -@@ -25382,18 +25383,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 25385 "configure" -+#line 25386 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax error - _ACEOF --if { (eval echo "$as_me:25390: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:25391: \"$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:25396: \$? = $ac_status" >&5 -+ echo "$as_me:25397: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -25416,17 +25417,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >"conftest.$ac_ext" <<_ACEOF --#line 25419 "configure" -+#line 25420 "configure" - #include "confdefs.h" - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:25423: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:25424: \"$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:25429: \$? = $ac_status" >&5 -+ echo "$as_me:25430: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -25454,7 +25455,7 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:25457: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 -+ { { echo "$as_me:25458: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 - echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -25469,23 +25470,23 @@ - for ac_header in typeinfo - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:25472: checking for $ac_header" >&5 -+echo "$as_me:25473: 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 25478 "configure" -+#line 25479 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:25482: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:25483: \"$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:25488: \$? = $ac_status" >&5 -+ echo "$as_me:25489: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -25504,7 +25505,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:25507: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:25508: 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 -@@ -25517,23 +25518,23 @@ - for ac_header in iostream - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:25520: checking for $ac_header" >&5 -+echo "$as_me:25521: 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 25526 "configure" -+#line 25527 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:25530: \"$ac_cpp "conftest.$ac_ext"\"") >&5 -+if { (eval echo "$as_me:25531: \"$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:25536: \$? = $ac_status" >&5 -+ echo "$as_me:25537: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -25552,7 +25553,7 @@ - fi - rm -f conftest.err "conftest.$ac_ext" - fi --echo "$as_me:25555: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -+echo "$as_me:25556: 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 -@@ -25563,10 +25564,10 @@ - done - - if test x"$ac_cv_header_iostream" = xyes ; then -- echo "$as_me:25566: checking if iostream uses std-namespace" >&5 -+ echo "$as_me:25567: 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 25569 "configure" -+#line 25570 "configure" - #include "confdefs.h" - - #include <iostream> -@@ -25583,16 +25584,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25586: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25587: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25589: \$? = $ac_status" >&5 -+ echo "$as_me:25590: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25592: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25593: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25595: \$? = $ac_status" >&5 -+ echo "$as_me:25596: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_iostream_namespace=yes - else -@@ -25601,7 +25602,7 @@ - cf_iostream_namespace=no - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" -- echo "$as_me:25604: result: $cf_iostream_namespace" >&5 -+ echo "$as_me:25605: result: $cf_iostream_namespace" >&5 - echo "${ECHO_T}$cf_iostream_namespace" >&6 - if test "$cf_iostream_namespace" = yes ; then - -@@ -25612,7 +25613,7 @@ - fi - fi - --echo "$as_me:25615: checking if we should include stdbool.h" >&5 -+echo "$as_me:25616: 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 -@@ -25620,7 +25621,7 @@ - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 25623 "configure" -+#line 25624 "configure" - #include "confdefs.h" - - int -@@ -25632,23 +25633,23 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25636: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25638: \$? = $ac_status" >&5 -+ echo "$as_me:25639: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25641: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25642: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25644: \$? = $ac_status" >&5 -+ echo "$as_me:25645: \$? = $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 25651 "configure" -+#line 25652 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -25664,16 +25665,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25668: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25670: \$? = $ac_status" >&5 -+ echo "$as_me:25671: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25673: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25674: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25676: \$? = $ac_status" >&5 -+ echo "$as_me:25677: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -25687,13 +25688,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:25690: result: yes" >&5 -+then echo "$as_me:25691: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:25692: result: no" >&5 -+else echo "$as_me:25693: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:25696: checking for builtin bool type" >&5 -+echo "$as_me:25697: 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 -@@ -25701,7 +25702,7 @@ - else - - cat >"conftest.$ac_ext" <<_ACEOF --#line 25704 "configure" -+#line 25705 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -25716,16 +25717,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25719: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25720: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25722: \$? = $ac_status" >&5 -+ echo "$as_me:25723: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25725: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25726: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25728: \$? = $ac_status" >&5 -+ echo "$as_me:25729: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_builtin_bool=1 - else -@@ -25738,19 +25739,19 @@ - fi - - if test "$cf_cv_builtin_bool" = 1 --then echo "$as_me:25741: result: yes" >&5 -+then echo "$as_me:25742: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:25743: result: no" >&5 -+else echo "$as_me:25744: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:25747: checking for bool" >&5 -+echo "$as_me:25748: checking for bool" >&5 - echo $ECHO_N "checking for bool... $ECHO_C" >&6 - if test "${ac_cv_type_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 25753 "configure" -+#line 25754 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -25786,16 +25787,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25789: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25790: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25792: \$? = $ac_status" >&5 -+ echo "$as_me:25793: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25795: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25796: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25798: \$? = $ac_status" >&5 -+ echo "$as_me:25799: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_bool=yes - else -@@ -25805,10 +25806,10 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:25808: result: $ac_cv_type_bool" >&5 -+echo "$as_me:25809: result: $ac_cv_type_bool" >&5 - echo "${ECHO_T}$ac_cv_type_bool" >&6 - --echo "$as_me:25811: checking size of bool" >&5 -+echo "$as_me:25812: checking size of bool" >&5 - echo $ECHO_N "checking size of bool... $ECHO_C" >&6 - if test "${ac_cv_sizeof_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -25817,7 +25818,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >"conftest.$ac_ext" <<_ACEOF --#line 25820 "configure" -+#line 25821 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -25850,21 +25851,21 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25853: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25856: \$? = $ac_status" >&5 -+ echo "$as_me:25857: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25859: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25860: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25862: \$? = $ac_status" >&5 -+ echo "$as_me:25863: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 25867 "configure" -+#line 25868 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -25897,16 +25898,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25900: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25901: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25903: \$? = $ac_status" >&5 -+ echo "$as_me:25904: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25906: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25907: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25909: \$? = $ac_status" >&5 -+ echo "$as_me:25910: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_hi=$ac_mid; break - else -@@ -25922,7 +25923,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 25925 "configure" -+#line 25926 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -25955,16 +25956,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:25958: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:25959: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25961: \$? = $ac_status" >&5 -+ echo "$as_me:25962: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:25964: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:25965: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25967: \$? = $ac_status" >&5 -+ echo "$as_me:25968: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_lo=$ac_mid; break - else -@@ -25980,7 +25981,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 25983 "configure" -+#line 25984 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26013,16 +26014,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26016: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26019: \$? = $ac_status" >&5 -+ echo "$as_me:26020: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26022: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26023: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26025: \$? = $ac_status" >&5 -+ echo "$as_me:26026: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_hi=$ac_mid - else -@@ -26035,12 +26036,12 @@ - ac_cv_sizeof_bool=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:26038: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:26039: 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 26043 "configure" -+#line 26044 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26077,15 +26078,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:26080: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:26081: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:26083: \$? = $ac_status" >&5 -+ echo "$as_me:26084: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:26085: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26086: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26088: \$? = $ac_status" >&5 -+ echo "$as_me:26089: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_sizeof_bool=`cat conftest.val` - else -@@ -26101,13 +26102,13 @@ - ac_cv_sizeof_bool=0 - fi - fi --echo "$as_me:26104: result: $ac_cv_sizeof_bool" >&5 -+echo "$as_me:26105: result: $ac_cv_sizeof_bool" >&5 - echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 - cat >>confdefs.h <<EOF - #define SIZEOF_BOOL $ac_cv_sizeof_bool - EOF - --echo "$as_me:26110: checking for type of bool" >&5 -+echo "$as_me:26111: checking for type of bool" >&5 - echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 - if test "${cf_cv_type_of_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -26126,7 +26127,7 @@ - - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 26129 "configure" -+#line 26130 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26168,15 +26169,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:26171: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:26172: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:26174: \$? = $ac_status" >&5 -+ echo "$as_me:26175: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:26176: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26177: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26179: \$? = $ac_status" >&5 -+ echo "$as_me:26180: \$? = $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 -@@ -26193,19 +26194,19 @@ - rm -f cf_test.out - - fi --echo "$as_me:26196: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:26197: 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:26203: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:26204: 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:26208: checking for special defines needed for etip.h" >&5 -+echo "$as_me:26209: 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" -@@ -26223,7 +26224,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 26226 "configure" -+#line 26227 "configure" - #include "confdefs.h" - - #include <etip.h.in> -@@ -26237,16 +26238,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26240: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26241: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26243: \$? = $ac_status" >&5 -+ echo "$as_me:26244: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26246: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26247: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26249: \$? = $ac_status" >&5 -+ echo "$as_me:26250: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - test -n "$cf_math" && cat >>confdefs.h <<EOF -@@ -26267,12 +26268,12 @@ - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - done - done --echo "$as_me:26270: result: $cf_result" >&5 -+echo "$as_me:26271: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - CXXFLAGS="$cf_save_CXXFLAGS" - - if test -n "$CXX"; then --echo "$as_me:26275: checking if $CXX accepts parameter initialization" >&5 -+echo "$as_me:26276: 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 -@@ -26289,7 +26290,7 @@ - cf_cv_cpp_param_init=unknown - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 26292 "configure" -+#line 26293 "configure" - #include "confdefs.h" - - class TEST { -@@ -26308,15 +26309,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:26311: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:26312: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:26314: \$? = $ac_status" >&5 -+ echo "$as_me:26315: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:26316: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26317: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26319: \$? = $ac_status" >&5 -+ echo "$as_me:26320: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_cpp_param_init=yes - else -@@ -26335,7 +26336,7 @@ - ac_main_return="return" - - fi --echo "$as_me:26338: result: $cf_cv_cpp_param_init" >&5 -+echo "$as_me:26339: result: $cf_cv_cpp_param_init" >&5 - echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 - fi - test "$cf_cv_cpp_param_init" = yes && -@@ -26345,7 +26346,7 @@ - - if test -n "$CXX"; then - --echo "$as_me:26348: checking if $CXX accepts static_cast" >&5 -+echo "$as_me:26349: 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 -@@ -26359,7 +26360,7 @@ - ac_main_return="return" - - cat >"conftest.$ac_ext" <<_ACEOF --#line 26362 "configure" -+#line 26363 "configure" - #include "confdefs.h" - - class NCursesPanel -@@ -26403,16 +26404,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26407: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26409: \$? = $ac_status" >&5 -+ echo "$as_me:26410: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26412: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26413: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26415: \$? = $ac_status" >&5 -+ echo "$as_me:26416: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_cpp_static_cast=yes - else -@@ -26430,7 +26431,7 @@ - ac_main_return="return" - - fi --echo "$as_me:26433: result: $cf_cv_cpp_static_cast" >&5 -+echo "$as_me:26434: result: $cf_cv_cpp_static_cast" >&5 - echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 - - fi -@@ -26479,13 +26480,13 @@ - else - if test "$cf_cv_header_stdbool_h" = 1 ; then - --echo "$as_me:26482: checking for bool" >&5 -+echo "$as_me:26483: checking for bool" >&5 - echo $ECHO_N "checking for bool... $ECHO_C" >&6 - if test "${ac_cv_type_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 26488 "configure" -+#line 26489 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26521,16 +26522,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26524: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26525: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26527: \$? = $ac_status" >&5 -+ echo "$as_me:26528: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26530: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26531: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26533: \$? = $ac_status" >&5 -+ echo "$as_me:26534: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_bool=yes - else -@@ -26540,10 +26541,10 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:26543: result: $ac_cv_type_bool" >&5 -+echo "$as_me:26544: result: $ac_cv_type_bool" >&5 - echo "${ECHO_T}$ac_cv_type_bool" >&6 - --echo "$as_me:26546: checking size of bool" >&5 -+echo "$as_me:26547: checking size of bool" >&5 - echo $ECHO_N "checking size of bool... $ECHO_C" >&6 - if test "${ac_cv_sizeof_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -26552,7 +26553,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >"conftest.$ac_ext" <<_ACEOF --#line 26555 "configure" -+#line 26556 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26585,21 +26586,21 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26588: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26589: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26591: \$? = $ac_status" >&5 -+ echo "$as_me:26592: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26594: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26595: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26597: \$? = $ac_status" >&5 -+ echo "$as_me:26598: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 26602 "configure" -+#line 26603 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26632,16 +26633,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26635: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26636: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26638: \$? = $ac_status" >&5 -+ echo "$as_me:26639: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26641: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26642: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26644: \$? = $ac_status" >&5 -+ echo "$as_me:26645: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_hi=$ac_mid; break - else -@@ -26657,7 +26658,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 26660 "configure" -+#line 26661 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26690,16 +26691,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26693: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26694: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26696: \$? = $ac_status" >&5 -+ echo "$as_me:26697: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26699: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26700: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26702: \$? = $ac_status" >&5 -+ echo "$as_me:26703: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_lo=$ac_mid; break - else -@@ -26715,7 +26716,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 26718 "configure" -+#line 26719 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26748,16 +26749,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:26751: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:26754: \$? = $ac_status" >&5 -+ echo "$as_me:26755: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:26757: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26758: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26760: \$? = $ac_status" >&5 -+ echo "$as_me:26761: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_hi=$ac_mid - else -@@ -26770,12 +26771,12 @@ - ac_cv_sizeof_bool=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:26773: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:26774: 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 26778 "configure" -+#line 26779 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26812,15 +26813,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:26815: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:26816: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:26818: \$? = $ac_status" >&5 -+ echo "$as_me:26819: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:26820: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26821: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26823: \$? = $ac_status" >&5 -+ echo "$as_me:26824: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_sizeof_bool=`cat conftest.val` - else -@@ -26836,13 +26837,13 @@ - ac_cv_sizeof_bool=0 - fi - fi --echo "$as_me:26839: result: $ac_cv_sizeof_bool" >&5 -+echo "$as_me:26840: result: $ac_cv_sizeof_bool" >&5 - echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 - cat >>confdefs.h <<EOF - #define SIZEOF_BOOL $ac_cv_sizeof_bool - EOF - --echo "$as_me:26845: checking for type of bool" >&5 -+echo "$as_me:26846: checking for type of bool" >&5 - echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 - if test "${cf_cv_type_of_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -26861,7 +26862,7 @@ - - else - cat >"conftest.$ac_ext" <<_ACEOF --#line 26864 "configure" -+#line 26865 "configure" - #include "confdefs.h" - - #include <stdlib.h> -@@ -26903,15 +26904,15 @@ - - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:26906: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:26907: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:26909: \$? = $ac_status" >&5 -+ echo "$as_me:26910: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:26911: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:26912: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:26914: \$? = $ac_status" >&5 -+ echo "$as_me:26915: \$? = $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 -@@ -26928,26 +26929,26 @@ - rm -f cf_test.out - - fi --echo "$as_me:26931: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:26932: 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:26938: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:26939: 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:26944: checking for fallback type of bool" >&5 -+ echo "$as_me:26945: 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:26950: result: $cf_cv_type_of_bool" >&5 -+ echo "$as_me:26951: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - fi - fi -@@ -26976,7 +26977,7 @@ - - if test "$cf_with_ada" != "no" ; then - if test "$with_libtool" != "no"; then -- { echo "$as_me:26979: WARNING: libtool does not support Ada - disabling feature" >&5 -+ { echo "$as_me:26980: 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 -@@ -26993,7 +26994,7 @@ - unset cf_TEMP_gnat - # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. - set dummy $cf_prog_gnat; ac_word=$2 --echo "$as_me:26996: checking for $ac_word" >&5 -+echo "$as_me:26997: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -27010,7 +27011,7 @@ - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" -- echo "$as_me:27013: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:27014: found $ac_dir/$ac_word" >&5 - break - fi - done -@@ -27022,10 +27023,10 @@ - cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat - - if test -n "$cf_TEMP_gnat"; then -- echo "$as_me:27025: result: $cf_TEMP_gnat" >&5 -+ echo "$as_me:27026: result: $cf_TEMP_gnat" >&5 - echo "${ECHO_T}$cf_TEMP_gnat" >&6 - else -- echo "$as_me:27028: result: no" >&5 -+ echo "$as_me:27029: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -27035,7 +27036,7 @@ - unset cf_cv_gnat_version - unset cf_TEMP_gnat - --echo "$as_me:27038: checking for $cf_prog_gnat version" >&5 -+echo "$as_me:27039: checking for $cf_prog_gnat version" >&5 - echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 - if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -27046,7 +27047,7 @@ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - - fi --echo "$as_me:27049: result: $cf_cv_gnat_version" >&5 -+echo "$as_me:27050: result: $cf_cv_gnat_version" >&5 - echo "${ECHO_T}$cf_cv_gnat_version" >&6 - test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no - eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version -@@ -27075,7 +27076,7 @@ - cd conftest.src - for cf_gprconfig in Ada C - do -- echo "$as_me:27078: checking for gprconfig name for $cf_gprconfig" >&5 -+ echo "$as_me:27079: checking for gprconfig name for $cf_gprconfig" >&5 - echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - if test "$cf_gprconfig" = C - then -@@ -27094,10 +27095,10 @@ - if test -n "$cf_gprconfig_value" - then - eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" -- echo "$as_me:27097: result: $cf_gprconfig_value" >&5 -+ echo "$as_me:27098: result: $cf_gprconfig_value" >&5 - echo "${ECHO_T}$cf_gprconfig_value" >&6 - else -- echo "$as_me:27100: result: missing" >&5 -+ echo "$as_me:27101: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - cf_ada_config="#" - break -@@ -27110,7 +27111,7 @@ - if test "x$cf_ada_config" != "x#" - then - --echo "$as_me:27113: checking for gnat version" >&5 -+echo "$as_me:27114: checking for gnat version" >&5 - echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 - if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -27121,7 +27122,7 @@ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - - fi --echo "$as_me:27124: result: $cf_cv_gnat_version" >&5 -+echo "$as_me:27125: result: $cf_cv_gnat_version" >&5 - echo "${ECHO_T}$cf_cv_gnat_version" >&6 - test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no - -@@ -27130,7 +27131,7 @@ - cf_cv_prog_gnat_correct=yes - ;; - (*) -- { echo "$as_me:27133: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -+ { echo "$as_me:27134: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 - echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -@@ -27138,7 +27139,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:27141: checking for $ac_word" >&5 -+echo "$as_me:27142: 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 -@@ -27153,7 +27154,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_M4_exists="yes" --echo "$as_me:27156: found $ac_dir/$ac_word" >&5 -+echo "$as_me:27157: found $ac_dir/$ac_word" >&5 - break - done - -@@ -27162,20 +27163,20 @@ - fi - M4_exists=$ac_cv_prog_M4_exists - if test -n "$M4_exists"; then -- echo "$as_me:27165: result: $M4_exists" >&5 -+ echo "$as_me:27166: result: $M4_exists" >&5 - echo "${ECHO_T}$M4_exists" >&6 - else -- echo "$as_me:27168: result: no" >&5 -+ echo "$as_me:27169: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - if test "$ac_cv_prog_M4_exists" = no; then - cf_cv_prog_gnat_correct=no -- { echo "$as_me:27174: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 -+ { echo "$as_me:27175: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 - echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} - fi - if test "$cf_cv_prog_gnat_correct" = yes; then -- echo "$as_me:27178: checking if GNAT works" >&5 -+ echo "$as_me:27179: checking if GNAT works" >&5 - echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - - rm -rf ./conftest* ./*~conftest* -@@ -27203,7 +27204,7 @@ - fi - rm -rf ./conftest* ./*~conftest* - -- echo "$as_me:27206: result: $cf_cv_prog_gnat_correct" >&5 -+ echo "$as_me:27207: result: $cf_cv_prog_gnat_correct" >&5 - echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - else -@@ -27215,7 +27216,7 @@ - - ADAFLAGS="$ADAFLAGS -gnatpn" - -- echo "$as_me:27218: checking optimization options for ADAFLAGS" >&5 -+ echo "$as_me:27219: checking optimization options for ADAFLAGS" >&5 - echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 - case "$CFLAGS" in - (*-g*) -@@ -27232,10 +27233,10 @@ - - ;; - esac -- echo "$as_me:27235: result: $ADAFLAGS" >&5 -+ echo "$as_me:27236: result: $ADAFLAGS" >&5 - echo "${ECHO_T}$ADAFLAGS" >&6 - --echo "$as_me:27238: checking if GNATPREP supports -T option" >&5 -+echo "$as_me:27239: 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 -@@ -27245,11 +27246,11 @@ - gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes - - fi --echo "$as_me:27248: result: $cf_cv_gnatprep_opt_t" >&5 -+echo "$as_me:27249: 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:27252: checking if GNAT supports generics" >&5 -+echo "$as_me:27253: checking if GNAT supports generics" >&5 - echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 - case "$cf_cv_gnat_version" in - (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) -@@ -27259,7 +27260,7 @@ - cf_gnat_generics=no - ;; - esac --echo "$as_me:27262: result: $cf_gnat_generics" >&5 -+echo "$as_me:27263: result: $cf_gnat_generics" >&5 - echo "${ECHO_T}$cf_gnat_generics" >&6 - - if test "$cf_gnat_generics" = yes -@@ -27271,7 +27272,7 @@ - cf_generic_objects= - fi - --echo "$as_me:27274: checking if GNAT supports SIGINT" >&5 -+echo "$as_me:27275: 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 -@@ -27319,7 +27320,7 @@ - rm -rf ./conftest* ./*~conftest* - - fi --echo "$as_me:27322: result: $cf_cv_gnat_sigint" >&5 -+echo "$as_me:27323: result: $cf_cv_gnat_sigint" >&5 - echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 - - if test "$cf_cv_gnat_sigint" = yes ; then -@@ -27332,7 +27333,7 @@ - cf_gnat_projects=no - - if test "$enable_gnat_projects" != no ; then --echo "$as_me:27335: checking if GNAT supports project files" >&5 -+echo "$as_me:27336: checking if GNAT supports project files" >&5 - echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 - case "$cf_cv_gnat_version" in - (3.[0-9]*) -@@ -27395,15 +27396,15 @@ - esac - ;; - esac --echo "$as_me:27398: result: $cf_gnat_projects" >&5 -+echo "$as_me:27399: 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:27404: checking if GNAT supports libraries" >&5 -+ echo "$as_me:27405: checking if GNAT supports libraries" >&5 - echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 -- echo "$as_me:27406: result: $cf_gnat_libraries" >&5 -+ echo "$as_me:27407: result: $cf_gnat_libraries" >&5 - echo "${ECHO_T}$cf_gnat_libraries" >&6 - fi - -@@ -27423,7 +27424,7 @@ - then - USE_GNAT_MAKE_GPR="" - else -- { echo "$as_me:27426: WARNING: use old makefile rules since tools are missing" >&5 -+ { echo "$as_me:27427: WARNING: use old makefile rules since tools are missing" >&5 - echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} - fi - fi -@@ -27435,7 +27436,7 @@ - USE_GNAT_LIBRARIES="#" - fi - --echo "$as_me:27438: checking for ada-compiler" >&5 -+echo "$as_me:27439: 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. -@@ -27446,12 +27447,12 @@ - cf_ada_compiler=gnatmake - fi; - --echo "$as_me:27449: result: $cf_ada_compiler" >&5 -+echo "$as_me:27450: result: $cf_ada_compiler" >&5 - echo "${ECHO_T}$cf_ada_compiler" >&6 - - cf_ada_package=terminal_interface - --echo "$as_me:27454: checking for ada-include" >&5 -+echo "$as_me:27455: 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. -@@ -27487,7 +27488,7 @@ - withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:27490: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:27491: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -27496,10 +27497,10 @@ - fi - eval ADA_INCLUDE="$withval" - --echo "$as_me:27499: result: $ADA_INCLUDE" >&5 -+echo "$as_me:27500: result: $ADA_INCLUDE" >&5 - echo "${ECHO_T}$ADA_INCLUDE" >&6 - --echo "$as_me:27502: checking for ada-objects" >&5 -+echo "$as_me:27503: 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. -@@ -27535,7 +27536,7 @@ - withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` - ;; - (*) -- { { echo "$as_me:27538: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:27539: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -27544,10 +27545,10 @@ - fi - eval ADA_OBJECTS="$withval" - --echo "$as_me:27547: result: $ADA_OBJECTS" >&5 -+echo "$as_me:27548: result: $ADA_OBJECTS" >&5 - echo "${ECHO_T}$ADA_OBJECTS" >&6 - --echo "$as_me:27550: checking if an Ada95 shared-library should be built" >&5 -+echo "$as_me:27551: 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. -@@ -27557,14 +27558,14 @@ - else - with_ada_sharedlib=no - fi; --echo "$as_me:27560: result: $with_ada_sharedlib" >&5 -+echo "$as_me:27561: result: $with_ada_sharedlib" >&5 - echo "${ECHO_T}$with_ada_sharedlib" >&6 - - if test "x$with_ada_sharedlib" != xno - then - if test "x$cf_gnat_projects" != xyes - then -- { echo "$as_me:27567: WARNING: disabling shared-library since GNAT projects are not supported" >&5 -+ { echo "$as_me:27568: WARNING: disabling shared-library since GNAT projects are not supported" >&5 - echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} - with_ada_sharedlib=no - fi -@@ -27584,7 +27585,7 @@ - - # allow the Ada binding to be renamed - --echo "$as_me:27587: checking for ada-libname" >&5 -+echo "$as_me:27588: checking for ada-libname" >&5 - echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 - - # Check whether --with-ada-libname or --without-ada-libname was given. -@@ -27600,7 +27601,7 @@ - ;; - esac - --echo "$as_me:27603: result: $ADA_LIBNAME" >&5 -+echo "$as_me:27604: result: $ADA_LIBNAME" >&5 - echo "${ECHO_T}$ADA_LIBNAME" >&6 - - fi -@@ -27611,13 +27612,13 @@ - - # do this "late" to avoid conflict with header-checks - if test "x$with_widec" = xyes ; then -- echo "$as_me:27614: checking for wchar_t" >&5 -+ echo "$as_me:27615: 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 27620 "configure" -+#line 27621 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -27632,16 +27633,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:27635: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:27636: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:27638: \$? = $ac_status" >&5 -+ echo "$as_me:27639: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:27641: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:27642: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:27644: \$? = $ac_status" >&5 -+ echo "$as_me:27645: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_wchar_t=yes - else -@@ -27651,10 +27652,10 @@ - fi - rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi --echo "$as_me:27654: result: $ac_cv_type_wchar_t" >&5 -+echo "$as_me:27655: result: $ac_cv_type_wchar_t" >&5 - echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 - --echo "$as_me:27657: checking size of wchar_t" >&5 -+echo "$as_me:27658: 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 -@@ -27663,7 +27664,7 @@ - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >"conftest.$ac_ext" <<_ACEOF --#line 27666 "configure" -+#line 27667 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -27675,21 +27676,21 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:27678: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:27681: \$? = $ac_status" >&5 -+ echo "$as_me:27682: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:27684: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:27685: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:27687: \$? = $ac_status" >&5 -+ echo "$as_me:27688: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 27692 "configure" -+#line 27693 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -27701,16 +27702,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:27704: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:27707: \$? = $ac_status" >&5 -+ echo "$as_me:27708: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:27710: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:27711: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:27713: \$? = $ac_status" >&5 -+ echo "$as_me:27714: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_hi=$ac_mid; break - else -@@ -27726,7 +27727,7 @@ - ac_hi=-1 ac_mid=-1 - while :; do - cat >"conftest.$ac_ext" <<_ACEOF --#line 27729 "configure" -+#line 27730 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -27738,16 +27739,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:27741: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:27742: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:27744: \$? = $ac_status" >&5 -+ echo "$as_me:27745: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:27747: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:27748: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:27750: \$? = $ac_status" >&5 -+ echo "$as_me:27751: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_lo=$ac_mid; break - else -@@ -27763,7 +27764,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 27766 "configure" -+#line 27767 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -27775,16 +27776,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" --if { (eval echo "$as_me:27778: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:27779: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:27781: \$? = $ac_status" >&5 -+ echo "$as_me:27782: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' -- { (eval echo "$as_me:27784: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:27785: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:27787: \$? = $ac_status" >&5 -+ echo "$as_me:27788: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_hi=$ac_mid - else -@@ -27797,12 +27798,12 @@ - ac_cv_sizeof_wchar_t=$ac_lo - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:27800: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:27801: 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 27805 "configure" -+#line 27806 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -27818,15 +27819,15 @@ - } - _ACEOF - rm -f "conftest$ac_exeext" --if { (eval echo "$as_me:27821: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:27822: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:27824: \$? = $ac_status" >&5 -+ echo "$as_me:27825: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' -- { (eval echo "$as_me:27826: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:27827: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:27829: \$? = $ac_status" >&5 -+ echo "$as_me:27830: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_sizeof_wchar_t=`cat conftest.val` - else -@@ -27842,7 +27843,7 @@ - ac_cv_sizeof_wchar_t=0 - fi - fi --echo "$as_me:27845: result: $ac_cv_sizeof_wchar_t" >&5 -+echo "$as_me:27846: 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 -@@ -27855,7 +27856,7 @@ - then - test -n "$verbose" && echo " test failed (assume 2)" 1>&6 - --echo "${as_me:-configure}:27858: testing test failed (assume 2) ..." 1>&5 -+echo "${as_me:-configure}:27859: testing test failed (assume 2) ..." 1>&5 - - sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp - mv confdefs.tmp confdefs.h -@@ -27873,7 +27874,7 @@ - ### chooses to split module lists into libraries. - ### - ### (see CF_LIB_RULES). --echo "$as_me:27876: checking for library subsets" >&5 -+echo "$as_me:27877: checking for library subsets" >&5 - echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 - LIB_SUBSETS= - -@@ -27927,7 +27928,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:27930: result: $LIB_SUBSETS" >&5 -+echo "$as_me:27931: result: $LIB_SUBSETS" >&5 - echo "${ECHO_T}$LIB_SUBSETS" >&6 - - ### Construct the list of include-directories to be generated -@@ -27958,7 +27959,7 @@ - fi - - ### Build up pieces for makefile rules --echo "$as_me:27961: checking default library suffix" >&5 -+echo "$as_me:27962: checking default library suffix" >&5 - echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -27969,10 +27970,10 @@ - (shared) DFT_ARG_SUFFIX='' ;; - esac - test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" --echo "$as_me:27972: result: $DFT_ARG_SUFFIX" >&5 -+echo "$as_me:27973: result: $DFT_ARG_SUFFIX" >&5 - echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 - --echo "$as_me:27975: checking default library-dependency suffix" >&5 -+echo "$as_me:27976: checking default library-dependency suffix" >&5 - echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - - case X$DFT_LWR_MODEL in -@@ -28055,10 +28056,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:28058: result: $DFT_DEP_SUFFIX" >&5 -+echo "$as_me:28059: result: $DFT_DEP_SUFFIX" >&5 - echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 - --echo "$as_me:28061: checking default object directory" >&5 -+echo "$as_me:28062: checking default object directory" >&5 - echo $ECHO_N "checking default object directory... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -28074,11 +28075,11 @@ - DFT_OBJ_SUBDIR='obj_s' ;; - esac - esac --echo "$as_me:28077: result: $DFT_OBJ_SUBDIR" >&5 -+echo "$as_me:28078: result: $DFT_OBJ_SUBDIR" >&5 - echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 - - if test "x$cf_with_cxx" = xyes ; then --echo "$as_me:28081: checking c++ library-dependency suffix" >&5 -+echo "$as_me:28082: 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++) -@@ -28171,7 +28172,7 @@ - fi - - fi --echo "$as_me:28174: result: $CXX_LIB_SUFFIX" >&5 -+echo "$as_me:28175: result: $CXX_LIB_SUFFIX" >&5 - echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 - - fi -@@ -28347,19 +28348,19 @@ - - if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" - then -- echo "$as_me:28350: checking if linker supports switching between static/dynamic" >&5 -+ echo "$as_me:28351: 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 28355 "configure" -+#line 28356 "configure" - #include <stdio.h> - int cf_ldflags_static(FILE *fp) { return fflush(fp); } - EOF -- if { (eval echo "$as_me:28359: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:28362: \$? = $ac_status" >&5 -+ echo "$as_me:28363: \$? = $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 -@@ -28370,10 +28371,10 @@ - - LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" - cat >"conftest.$ac_ext" <<_ACEOF --#line 28373 "configure" -+#line 28374 "configure" - #include "confdefs.h" - --#line 28376 "configure" -+#line 28377 "configure" - #include <stdio.h> - int cf_ldflags_static(FILE *fp); - -@@ -28388,16 +28389,16 @@ - } - _ACEOF - rm -f "conftest.$ac_objext" "conftest$ac_exeext" --if { (eval echo "$as_me:28391: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:28392: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:28394: \$? = $ac_status" >&5 -+ echo "$as_me:28395: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' -- { (eval echo "$as_me:28397: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:28398: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:28400: \$? = $ac_status" >&5 -+ echo "$as_me:28401: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - # some linkers simply ignore the -dynamic -@@ -28420,7 +28421,7 @@ - rm -f libconftest.* - LIBS="$cf_save_LIBS" - -- echo "$as_me:28423: result: $cf_ldflags_static" >&5 -+ echo "$as_me:28424: result: $cf_ldflags_static" >&5 - echo "${ECHO_T}$cf_ldflags_static" >&6 - - if test "$cf_ldflags_static" != yes -@@ -28436,7 +28437,7 @@ - ;; - esac - --echo "$as_me:28439: checking where we will install curses.h" >&5 -+echo "$as_me:28440: checking where we will install curses.h" >&5 - echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 - - includesubdir= -@@ -28446,7 +28447,7 @@ - then - includesubdir="/ncurses${USE_LIB_SUFFIX}" - fi --echo "$as_me:28449: result: ${includedir}${includesubdir}" >&5 -+echo "$as_me:28450: result: ${includedir}${includesubdir}" >&5 - echo "${ECHO_T}${includedir}${includesubdir}" >&6 - - ### Resolve a conflict between normal and wide-curses by forcing applications -@@ -28454,7 +28455,7 @@ - if test "$with_overwrite" != no ; then - if test "$NCURSES_LIBUTF8" = 1 ; then - NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' -- { echo "$as_me:28457: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 -+ { echo "$as_me:28458: 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 -@@ -28482,7 +28483,7 @@ - - # pkgsrc uses these - --echo "$as_me:28485: checking for desired basename for form library" >&5 -+echo "$as_me:28486: checking for desired basename for form library" >&5 - echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 - - # Check whether --with-form-libname or --without-form-libname was given. -@@ -28502,10 +28503,10 @@ - ;; - esac - --echo "$as_me:28505: result: $FORM_NAME" >&5 -+echo "$as_me:28506: result: $FORM_NAME" >&5 - echo "${ECHO_T}$FORM_NAME" >&6 - --echo "$as_me:28508: checking for desired basename for menu library" >&5 -+echo "$as_me:28509: checking for desired basename for menu library" >&5 - echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 - - # Check whether --with-menu-libname or --without-menu-libname was given. -@@ -28525,10 +28526,10 @@ - ;; - esac - --echo "$as_me:28528: result: $MENU_NAME" >&5 -+echo "$as_me:28529: result: $MENU_NAME" >&5 - echo "${ECHO_T}$MENU_NAME" >&6 - --echo "$as_me:28531: checking for desired basename for panel library" >&5 -+echo "$as_me:28532: checking for desired basename for panel library" >&5 - echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 - - # Check whether --with-panel-libname or --without-panel-libname was given. -@@ -28548,10 +28549,10 @@ - ;; - esac - --echo "$as_me:28551: result: $PANEL_NAME" >&5 -+echo "$as_me:28552: result: $PANEL_NAME" >&5 - echo "${ECHO_T}$PANEL_NAME" >&6 - --echo "$as_me:28554: checking for desired basename for cxx library" >&5 -+echo "$as_me:28555: checking for desired basename for cxx library" >&5 - echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 - - # Check whether --with-cxx-libname or --without-cxx-libname was given. -@@ -28571,13 +28572,13 @@ - ;; - esac - --echo "$as_me:28574: result: $CXX_NAME" >&5 -+echo "$as_me:28575: result: $CXX_NAME" >&5 - echo "${ECHO_T}$CXX_NAME" >&6 - - ### Construct the list of subdirectories for which we'll customize makefiles - ### with the appropriate compile-rules. - --echo "$as_me:28580: checking for src modules" >&5 -+echo "$as_me:28581: checking for src modules" >&5 - echo $ECHO_N "checking for src modules... $ECHO_C" >&6 - - # dependencies and linker-arguments for test-programs -@@ -28646,7 +28647,7 @@ - fi - fi - done --echo "$as_me:28649: result: $cf_cv_src_modules" >&5 -+echo "$as_me:28650: result: $cf_cv_src_modules" >&5 - echo "${ECHO_T}$cf_cv_src_modules" >&6 - - TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" -@@ -28807,7 +28808,7 @@ - (*-D_XOPEN_SOURCE_EXTENDED*) - test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 - --echo "${as_me:-configure}:28810: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 -+echo "${as_me:-configure}:28811: 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//'` -@@ -28818,7 +28819,7 @@ - - # Help to automatically enable the extended curses features when using either - # the *-config or the ".pc" files by adding defines. --echo "$as_me:28821: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 -+echo "$as_me:28822: 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 -@@ -28834,7 +28835,7 @@ - done - test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" - done --echo "$as_me:28837: result: $PKG_CFLAGS" >&5 -+echo "$as_me:28838: result: $PKG_CFLAGS" >&5 - echo "${ECHO_T}$PKG_CFLAGS" >&6 - - # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. -@@ -28895,7 +28896,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}:28898: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 -+echo "${as_me:-configure}:28899: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 - - fi - -@@ -28922,7 +28923,7 @@ - - # This is used for the *-config script and *.pc data files. - --echo "$as_me:28925: checking for linker search path" >&5 -+echo "$as_me:28926: checking for linker search path" >&5 - echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 - if test "${cf_cv_ld_searchpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -28970,7 +28971,7 @@ - cf_pathlist="$cf_pathlist /lib /usr/lib" - ;; - (*) -- { echo "$as_me:28973: WARNING: problem with Solaris architecture" >&5 -+ { echo "$as_me:28974: WARNING: problem with Solaris architecture" >&5 - echo "$as_me: WARNING: problem with Solaris architecture" >&2;} - ;; - esac -@@ -29011,7 +29012,7 @@ - test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib - - fi --echo "$as_me:29014: result: $cf_cv_ld_searchpath" >&5 -+echo "$as_me:29015: result: $cf_cv_ld_searchpath" >&5 - echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 - - LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` -@@ -29101,7 +29102,7 @@ - : "${CONFIG_STATUS=./config.status}" - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:29104: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:29105: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >"$CONFIG_STATUS" <<_ACEOF - #! $SHELL -@@ -29280,7 +29281,7 @@ - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header -- { { echo "$as_me:29283: error: ambiguous option: $1 -+ { { echo "$as_me:29284: 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;} -@@ -29299,7 +29300,7 @@ - ac_need_defaults=false;; - - # This is an error. -- -*) { { echo "$as_me:29302: error: unrecognized option: $1 -+ -*) { { echo "$as_me:29303: 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;} -@@ -29425,7 +29426,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:29428: error: invalid argument: $ac_config_target" >&5 -+ *) { { echo "$as_me:29429: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -@@ -29937,7 +29938,7 @@ - esac - - if test x"$ac_file" != x-; then -- { echo "$as_me:29940: creating $ac_file" >&5 -+ { echo "$as_me:29941: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -@@ -29955,7 +29956,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:29958: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:29959: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -29968,7 +29969,7 @@ - echo "$srcdir/$f" - else - # /dev/null tree -- { { echo "$as_me:29971: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:29972: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -29984,7 +29985,7 @@ - if test -n "$ac_seen"; then - ac_used=`grep '@datarootdir@' "$ac_item"` - if test -z "$ac_used"; then -- { echo "$as_me:29987: WARNING: datarootdir was used implicitly but not set: -+ { echo "$as_me:29988: 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;} -@@ -29993,7 +29994,7 @@ - fi - ac_seen=`grep '${datarootdir}' "$ac_item"` - if test -n "$ac_seen"; then -- { echo "$as_me:29996: WARNING: datarootdir was used explicitly but not set: -+ { echo "$as_me:29997: 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;} -@@ -30030,7 +30031,7 @@ - ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` - if test -z "$ac_init"; then - ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` -- { echo "$as_me:30033: WARNING: Variable $ac_name is used but was not set: -+ { echo "$as_me:30034: 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;} -@@ -30041,7 +30042,7 @@ - ${EGREP-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:30044: WARNING: Some variables may not be substituted: -+ { echo "$as_me:30045: WARNING: Some variables may not be substituted: - $ac_seen" >&5 - echo "$as_me: WARNING: Some variables may not be substituted: - $ac_seen" >&2;} -@@ -30090,7 +30091,7 @@ - * ) ac_file_in=$ac_file.in ;; - esac - -- test x"$ac_file" != x- && { echo "$as_me:30093: creating $ac_file" >&5 -+ test x"$ac_file" != x- && { echo "$as_me:30094: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the -@@ -30101,7 +30102,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:30104: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:30105: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -30114,7 +30115,7 @@ - echo "$srcdir/$f" - else - # /dev/null tree -- { { echo "$as_me:30117: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:30118: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -30172,7 +30173,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:30175: $ac_file is unchanged" >&5 -+ { echo "$as_me:30176: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -@@ -30559,7 +30560,7 @@ - (cygdll|msysdll|mingw|msvcdll) - test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 - --echo "${as_me:-configure}:30562: testing overriding CXX_MODEL to SHARED ..." 1>&5 -+echo "${as_me:-configure}:30563: testing overriding CXX_MODEL to SHARED ..." 1>&5 - - with_shared_cxx=yes - ;; -Index: dist.mk -Prereq: 1.1464 ---- ncurses-6.3-20220129+/dist.mk 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/dist.mk 2022-02-05 11:10:39.000000000 +0000 -@@ -26,7 +26,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.1464 2022/01/29 12:21:50 tom Exp $ -+# $Id: dist.mk,v 1.1465 2022/02/05 11:10:39 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -38,7 +38,7 @@ - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 6 - NCURSES_MINOR = 3 --NCURSES_PATCH = 20220129 -+NCURSES_PATCH = 20220205 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -Index: include/MKkey_defs.sh -Prereq: 1.21 ---- ncurses-6.3-20220129+/include/MKkey_defs.sh 2020-08-17 10:45:33.000000000 +0000 -+++ ncurses-6.3-20220205/include/MKkey_defs.sh 2022-02-05 20:38:31.000000000 +0000 -@@ -1,7 +1,7 @@ - #! /bin/sh --# $Id: MKkey_defs.sh,v 1.21 2020/08/17 10:45:33 tom Exp $ -+# $Id: MKkey_defs.sh,v 1.22 2022/02/05 20:38:31 tom Exp $ - ############################################################################## --# Copyright 2019,2020 Thomas E. Dickey # -+# Copyright 2019-2020,2022 Thomas E. Dickey # - # Copyright 2001-2013,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -44,7 +44,8 @@ - pass2=pass2_$$ - pass3=pass3_$$ - pass4=pass4_$$ --trap 'rm -f $data pass[1234]_$$' EXIT INT QUIT TERM HUP -+trap 'rm -f $data pass[1234]_$$; exit 1' 1 2 3 15 -+trap 'rm -f $data pass[1234]_$$' 0 - - # change repeated tabs (used for readability) to single tabs (needed to make - # awk see the right field alignment of the corresponding columns): -Index: include/edit_cfg.sh -Prereq: 1.14 ---- ncurses-6.3-20220129+/include/edit_cfg.sh 2020-02-02 23:34:34.000000000 +0000 -+++ ncurses-6.3-20220205/include/edit_cfg.sh 2022-02-05 20:38:40.000000000 +0000 -@@ -1,7 +1,7 @@ - #!/bin/sh --# $Id: edit_cfg.sh,v 1.14 2020/02/02 23:34:34 tom Exp $ -+# $Id: edit_cfg.sh,v 1.15 2022/02/05 20:38:40 tom Exp $ - ############################################################################## --# Copyright 2020 Thomas E. Dickey # -+# Copyright 2020,2022 Thomas E. Dickey # - # Copyright 1998-2001,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -39,7 +39,8 @@ - # - BAK=save$$ - TMP=edit$$ --trap "rm -f $BAK $TMP" 0 1 2 3 15 -+trap "rm -f $BAK $TMP; exit 1" 1 2 3 15 -+trap "rm -f $BAK $TMP" 0 - for name in \ - HAVE_TCGETATTR \ - HAVE_TERMIOS_H \ -Index: man/make_sed.sh -Prereq: 1.13 ---- ncurses-6.3-20220129+/man/make_sed.sh 2021-12-25 17:39:16.000000000 +0000 -+++ ncurses-6.3-20220205/man/make_sed.sh 2022-02-05 20:38:54.000000000 +0000 -@@ -1,7 +1,7 @@ - #!/bin/sh --# $Id: make_sed.sh,v 1.13 2021/12/25 17:39:16 tom Exp $ -+# $Id: make_sed.sh,v 1.14 2022/02/05 20:38:54 tom Exp $ - ############################################################################## --# Copyright 2020,2021 Thomas E. Dickey # -+# Copyright 2020-2021,2022 Thomas E. Dickey # - # Copyright 1998-2005,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -46,7 +46,8 @@ - SCRIPT=script$$ - RESULT=result$$ - rm -f $UPPER $SCRIPT $RESULT --trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0 1 2 3 15 -+trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT; exit 1" 1 2 3 15 -+trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0 - fgrep -v \# $1 | \ - sed -e 's/[ ][ ]*/ /g' >$INPUT - -Index: ncurses/base/MKlib_gen.sh -Prereq: 1.71 ---- ncurses-6.3-20220129+/ncurses/base/MKlib_gen.sh 2021-09-26 22:08:53.000000000 +0000 -+++ ncurses-6.3-20220205/ncurses/base/MKlib_gen.sh 2022-02-05 20:39:10.000000000 +0000 -@@ -2,10 +2,10 @@ - # - # MKlib_gen.sh -- generate sources from curses.h macro definitions - # --# ($Id: MKlib_gen.sh,v 1.71 2021/09/26 22:08:53 tom Exp $) -+# ($Id: MKlib_gen.sh,v 1.72 2022/02/05 20:39:10 tom Exp $) - # - ############################################################################## --# Copyright 2018-2020,2021 Thomas E. Dickey # -+# Copyright 2018-2021,2022 Thomas E. Dickey # - # Copyright 1998-2016,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -101,7 +101,8 @@ - AW1=awk1_${PID}.awk - AW2=awk2_${PID}.awk - TMP=gen__${PID}.c --trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 3 15 -+trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP; exit 1" 1 2 3 15 -+trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 - - ALL=$USE - if test "$USE" = implemented ; then -Index: ncurses/tinfo/MKkeys_list.sh -Prereq: 1.7 ---- ncurses-6.3-20220129+/ncurses/tinfo/MKkeys_list.sh 2020-02-02 23:34:34.000000000 +0000 -+++ ncurses-6.3-20220205/ncurses/tinfo/MKkeys_list.sh 2022-02-05 20:40:20.000000000 +0000 -@@ -1,7 +1,7 @@ - #! /bin/sh --# $Id: MKkeys_list.sh,v 1.7 2020/02/02 23:34:34 tom Exp $ -+# $Id: MKkeys_list.sh,v 1.8 2022/02/05 20:40:20 tom Exp $ - ############################################################################## --# Copyright 2019,2020 Thomas E. Dickey # -+# Copyright 2019-2020,2022 Thomas E. Dickey # - # Copyright 2001-2003,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -44,7 +44,8 @@ - fi - - data=data$$ --trap 'rm -f $data' EXIT INT QUIT TERM HUP -+trap 'rm -f $data; exit 1' 1 2 3 15 -+trap 'rm -f $data' 0 - cat $DATA | sed -e 's/[ ][ ]*/ /g' >$data - - cat <<EOF -Index: ncurses/tty/MKexpanded.sh -Prereq: 1.23 ---- ncurses-6.3-20220129+/ncurses/tty/MKexpanded.sh 2021-06-17 21:26:02.000000000 +0000 -+++ ncurses-6.3-20220205/ncurses/tty/MKexpanded.sh 2022-02-05 17:27:18.000000000 +0000 -@@ -30,7 +30,7 @@ - # - # Author: Thomas E. Dickey, 1997-on - # --# $Id: MKexpanded.sh,v 1.23 2021/06/17 21:26:02 tom Exp $ -+# $Id: MKexpanded.sh,v 1.24 2022/02/05 17:27:18 tom Exp $ - # - # Script to generate 'expanded.c', a dummy source that contains functions - # corresponding to complex macros used in this library. By making functions, -@@ -49,7 +49,8 @@ - fi - - TMP=gen$$.c --trap "rm -f $TMP" EXIT INT QUIT TERM HUP -+trap "rm -f $TMP; exit 1" 1 2 3 15 -+trap "rm -f $TMP" 0 - - cat <<EOF - /* generated by MKexpanded.sh */ -Index: package/debian-mingw/changelog ---- ncurses-6.3-20220129+/package/debian-mingw/changelog 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/debian-mingw/changelog 2022-02-05 11:10:39.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.3+20220129) unstable; urgency=low -+ncurses6 (6.3+20220205) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jan 2022 07:21:50 -0500 -+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Feb 2022 06:10:39 -0500 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian-mingw64/changelog ---- ncurses-6.3-20220129+/package/debian-mingw64/changelog 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/debian-mingw64/changelog 2022-02-05 11:10:39.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.3+20220129) unstable; urgency=low -+ncurses6 (6.3+20220205) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jan 2022 07:21:50 -0500 -+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Feb 2022 06:10:39 -0500 - - ncurses6 (5.9-20131005) unstable; urgency=low - -Index: package/debian/changelog ---- ncurses-6.3-20220129+/package/debian/changelog 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/debian/changelog 2022-02-05 11:10:39.000000000 +0000 -@@ -1,8 +1,8 @@ --ncurses6 (6.3+20220129) unstable; urgency=low -+ncurses6 (6.3+20220205) unstable; urgency=low - - * latest weekly patch - -- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jan 2022 07:21:49 -0500 -+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Feb 2022 06:10:39 -0500 - - ncurses6 (5.9-20120608) unstable; urgency=low - -Index: package/mingw-ncurses.nsi -Prereq: 1.504 ---- ncurses-6.3-20220129+/package/mingw-ncurses.nsi 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/mingw-ncurses.nsi 2022-02-05 11:10:39.000000000 +0000 -@@ -1,4 +1,4 @@ --; $Id: mingw-ncurses.nsi,v 1.504 2022/01/29 12:21:50 tom Exp $
-+; $Id: mingw-ncurses.nsi,v 1.505 2022/02/05 11:10:39 tom Exp $
-
- ; TODO add examples
- ; TODO bump ABI to 6
-@@ -10,7 +10,7 @@ - !define VERSION_MAJOR "6"
- !define VERSION_MINOR "3"
- !define VERSION_YYYY "2022"
--!define VERSION_MMDD "0129"
-+!define VERSION_MMDD "0205"
- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
-
- !define MY_ABI "5"
-Index: package/mingw-ncurses.spec ---- ncurses-6.3-20220129+/package/mingw-ncurses.spec 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/mingw-ncurses.spec 2022-02-05 11:10:39.000000000 +0000 -@@ -3,7 +3,7 @@ - Summary: shared libraries for terminal handling - Name: mingw32-ncurses6 - Version: 6.3 --Release: 20220129 -+Release: 20220205 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: package/ncurses.spec ---- ncurses-6.3-20220129+/package/ncurses.spec 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/ncurses.spec 2022-02-05 11:10:39.000000000 +0000 -@@ -1,7 +1,7 @@ - Summary: shared libraries for terminal handling - Name: ncurses6 - Version: 6.3 --Release: 20220129 -+Release: 20220205 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: package/ncursest.spec ---- ncurses-6.3-20220129+/package/ncursest.spec 2022-01-29 12:21:50.000000000 +0000 -+++ ncurses-6.3-20220205/package/ncursest.spec 2022-02-05 11:10:39.000000000 +0000 -@@ -1,7 +1,7 @@ - Summary: Curses library with POSIX thread support. - Name: ncursest6 - Version: 6.3 --Release: 20220129 -+Release: 20220205 - License: X11 - Group: Development/Libraries - Source: ncurses-%{version}-%{release}.tgz -Index: progs/MKtermsort.sh -Prereq: 1.16 ---- ncurses-6.3-20220129+/progs/MKtermsort.sh 2021-04-18 20:12:50.000000000 +0000 -+++ ncurses-6.3-20220205/progs/MKtermsort.sh 2022-02-05 20:39:41.000000000 +0000 -@@ -1,10 +1,10 @@ - #!/bin/sh --# $Id: MKtermsort.sh,v 1.16 2021/04/18 20:12:50 tom Exp $ -+# $Id: MKtermsort.sh,v 1.17 2022/02/05 20:39:41 tom Exp $ - # - # MKtermsort.sh -- generate indirection vectors for the various sort methods - # - ############################################################################## --# Copyright 2020,2021 Thomas E. Dickey # -+# Copyright 2020-2021,2022 Thomas E. Dickey # - # Copyright 1998-2015,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -47,7 +47,7 @@ - DATA=${2-../include/Caps} - - data=data$$ --trap 'rm -f $data' 1 2 3 15 -+trap 'rm -f $data; exit 1' 1 2 3 15 - sed -e 's/[ ][ ]*/ /g' < "$DATA" >$data - DATA=$data - -Index: progs/capconvert -Prereq: 1.10 ---- ncurses-6.3-20220129+/progs/capconvert 2021-09-04 10:55:04.000000000 +0000 -+++ ncurses-6.3-20220205/progs/capconvert 2022-02-05 20:39:49.000000000 +0000 -@@ -1,6 +1,6 @@ - #!/bin/sh - ############################################################################## --# Copyright 2019-2020,2021 Thomas E. Dickey # -+# Copyright 2019-2021,2022 Thomas E. Dickey # - # Copyright 1998-2011,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -27,7 +27,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: capconvert,v 1.10 2021/09/04 10:55:04 tom Exp $ -+# $Id: capconvert,v 1.11 2022/02/05 20:39:49 tom Exp $ - # - # capconvert -- automated conversion from termcap to terminfo - # -@@ -206,7 +206,8 @@ - # - # Kluge alert: we compile terminfo.src in two pieces because a lot of machines - # with < 16MB RAM choke on tic's core-hog habits. --trap "rm -f tsplit$$.*" EXIT INT QUIT TERM HUP -+trap "rm -f tsplit$$.*; exit 1" 1 2 3 15 -+trap "rm -f tsplit$$.*" 0 - sed -n $master \ - -e '1,/SPLIT HERE/w 'tsplit$$.01 \ - -e '/SPLIT HERE/,$w 'tsplit$$.02 \ -Index: test/make-tar.sh -Prereq: 1.18 ---- ncurses-6.3-20220129+/test/make-tar.sh 2021-10-12 21:12:16.000000000 +0000 -+++ ncurses-6.3-20220205/test/make-tar.sh 2022-02-05 17:57:45.000000000 +0000 -@@ -1,7 +1,7 @@ - #!/bin/sh --# $Id: make-tar.sh,v 1.18 2021/10/12 21:12:16 tom Exp $ -+# $Id: make-tar.sh,v 1.19 2022/02/05 17:57:45 tom Exp $ - ############################################################################## --# Copyright 2019-2020,2021 Thomas E. Dickey # -+# Copyright 2019-2021,2022 Thomas E. Dickey # - # Copyright 2010-2015,2017 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -84,7 +84,8 @@ - SOURCE=`cd ..;pwd` - - BUILD=$TMPDIR/make-tar$$ --trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP -+trap "cd /; rm -rf $BUILD; exit 0" 1 2 3 15 -+trap "cd /; rm -rf $BUILD; exit 0" 0 - - umask 077 - if ! ( mkdir $BUILD ) -Index: test/picsmap.c -Prereq: 1.139 ---- ncurses-6.3-20220129+/test/picsmap.c 2021-05-08 15:56:05.000000000 +0000 -+++ ncurses-6.3-20220205/test/picsmap.c 2022-02-06 01:44:34.000000000 +0000 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright 2018-2020,2021 Thomas E. Dickey * -+ * Copyright 2018-2021,2022 Thomas E. Dickey * - * Copyright 2017,2018 Free Software Foundation, Inc. * - * * - * Permission is hereby granted, free of charge, to any person obtaining a * -@@ -27,7 +27,7 @@ - * authorization. * - ****************************************************************************/ - /* -- * $Id: picsmap.c,v 1.139 2021/05/08 15:56:05 tom Exp $ -+ * $Id: picsmap.c,v 1.142 2022/02/06 01:44:34 tom Exp $ - * - * Author: Thomas E. Dickey - * -@@ -797,6 +797,7 @@ - int ch; - int *ip; - char *cp; -+ float *fp; - long lv; - - va_start(ap, pattern); -@@ -810,10 +811,13 @@ - continue; - } - /* %c, %d, %s are like sscanf except for special treatment of blanks */ -- if (ch == '%' && *pattern != '\0' && strchr("cdnsx", *pattern)) { -+ if (ch == '%' && *pattern != '\0' && strchr("%cdnfsx", *pattern)) { - bool found = FALSE; - ch = *pattern++; - switch (ch) { -+ case '%': -+ source++; -+ break; - case 'c': - cp = va_arg(ap, char *); - do { -@@ -832,6 +836,29 @@ - goto finish; - } - break; -+ case 'f': -+ /* floating point for pixels... */ -+ fp = va_arg(ap, float *); -+ lv = strtol(source, &cp, 10); -+ if (cp == 0 || cp == source) -+ goto finish; -+ *fp = (float) lv; -+ source = cp; -+ if (*source == '.') { -+ lv = strtol(++source, &cp, 10); -+ if (cp == 0 || cp == source) -+ goto finish; -+ { -+ float scale = 1.0f; -+ int digits = (int) (cp - source); -+ while (digits-- > 0) { -+ scale *= 10.0f; -+ } -+ *fp += (float) lv / scale; -+ } -+ source = cp; -+ } -+ break; - case 'n': - /* not really sscanf... */ - limit = *va_arg(ap, int *); -@@ -1346,11 +1373,17 @@ - break; - } - } else { -- /* subsequent lines begin "col,row: (r,g,b,a) #RGB" */ -+ /* -+ * subsequent lines begin "col,row: (r,g,b,a) #RGB". -+ * Those r/g/b could be integers (0..255) or float-percentages. -+ */ - int r, g, b, nocolor; -+ float rf, gf, bf; - unsigned check; - char *t; - char *s = t = strchr(buffer, '#'); -+ bool matched = FALSE; -+ bool blurred = FALSE; - - if (s != 0) { - /* after the "#RGB", there are differences - just ignore */ -@@ -1363,14 +1396,30 @@ - &col, &row, - &r, &g, &b, &nocolor, - &check)) { -+ matched = TRUE; -+ } else if (match_c(buffer, -+ "%d,%d: (%f%%,%f%%,%f%%,%d) #%x ", -+ &col, &row, -+ &rf, &gf, &bf, &nocolor, -+ &check)) { -+ matched = TRUE; -+ blurred = TRUE; /* 6.9.11 scaling is broken... */ -+#define fp_fix(n) (int) (MaxRGB * (((n) > 100.0 ? 100.0 : (n)) / 100.0)) -+ r = fp_fix(rf); -+ g = fp_fix(gf); -+ b = fp_fix(bf); -+ } -+ if (matched) { - int which, c; - - if ((s - t) > 8) /* 6 hex digits vs 8 */ - check /= 256; -- if (r > MaxRGB || -- g > MaxRGB || -- b > MaxRGB || -- check != (unsigned) ((r << 16) | (g << 8) | b)) { -+ if (blurred) { -+ /* revisit this when ImageMagick is fixed */ -+ } else if (r > MaxRGB || -+ g > MaxRGB || -+ b > MaxRGB || -+ check != (unsigned) ((r << 16) | (g << 8) | b)) { - okay = FALSE; - break; - } -Index: test/savescreen.sh -Prereq: 1.6 ---- ncurses-6.3-20220129+/test/savescreen.sh 2020-02-02 23:34:34.000000000 +0000 -+++ ncurses-6.3-20220205/test/savescreen.sh 2022-02-05 17:58:06.000000000 +0000 -@@ -1,6 +1,6 @@ - #!/bin/sh - ############################################################################## --# Copyright 2020 Thomas E. Dickey # -+# Copyright 2020,2022 Thomas E. Dickey # - # Copyright 2007-2009,2018 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # -@@ -27,7 +27,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: savescreen.sh,v 1.6 2020/02/02 23:34:34 tom Exp $ -+# $Id: savescreen.sh,v 1.7 2022/02/05 17:58:06 tom Exp $ - # - # Use this script to exercise "savescreen". - # It starts by generating a series of temporary-filenames, which are passed -@@ -37,7 +37,8 @@ - - # "mktemp -d" would be preferable, but is not standard. - MY_DIR=$TMPDIR/savescreen$$ --trap "rm -rf $MY_DIR" EXIT INT QUIT HUP -+trap "rm -rf $MY_DIR; exit 1" 1 2 3 -+trap "rm -rf $MY_DIR" 0 - umask 077 - mkdir $MY_DIR || exit 1 - |