summaryrefslogtreecommitdiff
path: root/system/ncurses/ncurses-6.3-20220416.patch
diff options
context:
space:
mode:
Diffstat (limited to 'system/ncurses/ncurses-6.3-20220416.patch')
-rw-r--r--system/ncurses/ncurses-6.3-20220416.patch12968
1 files changed, 12968 insertions, 0 deletions
diff --git a/system/ncurses/ncurses-6.3-20220416.patch b/system/ncurses/ncurses-6.3-20220416.patch
new file mode 100644
index 000000000..89dcc90f8
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220416.patch
@@ -0,0 +1,12968 @@
+# ncurses 6.3 - patch 20220416 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# https://invisible-island.net/archives/ncurses/
+# https://invisible-mirror.net/archives/ncurses/
+# ftp://ftp.invisible-island.net/ncurses/
+# https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# https://invisible-island.net/archives/ncurses/6.3
+# https://invisible-mirror.net/archives/ncurses/6.3
+# ftp://ftp.invisible-island.net/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220416.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created Sun Apr 17 00:27:48 UTC 2022
+# ------------------------------------------------------------------------------
+# NEWS | 10
+# VERSION | 2
+# configure | 3501 ++++++++++++++++----------------
+# configure.in | 18
+# dist.mk | 4
+# doc/html/man/adacurses6-config.1.html | 2
+# doc/html/man/captoinfo.1m.html | 2
+# doc/html/man/clear.1.html | 2
+# doc/html/man/curs_attr.3x.html | 61
+# doc/html/man/form.3x.html | 2
+# doc/html/man/infocmp.1m.html | 2
+# doc/html/man/infotocap.1m.html | 2
+# doc/html/man/menu.3x.html | 2
+# doc/html/man/ncurses.3x.html | 2
+# doc/html/man/ncurses6-config.1.html | 2
+# doc/html/man/panel.3x.html | 2
+# doc/html/man/tabs.1.html | 2
+# doc/html/man/terminfo.5.html | 2
+# doc/html/man/tic.1m.html | 2
+# doc/html/man/toe.1m.html | 2
+# doc/html/man/tput.1.html | 2
+# doc/html/man/tset.1.html | 2
+# man/curs_attr.3x | 29
+# ncurses/base/lib_wattron.c | 8
+# ncurses/tinfo/alloc_entry.c | 12
+# ncurses/tinfo/read_entry.c | 21
+# 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
+# test/README | 4
+# test/clip_printw.c | 5
+# test/color_content.c | 5
+# test/color_set.c | 5
+# test/demo_altkeys.c | 5
+# test/demo_defkey.c | 5
+# test/demo_keyok.c | 5
+# test/dots_xcurses.c | 5
+# test/extended_color.c | 5
+# test/pair_content.c | 5
+# test/picsmap.c | 3
+# test/test_unget_wch.c | 3
+# test/test_vid_puts.c | 5
+# 46 files changed, 1931 insertions(+), 1849 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq: 1.3794
+--- ncurses-6.3-20220409+/NEWS 2022-04-09 23:04:59.000000000 +0000
++++ ncurses-6.3-20220416/NEWS 2022-04-16 23:31:41.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3794 2022/04/09 23:04:59 tom Exp $
++-- $Id: NEWS,v 1.3796 2022/04/16 23:31:41 tom Exp $
+ -------------------------------------------------------------------------------
+
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,14 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+
++20220416
++ + add a limit-check to guard against corrupt terminfo data
++ (report/testcase by NCNIPC of China).
++ + add check/warning in configure script if option --with-xterm-kbs is
++ missing or inconsistent (Arch #74379).
++ + add setlocale call to several test-programs.
++ + allow extended-color number in opts parameter of wattr_on.
++
+ 20220409
+ + add test/test_unget_wch.c
+
+Index: VERSION
+--- ncurses-6.3-20220409+/VERSION 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/VERSION 2022-04-16 12:59:30.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.3 20220409
++5:0:10 6.3 20220416
+Index: configure
+--- ncurses-6.3-20220409+/configure 2022-03-05 22:21:11.000000000 +0000
++++ ncurses-6.3-20220416/configure 2022-04-17 00:27:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.742 .
++# From configure.in Revision: 1.744 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20210509.
+ #
+@@ -9003,7 +9003,16 @@
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+
+-echo "$as_me:9006: checking if xterm backspace sends BS or DEL" >&5
++case $host_os in
++(*linux-gnu|*cygwin|*mingw32|*msys)
++ want_xterm_kbs=DEL
++ ;;
++(*)
++ want_xterm_kbs=BS
++ ;;
++esac
++
++echo "$as_me:9015: checking if xterm backspace sends BS or DEL" >&5
+ echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
+
+ # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
+@@ -9024,17 +9033,23 @@
+ with_xterm_kbs=$withval
+ ;;
+ esac
+-echo "$as_me:9027: result: $with_xterm_kbs" >&5
++echo "$as_me:9036: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+
++if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
++then
++ { echo "$as_me:9042: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5
++echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&2;}
++fi
++
+ MAKE_TERMINFO=
+ if test "$use_database" = no ; then
+ TERMINFO="${datadir}/terminfo"
+ MAKE_TERMINFO="#"
+ else
+
+-echo "$as_me:9037: checking for list of terminfo directories" >&5
++echo "$as_me:9052: checking for list of terminfo directories" >&5
+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
+
+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
+@@ -9074,7 +9089,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9077: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:9092: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9097,7 +9112,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9100: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9115: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9106,13 +9121,13 @@
+
+ case "x$TERMINFO" in
+ x???:*)
+- { echo "$as_me:9109: WARNING: ignoring non-directory/file TERMINFO value" >&5
++ { echo "$as_me:9124: WARNING: ignoring non-directory/file TERMINFO value" >&5
+ echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
+ unset TERMINFO
+ ;;
+ esac
+
+-echo "$as_me:9115: checking for default terminfo directory" >&5
++echo "$as_me:9130: checking for default terminfo directory" >&5
+ echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
+
+ # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
+@@ -9148,7 +9163,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9151: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:9166: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9157,7 +9172,7 @@
+ fi
+ eval TERMINFO="$withval"
+
+-echo "$as_me:9160: result: $TERMINFO" >&5
++echo "$as_me:9175: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -9168,7 +9183,7 @@
+
+ ### use option --disable-big-core to make tic run on small machines
+ ### We need 4Mb, check if we can allocate 50% more than that.
+-echo "$as_me:9171: checking if big-core option selected" >&5
++echo "$as_me:9186: checking if big-core option selected" >&5
+ echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
+
+ # Check whether --enable-big-core or --disable-big-core was given.
+@@ -9180,7 +9195,7 @@
+ with_big_core=no
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9183 "configure"
++#line 9198 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -9194,15 +9209,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9212: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9200: \$? = $ac_status" >&5
++ echo "$as_me:9215: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9202: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9205: \$? = $ac_status" >&5
++ echo "$as_me:9220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_big_core=yes
+ else
+@@ -9214,7 +9229,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9217: result: $with_big_core" >&5
++echo "$as_me:9232: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9224,7 +9239,7 @@
+ ### ISO C only guarantees 512-char strings, we have tables which load faster
+ ### when constructed using "big" strings. More than the C compiler, the awk
+ ### program is a limit on most vendor UNIX systems. Check that we can build.
+-echo "$as_me:9227: checking if big-strings option selected" >&5
++echo "$as_me:9242: checking if big-strings option selected" >&5
+ echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
+
+ # Check whether --enable-big-strings or --disable-big-strings was given.
+@@ -9248,14 +9263,14 @@
+ esac
+
+ fi;
+-echo "$as_me:9251: result: $with_big_strings" >&5
++echo "$as_me:9266: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+
+ USE_BIG_STRINGS=0
+ test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
+
+ ### use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:9258: checking if you want termcap-fallback support" >&5
++echo "$as_me:9273: checking if you want termcap-fallback support" >&5
+ echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
+
+ # Check whether --enable-termcap or --disable-termcap was given.
+@@ -9265,14 +9280,14 @@
+ else
+ with_termcap=no
+ fi;
+-echo "$as_me:9268: result: $with_termcap" >&5
++echo "$as_me:9283: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+
+ NCURSES_USE_TERMCAP=0
+ if test "x$with_termcap" != "xyes" ; then
+ if test "$use_database" = no ; then
+ if test -z "$with_fallback" ; then
+- { { echo "$as_me:9275: error: You have disabled the database w/o specifying fallbacks" >&5
++ { { echo "$as_me:9290: error: You have disabled the database w/o specifying fallbacks" >&5
+ echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9285,13 +9300,13 @@
+ else
+
+ if test "$with_ticlib" != no ; then
+- { { echo "$as_me:9288: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++ { { echo "$as_me:9303: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ NCURSES_USE_TERMCAP=1
+- echo "$as_me:9294: checking for list of termcap files" >&5
++ echo "$as_me:9309: checking for list of termcap files" >&5
+ echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
+
+ # Check whether --with-termpath or --without-termpath was given.
+@@ -9331,7 +9346,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9334: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:9349: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9354,7 +9369,7 @@
+ ;;
+ esac
+
+- echo "$as_me:9357: result: $TERMPATH" >&5
++ echo "$as_me:9372: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -9362,7 +9377,7 @@
+ EOF
+
+ ### use option --enable-getcap to use a hacked getcap for reading termcaps
+- echo "$as_me:9365: checking if fast termcap-loader is needed" >&5
++ echo "$as_me:9380: checking if fast termcap-loader is needed" >&5
+ echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
+
+ # Check whether --enable-getcap or --disable-getcap was given.
+@@ -9372,14 +9387,14 @@
+ else
+ with_getcap=no
+ fi;
+- echo "$as_me:9375: result: $with_getcap" >&5
++ echo "$as_me:9390: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ test "x$with_getcap" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+
+- echo "$as_me:9382: checking if translated termcaps will be cached in ~/.terminfo" >&5
++ echo "$as_me:9397: checking if translated termcaps will be cached in ~/.terminfo" >&5
+ echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
+
+ # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
+@@ -9389,7 +9404,7 @@
+ else
+ with_getcap_cache=no
+ fi;
+- echo "$as_me:9392: result: $with_getcap_cache" >&5
++ echo "$as_me:9407: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9399,7 +9414,7 @@
+ fi
+
+ ### Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:9402: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:9417: checking if ~/.terminfo is wanted" >&5
+ echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
+
+ # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
+@@ -9409,14 +9424,14 @@
+ else
+ with_home_terminfo=yes
+ fi;
+-echo "$as_me:9412: result: $with_home_terminfo" >&5
++echo "$as_me:9427: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "x$with_home_terminfo" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+
+-echo "$as_me:9419: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:9434: checking if you want to permit root to use ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
+
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9426,14 +9441,14 @@
+ else
+ with_root_environ=yes
+ fi;
+-echo "$as_me:9429: result: $with_root_environ" >&5
++echo "$as_me:9444: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ENVIRON 1
+ EOF
+
+-echo "$as_me:9436: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:9451: checking if you want to permit setuid programs to access all files" >&5
+ echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
+
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9443,7 +9458,7 @@
+ else
+ with_root_access=yes
+ fi;
+-echo "$as_me:9446: result: $with_root_access" >&5
++echo "$as_me:9461: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9458,23 +9473,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9461: checking for $ac_header" >&5
++echo "$as_me:9476: 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 9467 "configure"
++#line 9482 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9471: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9486: \"$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:9477: \$? = $ac_status" >&5
++ echo "$as_me:9492: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9493,7 +9508,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9496: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9511: 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
+@@ -9508,13 +9523,13 @@
+ unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9511: checking for $ac_func" >&5
++echo "$as_me:9526: 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 9517 "configure"
++#line 9532 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9545,16 +9560,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9548: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9563: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9551: \$? = $ac_status" >&5
++ echo "$as_me:9566: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9554: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9569: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9557: \$? = $ac_status" >&5
++ echo "$as_me:9572: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -9564,7 +9579,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9567: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9582: 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
+@@ -9581,13 +9596,13 @@
+ symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9584: checking for $ac_func" >&5
++echo "$as_me:9599: 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 9590 "configure"
++#line 9605 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9618,16 +9633,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9636: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9624: \$? = $ac_status" >&5
++ echo "$as_me:9639: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9627: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9642: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9630: \$? = $ac_status" >&5
++ echo "$as_me:9645: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -9637,7 +9652,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9640: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9655: 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
+@@ -9648,7 +9663,7 @@
+ done
+
+ else
+- echo "$as_me:9651: checking if link/symlink functions work" >&5
++ echo "$as_me:9666: checking if link/symlink functions work" >&5
+ echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
+ if test "${cf_cv_link_funcs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9661,7 +9676,7 @@
+ eval 'ac_cv_func_'$cf_func'=error'
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9664 "configure"
++#line 9679 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -9699,15 +9714,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9717: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9705: \$? = $ac_status" >&5
++ echo "$as_me:9720: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9707: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9722: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9710: \$? = $ac_status" >&5
++ echo "$as_me:9725: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9725,7 +9740,7 @@
+ test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+
+ fi
+-echo "$as_me:9728: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9743: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ test "$ac_cv_func_link" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9745,7 +9760,7 @@
+ # soft links (symbolic links) are useful for some systems where hard links do
+ # not work, or to make it simpler to copy terminfo trees around.
+ if test "x$ac_cv_func_symlink" = xyes ; then
+- echo "$as_me:9748: checking if tic should use symbolic links" >&5
++ echo "$as_me:9763: checking if tic should use symbolic links" >&5
+ echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
+
+ # Check whether --enable-symlinks or --disable-symlinks was given.
+@@ -9755,21 +9770,21 @@
+ else
+ with_symlinks=no
+ fi;
+- echo "$as_me:9758: result: $with_symlinks" >&5
++ echo "$as_me:9773: result: $with_symlinks" >&5
+ echo "${ECHO_T}$with_symlinks" >&6
+ fi
+
+ # If we have hard links and did not choose to use soft links instead, there is
+ # no reason to make this choice optional - use the hard links.
+ if test "$with_symlinks" = no ; then
+- echo "$as_me:9765: checking if tic should use hard links" >&5
++ echo "$as_me:9780: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+ if test "x$ac_cv_func_link" = xyes ; then
+ with_links=yes
+ else
+ with_links=no
+ fi
+- echo "$as_me:9772: result: $with_links" >&5
++ echo "$as_me:9787: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+
+@@ -9785,7 +9800,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:9788: checking if you want broken-linker support code" >&5
++echo "$as_me:9803: checking if you want broken-linker support code" >&5
+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
+
+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
+@@ -9795,7 +9810,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:9798: result: $with_broken_linker" >&5
++echo "$as_me:9813: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -9809,7 +9824,7 @@
+ fi
+
+ ### use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9812: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9827: checking if tputs should process BSD-style prefix padding" >&5
+ echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
+
+ # Check whether --enable-bsdpad or --disable-bsdpad was given.
+@@ -9819,7 +9834,7 @@
+ else
+ with_bsdpad=no
+ fi;
+-echo "$as_me:9822: result: $with_bsdpad" >&5
++echo "$as_me:9837: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9838,14 +9853,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+
+-echo "$as_me:9841: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9856: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9848 "configure"
++#line 9863 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9864,16 +9879,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9882: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9870: \$? = $ac_status" >&5
++ echo "$as_me:9885: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9873: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9888: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9876: \$? = $ac_status" >&5
++ echo "$as_me:9891: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -9884,7 +9899,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:9887: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9902: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9929,14 +9944,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:9932: checking if this is the GNU C library" >&5
++echo "$as_me:9947: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9939 "configure"
++#line 9954 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9955,16 +9970,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9973: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9961: \$? = $ac_status" >&5
++ echo "$as_me:9976: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9964: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9979: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9967: \$? = $ac_status" >&5
++ echo "$as_me:9982: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -9975,7 +9990,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:9978: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9993: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9983,7 +9998,7 @@
+ # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ # was changed to help a little. newlib incorporated the change about 4
+ # years later.
+- echo "$as_me:9986: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:10001: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9995,7 +10010,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9998 "configure"
++#line 10013 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10014,16 +10029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10032: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10020: \$? = $ac_status" >&5
++ echo "$as_me:10035: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10023: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10038: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10026: \$? = $ac_status" >&5
++ echo "$as_me:10041: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -10035,12 +10050,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:10038: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10053: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+
+ if test "x$cf_cv_gnu_library_219" = xyes; then
+ cf_save="$CPPFLAGS"
+- echo "$as_me:10043: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:10058: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10145,7 +10160,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10148 "configure"
++#line 10163 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -10165,16 +10180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10183: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10171: \$? = $ac_status" >&5
++ echo "$as_me:10186: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10174: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10189: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10177: \$? = $ac_status" >&5
++ echo "$as_me:10192: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10185,7 +10200,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10188: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10203: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ else
+@@ -10194,14 +10209,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:10197: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:10212: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10204 "configure"
++#line 10219 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10216,16 +10231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10219: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10234: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10222: \$? = $ac_status" >&5
++ echo "$as_me:10237: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10225: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10240: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10228: \$? = $ac_status" >&5
++ echo "$as_me:10243: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -10332,7 +10347,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10335 "configure"
++#line 10350 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10347,16 +10362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10365: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10353: \$? = $ac_status" >&5
++ echo "$as_me:10368: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10356: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10371: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10359: \$? = $ac_status" >&5
++ echo "$as_me:10374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -10371,12 +10386,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10374: result: $cf_cv_gnu_source" >&5
++echo "$as_me:10389: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+
+ if test "$cf_cv_gnu_source" = yes
+ then
+- echo "$as_me:10379: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:10394: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10386,7 +10401,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10389 "configure"
++#line 10404 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10401,16 +10416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10404: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10419: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10407: \$? = $ac_status" >&5
++ echo "$as_me:10422: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10410: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10425: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10413: \$? = $ac_status" >&5
++ echo "$as_me:10428: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -10421,7 +10436,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10424: result: $cf_cv_default_source" >&5
++echo "$as_me:10439: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -10458,16 +10473,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:10461: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10476: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-echo "${as_me:-configure}:10467: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10482: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10470 "configure"
++#line 10485 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10482,16 +10497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10485: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10500: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10488: \$? = $ac_status" >&5
++ echo "$as_me:10503: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10491: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10506: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10494: \$? = $ac_status" >&5
++ echo "$as_me:10509: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -10512,7 +10527,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10515 "configure"
++#line 10530 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10527,16 +10542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10545: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10533: \$? = $ac_status" >&5
++ echo "$as_me:10548: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10551: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10539: \$? = $ac_status" >&5
++ echo "$as_me:10554: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10547,7 +10562,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:10550: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10565: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10555,10 +10570,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:10558: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10573: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10561 "configure"
++#line 10576 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10573,16 +10588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10591: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10579: \$? = $ac_status" >&5
++ echo "$as_me:10594: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10582: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10597: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10585: \$? = $ac_status" >&5
++ echo "$as_me:10600: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10598,7 +10613,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10601: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10616: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -10715,7 +10730,7 @@
+ # OpenBSD 6.x has broken locale support, both compile-time and runtime.
+ # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+ # Abusing the conformance level is a workaround.
+- { echo "$as_me:10718: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:10733: WARNING: this system does not provide usable locale support" >&5
+ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
+ cf_xopen_source="-D_BSD_SOURCE"
+ cf_XOPEN_SOURCE=700
+@@ -10747,14 +10762,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:10750: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10765: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10757 "configure"
++#line 10772 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10773,16 +10788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10776: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10791: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10779: \$? = $ac_status" >&5
++ echo "$as_me:10794: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10782: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10797: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10785: \$? = $ac_status" >&5
++ echo "$as_me:10800: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -10794,7 +10809,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10797 "configure"
++#line 10812 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10813,16 +10828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10831: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10819: \$? = $ac_status" >&5
++ echo "$as_me:10834: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10822: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10837: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10825: \$? = $ac_status" >&5
++ echo "$as_me:10840: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -10837,7 +10852,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10840: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10855: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10995,16 +11010,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:10998: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11013: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+-echo "${as_me:-configure}:11004: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11019: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11007 "configure"
++#line 11022 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11019,16 +11034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11037: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11025: \$? = $ac_status" >&5
++ echo "$as_me:11040: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11028: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11043: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11031: \$? = $ac_status" >&5
++ echo "$as_me:11046: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11049,7 +11064,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11052 "configure"
++#line 11067 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11064,16 +11079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11082: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11070: \$? = $ac_status" >&5
++ echo "$as_me:11085: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11073: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11088: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11076: \$? = $ac_status" >&5
++ echo "$as_me:11091: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11084,7 +11099,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11087: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11102: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11092,10 +11107,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11095: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11110: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11098 "configure"
++#line 11113 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11110,16 +11125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11113: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11128: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11116: \$? = $ac_status" >&5
++ echo "$as_me:11131: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11119: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11122: \$? = $ac_status" >&5
++ echo "$as_me:11137: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11135,7 +11150,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11138: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11153: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -11261,7 +11276,7 @@
+ test "$CFLAGS" != "$cf_old_cflag" || break
+ test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:11264: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11279: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -11273,7 +11288,7 @@
+ test "$CPPFLAGS" != "$cf_old_cflag" || break
+ test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:11276: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11291: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -11361,7 +11376,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:11364: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11379: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -11371,7 +11386,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:11374: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11389: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -11381,7 +11396,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+
+-echo "${as_me:-configure}:11384: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11399: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+ test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -11393,10 +11408,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:11396: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:11411: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11399 "configure"
++#line 11414 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11411,16 +11426,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11417: \$? = $ac_status" >&5
++ echo "$as_me:11432: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11420: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11435: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11423: \$? = $ac_status" >&5
++ echo "$as_me:11438: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -11429,12 +11444,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:11432: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:11447: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ if test "$cf_XOPEN_SOURCE_set" = yes
+ then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11437 "configure"
++#line 11452 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11449,16 +11464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11467: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11455: \$? = $ac_status" >&5
++ echo "$as_me:11470: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11458: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11473: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11461: \$? = $ac_status" >&5
++ echo "$as_me:11476: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -11469,19 +11484,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:11472: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:11487: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:11477: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11492: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11484 "configure"
++#line 11499 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -11500,16 +11515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11503: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11518: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11506: \$? = $ac_status" >&5
++ echo "$as_me:11521: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11509: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11524: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11512: \$? = $ac_status" >&5
++ echo "$as_me:11527: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11521,7 +11536,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11524 "configure"
++#line 11539 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -11540,16 +11555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11543: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11558: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11546: \$? = $ac_status" >&5
++ echo "$as_me:11561: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11549: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11564: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11552: \$? = $ac_status" >&5
++ echo "$as_me:11567: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11564,7 +11579,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11567: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11582: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11715,14 +11730,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:11718: checking if SIGWINCH is defined" >&5
++echo "$as_me:11733: checking if SIGWINCH is defined" >&5
+ echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
+ if test "${cf_cv_define_sigwinch+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11725 "configure"
++#line 11740 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -11737,23 +11752,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11755: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11743: \$? = $ac_status" >&5
++ echo "$as_me:11758: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11746: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11749: \$? = $ac_status" >&5
++ echo "$as_me:11764: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11756 "configure"
++#line 11771 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -11771,16 +11786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11789: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11777: \$? = $ac_status" >&5
++ echo "$as_me:11792: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11780: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11795: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11783: \$? = $ac_status" >&5
++ echo "$as_me:11798: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -11794,11 +11809,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11797: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11812: result: $cf_cv_define_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
+
+ if test "$cf_cv_define_sigwinch" = maybe ; then
+-echo "$as_me:11801: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11816: checking for actual SIGWINCH definition" >&5
+ echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
+ if test "${cf_cv_fixup_sigwinch+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11809,7 +11824,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11812 "configure"
++#line 11827 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -11831,16 +11846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11849: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11837: \$? = $ac_status" >&5
++ echo "$as_me:11852: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11840: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11855: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11843: \$? = $ac_status" >&5
++ echo "$as_me:11858: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -11854,7 +11869,7 @@
+ done
+
+ fi
+-echo "$as_me:11857: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11872: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11864,13 +11879,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:11867: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11882: checking for nl_langinfo and CODESET" >&5
+ echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+ if test "${am_cv_langinfo_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11873 "configure"
++#line 11888 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -11882,16 +11897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11900: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11888: \$? = $ac_status" >&5
++ echo "$as_me:11903: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11891: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11906: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11894: \$? = $ac_status" >&5
++ echo "$as_me:11909: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -11902,7 +11917,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11905: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11920: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -11916,7 +11931,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+
+-echo "$as_me:11919: checking if you want wide-character code" >&5
++echo "$as_me:11934: checking if you want wide-character code" >&5
+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -11926,7 +11941,7 @@
+ else
+ with_widec=no
+ fi;
+-echo "$as_me:11929: result: $with_widec" >&5
++echo "$as_me:11944: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11950,23 +11965,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11953: checking for $ac_header" >&5
++echo "$as_me:11968: 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 11959 "configure"
++#line 11974 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11978: \"$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:11969: \$? = $ac_status" >&5
++ echo "$as_me:11984: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11985,7 +12000,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11988: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12003: 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
+@@ -11995,14 +12010,14 @@
+ fi
+ done
+
+-echo "$as_me:11998: checking if wchar.h can be used as is" >&5
++echo "$as_me:12013: checking if wchar.h can be used as is" >&5
+ echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
+ if test "${cf_cv_wchar_h_okay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12005 "configure"
++#line 12020 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -12024,16 +12039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12030: \$? = $ac_status" >&5
++ echo "$as_me:12045: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12033: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12048: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12036: \$? = $ac_status" >&5
++ echo "$as_me:12051: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_h_okay=yes
+ else
+@@ -12043,16 +12058,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12046: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12061: result: $cf_cv_wchar_h_okay" >&5
+ echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
+
+ if test "$cf_cv_wchar_h_okay" = no
+ then
+
+-echo "$as_me:12052: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12067: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12055 "configure"
++#line 12070 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12068,16 +12083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12071: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12086: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12074: \$? = $ac_status" >&5
++ echo "$as_me:12089: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12077: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12092: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12080: \$? = $ac_status" >&5
++ echo "$as_me:12095: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -12086,16 +12101,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12089: result: $cf_result" >&5
++echo "$as_me:12104: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = yes ; then
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ elif test "x" != "x" ; then
+- echo "$as_me:12095: checking checking for compatible value versus " >&5
++ echo "$as_me:12110: checking checking for compatible value versus " >&5
+ echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12098 "configure"
++#line 12113 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12111,16 +12126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12129: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12117: \$? = $ac_status" >&5
++ echo "$as_me:12132: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12120: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12135: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12123: \$? = $ac_status" >&5
++ echo "$as_me:12138: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -12129,7 +12144,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12132: result: $cf_result" >&5
++ echo "$as_me:12147: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = no ; then
+ # perhaps we can override it - try...
+@@ -12139,7 +12154,7 @@
+
+ fi
+
+-echo "$as_me:12142: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12157: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12210,7 +12225,7 @@
+ cf_cv_wcwidth_graphics=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12213 "configure"
++#line 12228 "configure"
+ #include "confdefs.h"
+
+ #include <locale.h>
+@@ -12254,15 +12269,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12272: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12260: \$? = $ac_status" >&5
++ echo "$as_me:12275: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:12262: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12277: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12265: \$? = $ac_status" >&5
++ echo "$as_me:12280: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wcwidth_graphics=yes
+ else
+@@ -12275,7 +12290,7 @@
+ fi
+
+ fi
+-echo "$as_me:12278: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:12293: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+
+ test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -12286,13 +12301,13 @@
+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12289: checking for $ac_func" >&5
++echo "$as_me:12304: 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 12295 "configure"
++#line 12310 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12323,16 +12338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12326: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12341: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12329: \$? = $ac_status" >&5
++ echo "$as_me:12344: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12332: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12347: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12335: \$? = $ac_status" >&5
++ echo "$as_me:12350: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -12342,7 +12357,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12345: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:12360: 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
+@@ -12357,23 +12372,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12360: checking for $ac_header" >&5
++echo "$as_me:12375: 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 12366 "configure"
++#line 12381 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12370: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12385: \"$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:12376: \$? = $ac_status" >&5
++ echo "$as_me:12391: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12392,7 +12407,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12395: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12410: 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
+@@ -12402,7 +12417,7 @@
+ fi
+ done
+
+-echo "$as_me:12405: checking for multibyte character support" >&5
++echo "$as_me:12420: checking for multibyte character support" >&5
+ echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
+ if test "${cf_cv_utf8_lib+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12410,7 +12425,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12413 "configure"
++#line 12428 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -12428,16 +12443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12431: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12446: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12434: \$? = $ac_status" >&5
++ echo "$as_me:12449: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12437: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12452: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12440: \$? = $ac_status" >&5
++ echo "$as_me:12455: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -12449,12 +12464,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:12452: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12467: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12457 "configure"
++#line 12472 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -12467,16 +12482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12485: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12473: \$? = $ac_status" >&5
++ echo "$as_me:12488: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12476: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12491: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12479: \$? = $ac_status" >&5
++ echo "$as_me:12494: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -12490,7 +12505,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12493 "configure"
++#line 12508 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -12503,16 +12518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12521: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12509: \$? = $ac_status" >&5
++ echo "$as_me:12524: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12512: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12527: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12515: \$? = $ac_status" >&5
++ echo "$as_me:12530: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -12529,9 +12544,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:12532: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:12547: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:12534: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12549: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12622,7 +12637,7 @@
+ if test -d "$cf_cv_header_path_utf8" ; then
+ test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6
+
+-echo "${as_me:-configure}:12625: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12640: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -12630,7 +12645,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12633 "configure"
++#line 12648 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -12643,21 +12658,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12649: \$? = $ac_status" >&5
++ echo "$as_me:12664: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12667: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12655: \$? = $ac_status" >&5
++ echo "$as_me:12670: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+
+-echo "${as_me:-configure}:12660: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12675: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12675,7 +12690,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:12678: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12693: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -12750,13 +12765,13 @@
+ if test -d "$cf_cv_library_path_utf8" ; then
+ test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6
+
+-echo "${as_me:-configure}:12753: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12768: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_test_CPPFLAGS"
+ LIBS="-lutf8 $cf_save_LIBS"
+ LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12759 "configure"
++#line 12774 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -12769,21 +12784,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12772: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12787: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12775: \$? = $ac_status" >&5
++ echo "$as_me:12790: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12778: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12793: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12781: \$? = $ac_status" >&5
++ echo "$as_me:12796: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+
+-echo "${as_me:-configure}:12786: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12801: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -12825,7 +12840,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12828: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12843: result: $cf_cv_utf8_lib" >&5
+ echo "${ECHO_T}$cf_cv_utf8_lib" >&6
+
+ # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+@@ -12863,7 +12878,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12866 "configure"
++#line 12881 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12875,16 +12890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12893: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12881: \$? = $ac_status" >&5
++ echo "$as_me:12896: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12884: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12899: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12887: \$? = $ac_status" >&5
++ echo "$as_me:12902: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -12901,7 +12916,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}:12904: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12919: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -12937,7 +12952,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}:12940: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12955: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -12969,14 +12984,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12972: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12987: checking if we must include wchar.h to declare mbstate_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
+ if test "${cf_cv_mbstate_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12979 "configure"
++#line 12994 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -12994,23 +13009,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13000: \$? = $ac_status" >&5
++ echo "$as_me:13015: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13003: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13018: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13006: \$? = $ac_status" >&5
++ echo "$as_me:13021: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=no
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13013 "configure"
++#line 13028 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13029,16 +13044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13047: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13035: \$? = $ac_status" >&5
++ echo "$as_me:13050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13038: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13041: \$? = $ac_status" >&5
++ echo "$as_me:13056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -13050,7 +13065,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13053: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13068: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13068,14 +13083,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13071: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13086: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13078 "configure"
++#line 13093 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13093,23 +13108,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13096: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13111: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13099: \$? = $ac_status" >&5
++ echo "$as_me:13114: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13102: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13117: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13105: \$? = $ac_status" >&5
++ echo "$as_me:13120: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=no
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13112 "configure"
++#line 13127 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13128,16 +13143,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13131: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13146: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13134: \$? = $ac_status" >&5
++ echo "$as_me:13149: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13137: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13152: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13140: \$? = $ac_status" >&5
++ echo "$as_me:13155: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -13149,7 +13164,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13152: result: $cf_cv_wchar_t" >&5
++echo "$as_me:13167: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -13172,14 +13187,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:13175: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:13190: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13182 "configure"
++#line 13197 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13197,23 +13212,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13200: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13215: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13203: \$? = $ac_status" >&5
++ echo "$as_me:13218: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13206: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13221: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13209: \$? = $ac_status" >&5
++ echo "$as_me:13224: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=no
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13216 "configure"
++#line 13231 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13232,16 +13247,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13235: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13250: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13238: \$? = $ac_status" >&5
++ echo "$as_me:13253: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13241: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13256: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13244: \$? = $ac_status" >&5
++ echo "$as_me:13259: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -13253,7 +13268,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13256: result: $cf_cv_wint_t" >&5
++echo "$as_me:13271: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -13285,7 +13300,7 @@
+ fi
+
+ ### use option --disable-lp64 to allow long chtype
+-echo "$as_me:13288: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:13303: checking whether to enable _LP64 definition in curses.h" >&5
+ echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
+
+ # Check whether --enable-lp64 or --disable-lp64 was given.
+@@ -13295,7 +13310,7 @@
+ else
+ with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:13298: result: $with_lp64" >&5
++echo "$as_me:13313: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+
+ if test "x$with_lp64" = xyes ; then
+@@ -13311,7 +13326,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:13314: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:13329: checking for special C compiler options needed for large files" >&5
+ echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13323,7 +13338,7 @@
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13326 "configure"
++#line 13341 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13343,16 +13358,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13346: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13361: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13349: \$? = $ac_status" >&5
++ echo "$as_me:13364: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13352: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13367: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13355: \$? = $ac_status" >&5
++ echo "$as_me:13370: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -13362,16 +13377,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13368: \$? = $ac_status" >&5
++ echo "$as_me:13383: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13371: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13386: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13374: \$? = $ac_status" >&5
++ echo "$as_me:13389: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13385,13 +13400,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:13388: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13403: result: $ac_cv_sys_largefile_CC" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+- echo "$as_me:13394: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:13409: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13399,7 +13414,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13402 "configure"
++#line 13417 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13419,16 +13434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13437: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13425: \$? = $ac_status" >&5
++ echo "$as_me:13440: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13428: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13443: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13431: \$? = $ac_status" >&5
++ echo "$as_me:13446: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -13437,7 +13452,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13440 "configure"
++#line 13455 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -13458,16 +13473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13476: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13464: \$? = $ac_status" >&5
++ echo "$as_me:13479: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13467: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13482: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13470: \$? = $ac_status" >&5
++ echo "$as_me:13485: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13478,7 +13493,7 @@
+ break
+ done
+ fi
+-echo "$as_me:13481: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13496: result: $ac_cv_sys_file_offset_bits" >&5
+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+
+@@ -13488,7 +13503,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:13491: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:13506: checking for _LARGE_FILES value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_large_files+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13496,7 +13511,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13499 "configure"
++#line 13514 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13516,16 +13531,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13534: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13522: \$? = $ac_status" >&5
++ echo "$as_me:13537: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13525: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13540: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13528: \$? = $ac_status" >&5
++ echo "$as_me:13543: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -13534,7 +13549,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13537 "configure"
++#line 13552 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -13555,16 +13570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13558: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13573: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13561: \$? = $ac_status" >&5
++ echo "$as_me:13576: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13564: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13579: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13567: \$? = $ac_status" >&5
++ echo "$as_me:13582: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -13575,7 +13590,7 @@
+ break
+ done
+ fi
+-echo "$as_me:13578: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13593: result: $ac_cv_sys_large_files" >&5
+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+ if test "$ac_cv_sys_large_files" != no; then
+
+@@ -13588,7 +13603,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:13591: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:13606: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13596,7 +13611,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13599 "configure"
++#line 13614 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13608,16 +13623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13611: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13626: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13614: \$? = $ac_status" >&5
++ echo "$as_me:13629: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13617: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13632: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13620: \$? = $ac_status" >&5
++ echo "$as_me:13635: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -13626,7 +13641,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13629 "configure"
++#line 13644 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -13639,16 +13654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13657: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13645: \$? = $ac_status" >&5
++ echo "$as_me:13660: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13648: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13663: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13651: \$? = $ac_status" >&5
++ echo "$as_me:13666: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -13659,7 +13674,7 @@
+ break
+ done
+ fi
+-echo "$as_me:13662: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13677: result: $ac_cv_sys_largefile_source" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+ if test "$ac_cv_sys_largefile_source" != no; then
+
+@@ -13673,13 +13688,13 @@
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+-echo "$as_me:13676: checking for fseeko" >&5
++echo "$as_me:13691: checking for fseeko" >&5
+ echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+ if test "${ac_cv_func_fseeko+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13682 "configure"
++#line 13697 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13691,16 +13706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13694: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13697: \$? = $ac_status" >&5
++ echo "$as_me:13712: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13700: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13715: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13703: \$? = $ac_status" >&5
++ echo "$as_me:13718: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -13710,7 +13725,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13713: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13728: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -13749,14 +13764,14 @@
+
+ fi
+
+- echo "$as_me:13752: checking whether to use struct dirent64" >&5
++ echo "$as_me:13767: checking whether to use struct dirent64" >&5
+ echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
+ if test "${cf_cv_struct_dirent64+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13759 "configure"
++#line 13774 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13779,16 +13794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13797: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13785: \$? = $ac_status" >&5
++ echo "$as_me:13800: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13788: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13803: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13791: \$? = $ac_status" >&5
++ echo "$as_me:13806: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -13799,7 +13814,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13802: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13817: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13809,7 +13824,7 @@
+ fi
+
+ ### use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13812: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13827: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+ echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
+
+ # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
+@@ -13819,14 +13834,14 @@
+ else
+ with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13822: result: $with_tparm_varargs" >&5
++echo "$as_me:13837: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+
+ ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:13829: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13844: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+ echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
+
+ # Check whether --enable-tic-depends or --disable-tic-depends was given.
+@@ -13836,14 +13851,14 @@
+ else
+ with_tic_depends=yes
+ fi;
+-echo "$as_me:13839: result: $with_tic_depends" >&5
++echo "$as_me:13854: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ with_tic_depends=no
+ fi
+
+ ### use option --enable-wattr-macros to enable wattr* macros in curses.h
+-echo "$as_me:13846: checking if you want to enable wattr* macros" >&5
++echo "$as_me:13861: checking if you want to enable wattr* macros" >&5
+ echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
+
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -13855,15 +13870,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ NCURSES_WATTR_MACROS=0
+- echo "$as_me:13858: result: no" >&5
++ echo "$as_me:13873: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ NCURSES_WATTR_MACROS=1
+- echo "$as_me:13862: result: yes" >&5
++ echo "$as_me:13877: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+
+-echo "$as_me:13866: checking for X11 rgb file" >&5
++echo "$as_me:13881: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -13927,7 +13942,7 @@
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:13930: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:13945: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -13935,7 +13950,7 @@
+
+ fi
+
+-echo "$as_me:13938: result: $RGB_PATH" >&5
++echo "$as_me:13953: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -13949,7 +13964,7 @@
+ fi
+
+ ### use option --with-bool to override bool's type
+-echo "$as_me:13952: checking for type of bool" >&5
++echo "$as_me:13967: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+
+ # Check whether --with-bool or --without-bool was given.
+@@ -13959,10 +13974,10 @@
+ else
+ NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13962: result: $NCURSES_BOOL" >&5
++echo "$as_me:13977: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+
+-echo "$as_me:13965: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13980: checking for alternate terminal capabilities file" >&5
+ echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
+
+ # Check whether --with-caps or --without-caps was given.
+@@ -13974,15 +13989,15 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+- { echo "$as_me:13977: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++ { echo "$as_me:13992: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+ echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
+ TERMINFO_CAPS=Caps
+ fi
+-echo "$as_me:13981: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13996: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+
+ ### use option --with-chtype to override chtype's type
+-echo "$as_me:13985: checking for type of chtype" >&5
++echo "$as_me:14000: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+
+ # Check whether --with-chtype or --without-chtype was given.
+@@ -13992,11 +14007,11 @@
+ else
+ NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13995: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14010: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+
+ ### use option --with-ospeed to override ospeed's type
+-echo "$as_me:13999: checking for type of ospeed" >&5
++echo "$as_me:14014: checking for type of ospeed" >&5
+ echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
+
+ # Check whether --with-ospeed or --without-ospeed was given.
+@@ -14006,11 +14021,11 @@
+ else
+ NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14009: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14024: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+
+ ### use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:14013: checking for type of mmask_t" >&5
++echo "$as_me:14028: checking for type of mmask_t" >&5
+ echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
+
+ # Check whether --with-mmask-t or --without-mmask-t was given.
+@@ -14020,11 +14035,11 @@
+ else
+ NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14023: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14038: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+
+ ### use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14027: checking for size CCHARW_MAX" >&5
++echo "$as_me:14042: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -14034,16 +14049,16 @@
+ else
+ NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14037: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14052: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+
+-echo "$as_me:14040: checking for ANSI C header files" >&5
++echo "$as_me:14055: 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 14046 "configure"
++#line 14061 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14051,13 +14066,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:14054: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14069: \"$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:14060: \$? = $ac_status" >&5
++ echo "$as_me:14075: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14079,7 +14094,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 14082 "configure"
++#line 14097 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -14097,7 +14112,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 14100 "configure"
++#line 14115 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -14118,7 +14133,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14121 "configure"
++#line 14136 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14144,15 +14159,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14147: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14162: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14150: \$? = $ac_status" >&5
++ echo "$as_me:14165: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:14152: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14167: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14155: \$? = $ac_status" >&5
++ echo "$as_me:14170: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14165,7 +14180,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14168: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14183: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -14181,28 +14196,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14184: checking for $ac_header" >&5
++echo "$as_me:14199: 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 14190 "configure"
++#line 14205 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14211: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14199: \$? = $ac_status" >&5
++ echo "$as_me:14214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14202: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14205: \$? = $ac_status" >&5
++ echo "$as_me:14220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -14212,7 +14227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14215: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14230: 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
+@@ -14222,13 +14237,13 @@
+ fi
+ done
+
+-echo "$as_me:14225: checking for signed char" >&5
++echo "$as_me:14240: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14231 "configure"
++#line 14246 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14243,16 +14258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14261: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14249: \$? = $ac_status" >&5
++ echo "$as_me:14264: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14252: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14267: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14255: \$? = $ac_status" >&5
++ echo "$as_me:14270: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -14262,10 +14277,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14265: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14280: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:14268: checking size of signed char" >&5
++echo "$as_me:14283: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14274,7 +14289,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14277 "configure"
++#line 14292 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14286,21 +14301,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14304: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14292: \$? = $ac_status" >&5
++ echo "$as_me:14307: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14295: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14310: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14298: \$? = $ac_status" >&5
++ echo "$as_me:14313: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14303 "configure"
++#line 14318 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14312,16 +14327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14315: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14330: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14318: \$? = $ac_status" >&5
++ echo "$as_me:14333: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14321: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14336: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14324: \$? = $ac_status" >&5
++ echo "$as_me:14339: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -14337,7 +14352,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14340 "configure"
++#line 14355 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14349,16 +14364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14352: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14367: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14355: \$? = $ac_status" >&5
++ echo "$as_me:14370: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14358: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14373: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14361: \$? = $ac_status" >&5
++ echo "$as_me:14376: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -14374,7 +14389,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 14377 "configure"
++#line 14392 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14386,16 +14401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14404: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14392: \$? = $ac_status" >&5
++ echo "$as_me:14407: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14395: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14410: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14398: \$? = $ac_status" >&5
++ echo "$as_me:14413: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -14408,12 +14423,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:14411: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:14426: 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 14416 "configure"
++#line 14431 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14429,15 +14444,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14432: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14447: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14435: \$? = $ac_status" >&5
++ echo "$as_me:14450: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:14437: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14452: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14440: \$? = $ac_status" >&5
++ echo "$as_me:14455: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14453,7 +14468,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14456: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:14471: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <<EOF
+ #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
+@@ -14464,7 +14479,7 @@
+ else
+ NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:14467: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:14482: checking if you want to use signed Boolean array in term.h" >&5
+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
+
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -14474,12 +14489,12 @@
+ else
+ with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:14477: result: $with_signed_char" >&5
++echo "$as_me:14492: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+
+ ### use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:14482: checking for type of tparm args" >&5
++echo "$as_me:14497: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -14489,11 +14504,11 @@
+ else
+ NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:14492: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:14507: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14496: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14511: checking if RCS identifiers should be compiled-in" >&5
+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
+
+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
+@@ -14503,7 +14518,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:14506: result: $with_rcs_ids" >&5
++echo "$as_me:14521: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14512,7 +14527,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:14515: checking format of man-pages" >&5
++echo "$as_me:14530: checking format of man-pages" >&5
+ echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
+
+ # Check whether --with-manpage-format or --without-manpage-format was given.
+@@ -14601,14 +14616,14 @@
+ ;;
+ esac
+
+-echo "$as_me:14604: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:14619: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+- { echo "$as_me:14607: WARNING: Unexpected manpage-format $cf_unknown" >&5
++ { echo "$as_me:14622: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+
+-echo "$as_me:14611: checking for manpage renaming" >&5
++echo "$as_me:14626: checking for manpage renaming" >&5
+ echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
+
+ # Check whether --with-manpage-renames or --without-manpage-renames was given.
+@@ -14636,7 +14651,7 @@
+ if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then
+ MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+- { { echo "$as_me:14639: error: not a filename: $MANPAGE_RENAMES" >&5
++ { { echo "$as_me:14654: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -14650,10 +14665,10 @@
+ fi
+ fi
+
+-echo "$as_me:14653: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:14668: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+
+-echo "$as_me:14656: checking if manpage aliases will be installed" >&5
++echo "$as_me:14671: checking if manpage aliases will be installed" >&5
+ echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
+
+ # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
+@@ -14664,7 +14679,7 @@
+ MANPAGE_ALIASES=yes
+ fi;
+
+-echo "$as_me:14667: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:14682: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+
+ case "x$LN_S" in
+@@ -14678,7 +14693,7 @@
+
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:14681: checking if manpage symlinks should be used" >&5
++echo "$as_me:14696: checking if manpage symlinks should be used" >&5
+ echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
+
+ # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
+@@ -14691,17 +14706,17 @@
+
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+- { echo "$as_me:14694: WARNING: cannot make symlinks" >&5
++ { echo "$as_me:14709: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ MANPAGE_SYMLINKS=no
+ fi
+ fi
+
+-echo "$as_me:14700: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:14715: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+
+-echo "$as_me:14704: checking for manpage tbl" >&5
++echo "$as_me:14719: checking for manpage tbl" >&5
+ echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
+
+ # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
+@@ -14712,7 +14727,7 @@
+ MANPAGE_TBL=no
+ fi;
+
+-echo "$as_me:14715: result: $MANPAGE_TBL" >&5
++echo "$as_me:14730: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+
+ if test "$prefix" = "NONE" ; then
+@@ -15046,7 +15061,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15049: checking if you want to build with function extensions" >&5
++echo "$as_me:15064: 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.
+@@ -15056,7 +15071,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15059: result: $with_ext_funcs" >&5
++echo "$as_me:15074: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15116,7 +15131,7 @@
+ GENERATED_EXT_FUNCS=
+ fi
+
+-echo "$as_me:15119: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15134: 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.
+@@ -15126,7 +15141,7 @@
+ else
+ with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15129: result: $with_sp_funcs" >&5
++echo "$as_me:15144: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ NCURSES_SP_FUNCS=1
+@@ -15145,7 +15160,7 @@
+ GENERATED_SP_FUNCS=
+ fi
+
+-echo "$as_me:15148: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15163: 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.
+@@ -15155,7 +15170,7 @@
+ else
+ with_term_driver=no
+ fi;
+-echo "$as_me:15158: result: $with_term_driver" >&5
++echo "$as_me:15173: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+
+@@ -15164,19 +15179,19 @@
+ EOF
+
+ if test "x$with_termlib" != xno ; then
+- { { echo "$as_me:15167: error: The term-driver option conflicts with the termlib option" >&5
++ { { echo "$as_me:15182: 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:15172: error: The term-driver option relies upon sp-funcs" >&5
++ { { echo "$as_me:15187: 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:15179: checking for extended use of const keyword" >&5
++echo "$as_me:15194: 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.
+@@ -15186,7 +15201,7 @@
+ else
+ with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15189: result: $with_ext_const" >&5
++echo "$as_me:15204: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15194,7 +15209,7 @@
+ fi
+
+ ### use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15197: checking if you want to use extended colors" >&5
++echo "$as_me:15212: 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.
+@@ -15204,12 +15219,12 @@
+ else
+ with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15207: result: $with_ext_colors" >&5
++echo "$as_me:15222: 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:15212: WARNING: This option applies only to wide-character library" >&5
++ { echo "$as_me:15227: 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)
+@@ -15219,7 +15234,7 @@
+ (5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+- { echo "$as_me:15222: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++ { echo "$as_me:15237: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+@@ -15247,7 +15262,7 @@
+ fi
+
+ ### use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15250: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15265: 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.
+@@ -15257,7 +15272,7 @@
+ else
+ with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15260: result: $with_ext_mouse" >&5
++echo "$as_me:15275: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+
+@@ -15266,7 +15281,7 @@
+ (5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+- { echo "$as_me:15269: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++ { echo "$as_me:15284: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+@@ -15287,7 +15302,7 @@
+ esac
+
+ ### use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15290: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15305: 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.
+@@ -15297,7 +15312,7 @@
+ else
+ with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15300: result: $with_ext_putwin" >&5
++echo "$as_me:15315: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+
+@@ -15307,7 +15322,7 @@
+
+ fi
+
+-echo "$as_me:15310: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15325: 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.
+@@ -15317,7 +15332,7 @@
+ else
+ with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15320: result: $with_no_padding" >&5
++echo "$as_me:15335: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15325,7 +15340,7 @@
+ EOF
+
+ ### use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15328: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15343: 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.
+@@ -15335,7 +15350,7 @@
+ else
+ with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15338: result: $with_sigwinch" >&5
++echo "$as_me:15353: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15343,7 +15358,7 @@
+ EOF
+
+ ### use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15346: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15361: 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.
+@@ -15353,14 +15368,14 @@
+ else
+ with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15356: result: $with_tcap_names" >&5
++echo "$as_me:15371: 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:15363: checking if you want to link with the pthread library" >&5
++echo "$as_me:15378: 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.
+@@ -15370,27 +15385,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:15373: result: $with_pthread" >&5
++echo "$as_me:15388: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:15377: checking for pthread.h" >&5
++ echo "$as_me:15392: 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 15383 "configure"
++#line 15398 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15402: \"$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:15393: \$? = $ac_status" >&5
++ echo "$as_me:15408: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15409,7 +15424,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15412: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15427: 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
+
+@@ -15419,7 +15434,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:15422: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:15437: 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"
+
+@@ -15440,7 +15455,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15443 "configure"
++#line 15458 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -15457,16 +15472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15475: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15463: \$? = $ac_status" >&5
++ echo "$as_me:15478: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15466: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15481: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15469: \$? = $ac_status" >&5
++ echo "$as_me:15484: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -15476,7 +15491,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:15479: result: $with_pthread" >&5
++ echo "$as_me:15494: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -15504,7 +15519,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:15507: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:15522: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -15514,13 +15529,13 @@
+ fi
+
+ if test "x$with_pthread" != xno; then
+- echo "$as_me:15517: checking for pthread_kill" >&5
++ echo "$as_me:15532: 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 15523 "configure"
++#line 15538 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15551,16 +15566,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15569: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15557: \$? = $ac_status" >&5
++ echo "$as_me:15572: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15560: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15575: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15563: \$? = $ac_status" >&5
++ echo "$as_me:15578: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_pthread_kill=yes
+ else
+@@ -15570,11 +15585,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15573: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15588: 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:15577: checking if you want to allow EINTR in wgetch with pthreads" >&5
++ echo "$as_me:15592: 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.
+@@ -15584,7 +15599,7 @@
+ else
+ use_pthreads_eintr=no
+ fi;
+- echo "$as_me:15587: result: $use_pthreads_eintr" >&5
++ echo "$as_me:15602: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ if test "x$use_pthreads_eintr" = xyes ; then
+
+@@ -15595,7 +15610,7 @@
+ fi
+ fi
+
+- echo "$as_me:15598: checking if you want to use weak-symbols for pthreads" >&5
++ echo "$as_me:15613: 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.
+@@ -15605,18 +15620,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+- echo "$as_me:15608: result: $use_weak_symbols" >&5
++ echo "$as_me:15623: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "x$use_weak_symbols" = xyes ; then
+
+-echo "$as_me:15612: checking if $CC supports weak symbols" >&5
++echo "$as_me:15627: 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 15619 "configure"
++#line 15634 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -15642,16 +15657,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15660: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15648: \$? = $ac_status" >&5
++ echo "$as_me:15663: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15651: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15666: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15654: \$? = $ac_status" >&5
++ echo "$as_me:15669: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -15662,7 +15677,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15665: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15680: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -15712,7 +15727,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:15715: checking if you want reentrant code" >&5
++echo "$as_me:15730: 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.
+@@ -15722,7 +15737,7 @@
+ else
+ with_reentrant=no
+ fi;
+-echo "$as_me:15725: result: $with_reentrant" >&5
++echo "$as_me:15740: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ cf_cv_enable_reentrant=1
+@@ -15810,7 +15825,7 @@
+ (5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+- { echo "$as_me:15813: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++ { echo "$as_me:15828: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+@@ -15822,7 +15837,7 @@
+ NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+
+-echo "$as_me:15825: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15840: 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.
+@@ -15844,16 +15859,16 @@
+ test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:15847: result: $enable_opaque_curses" >&5
++echo "$as_me:15862: 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:15852: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15867: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:15856: checking if you want opaque form-library structures" >&5
++echo "$as_me:15871: 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.
+@@ -15863,10 +15878,10 @@
+ else
+ enable_opaque_form=no
+ fi;
+-echo "$as_me:15866: result: $enable_opaque_form" >&5
++echo "$as_me:15881: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+
+-echo "$as_me:15869: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15884: 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.
+@@ -15876,10 +15891,10 @@
+ else
+ enable_opaque_menu=no
+ fi;
+-echo "$as_me:15879: result: $enable_opaque_menu" >&5
++echo "$as_me:15894: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+
+-echo "$as_me:15882: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15897: 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.
+@@ -15889,7 +15904,7 @@
+ else
+ enable_opaque_panel=no
+ fi;
+-echo "$as_me:15892: result: $enable_opaque_panel" >&5
++echo "$as_me:15907: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+
+ NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15899,7 +15914,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:15902: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:15917: 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.
+@@ -15909,7 +15924,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:15912: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:15927: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -15922,7 +15937,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:15925: checking if you want all development code" >&5
++echo "$as_me:15940: 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.
+@@ -15932,11 +15947,11 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:15935: result: $with_develop" >&5
++echo "$as_me:15950: 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:15939: checking if you want hard-tabs code" >&5
++echo "$as_me:15954: 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.
+@@ -15946,7 +15961,7 @@
+ else
+ enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15949: result: $enable_hard_tabs" >&5
++echo "$as_me:15964: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15954,7 +15969,7 @@
+ EOF
+
+ ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15957: checking if you want limited support for xmc" >&5
++echo "$as_me:15972: 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.
+@@ -15964,7 +15979,7 @@
+ else
+ enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15967: result: $enable_xmc_glitch" >&5
++echo "$as_me:15982: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15974,7 +15989,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+
+-echo "$as_me:15977: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15992: 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.
+@@ -15984,7 +15999,7 @@
+ else
+ with_assumed_color=yes
+ fi;
+-echo "$as_me:15987: result: $with_assumed_color" >&5
++echo "$as_me:16002: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15992,7 +16007,7 @@
+ EOF
+
+ ### use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15995: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16010: 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.
+@@ -16002,7 +16017,7 @@
+ else
+ with_hashmap=yes
+ fi;
+-echo "$as_me:16005: result: $with_hashmap" >&5
++echo "$as_me:16020: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16010,7 +16025,7 @@
+ EOF
+
+ ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16013: checking if you want colorfgbg code" >&5
++echo "$as_me:16028: 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.
+@@ -16020,7 +16035,7 @@
+ else
+ with_colorfgbg=no
+ fi;
+-echo "$as_me:16023: result: $with_colorfgbg" >&5
++echo "$as_me:16038: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16028,7 +16043,7 @@
+ EOF
+
+ ### use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16031: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16046: 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.
+@@ -16038,14 +16053,14 @@
+ else
+ cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16041: result: $cf_with_fvisibility" >&5
++echo "$as_me:16056: 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:16048: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16063: 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
+@@ -16054,7 +16069,7 @@
+ cf_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16057 "configure"
++#line 16072 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16070,16 +16085,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16073: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16088: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16076: \$? = $ac_status" >&5
++ echo "$as_me:16091: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16079: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16094: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16082: \$? = $ac_status" >&5
++ echo "$as_me:16097: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden=yes
+ else
+@@ -16091,7 +16106,7 @@
+ CFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:16094: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16109: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+
+ if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16206,7 +16221,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:16209: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16224: 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
+@@ -16215,7 +16230,7 @@
+ cf_save_cflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16218 "configure"
++#line 16233 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16231,16 +16246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16234: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16249: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16237: \$? = $ac_status" >&5
++ echo "$as_me:16252: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16240: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16255: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16243: \$? = $ac_status" >&5
++ echo "$as_me:16258: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16252,7 +16267,7 @@
+ CXXFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:16255: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16270: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+
+ if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16375,7 +16390,7 @@
+ fi
+
+ ### use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16378: checking if you want interop bindings" >&5
++echo "$as_me:16393: 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.
+@@ -16385,13 +16400,13 @@
+ else
+ with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16388: result: $with_exp_interop" >&5
++echo "$as_me:16403: 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:16394: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16409: 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.
+@@ -16401,13 +16416,13 @@
+ else
+ with_safe_sprintf=no
+ fi;
+-echo "$as_me:16404: result: $with_safe_sprintf" >&5
++echo "$as_me:16419: 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:16410: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16425: 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.
+@@ -16417,7 +16432,7 @@
+ else
+ with_scroll_hints=yes
+ fi;
+-echo "$as_me:16420: result: $with_scroll_hints" >&5
++echo "$as_me:16435: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16426,7 +16441,7 @@
+
+ fi
+
+-echo "$as_me:16429: checking if you want wgetch-events code" >&5
++echo "$as_me:16444: 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.
+@@ -16436,7 +16451,7 @@
+ else
+ with_wgetch_events=no
+ fi;
+-echo "$as_me:16439: result: $with_wgetch_events" >&5
++echo "$as_me:16454: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+
+@@ -16451,7 +16466,7 @@
+
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+- echo "$as_me:16454: checking if you want experimental-Windows driver" >&5
++ echo "$as_me:16469: 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.
+@@ -16461,7 +16476,7 @@
+ else
+ with_exp_win32=no
+ fi;
+- echo "$as_me:16464: result: $with_exp_win32" >&5
++ echo "$as_me:16479: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ if test "x$with_exp_win32" = xyes
+ then
+@@ -16487,7 +16502,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:16490: checking if you want to see long compiling messages" >&5
++echo "$as_me:16505: 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.
+@@ -16521,7 +16536,7 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:16524: result: $enableval" >&5
++echo "$as_me:16539: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ if test "x$enable_echo" = xyes; then
+@@ -16534,7 +16549,7 @@
+
+ # --disable-stripping is used for debugging
+
+-echo "$as_me:16537: checking if you want to install stripped executables" >&5
++echo "$as_me:16552: 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.
+@@ -16551,7 +16566,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:16554: result: $enable_stripping" >&5
++echo "$as_me:16569: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -16562,7 +16577,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:16565: checking if install accepts -p option" >&5
++echo "$as_me:16580: 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
+@@ -16593,10 +16608,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:16596: result: $cf_cv_install_p" >&5
++echo "$as_me:16611: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:16599: checking if install needs to be told about ownership" >&5
++echo "$as_me:16614: 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)
+@@ -16607,7 +16622,7 @@
+ ;;
+ esac
+
+-echo "$as_me:16610: result: $with_install_o" >&5
++echo "$as_me:16625: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16632,7 +16647,7 @@
+
+ ### use option --enable-warnings to turn on all gcc warnings
+
+-echo "$as_me:16635: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16650: 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.
+@@ -16649,17 +16664,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:16652: result: $enable_stdnoreturn" >&5
++echo "$as_me:16667: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16656: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16671: 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 16662 "configure"
++#line 16677 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16676,16 +16691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16694: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16682: \$? = $ac_status" >&5
++ echo "$as_me:16697: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16685: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16700: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16688: \$? = $ac_status" >&5
++ echo "$as_me:16703: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -16696,7 +16711,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16699: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16714: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -16752,16 +16767,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16755: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16770: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16760: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16775: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16779: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16800,16 +16815,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16803: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16818: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16808: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16823: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16812: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16827: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16848,23 +16863,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16851: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16866: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16856: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16871: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16860: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16875: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:16867: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16882: 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.
+@@ -16881,7 +16896,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:16884: result: $enable_warnings" >&5
++echo "$as_me:16899: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16905,7 +16920,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16908 "configure"
++#line 16923 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -16920,26 +16935,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16938: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16926: \$? = $ac_status" >&5
++ echo "$as_me:16941: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16929: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16944: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16932: \$? = $ac_status" >&5
++ echo "$as_me:16947: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:16935: checking for X11/Xt const-feature" >&5
++echo "$as_me:16950: 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 16942 "configure"
++#line 16957 "configure"
+ #include "confdefs.h"
+
+ #define _CONST_X_STRING /* X11R7.8 (perhaps) */
+@@ -16956,16 +16971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16974: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16962: \$? = $ac_status" >&5
++ echo "$as_me:16977: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16980: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16968: \$? = $ac_status" >&5
++ echo "$as_me:16983: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -16980,7 +16995,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16983: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16998: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17009,7 +17024,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17012 "${as_me:-configure}"
++#line 17027 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -17025,7 +17040,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:17028: checking for $CC warning options..." >&5
++ { echo "$as_me:17043: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17041,12 +17056,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:17044: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17059: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17047: \$? = $ac_status" >&5
++ echo "$as_me:17062: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17049: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17064: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -17054,7 +17069,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:17057: checking for $CC warning options..." >&5
++ { echo "$as_me:17072: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -17077,12 +17092,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:17080: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17095: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17083: \$? = $ac_status" >&5
++ echo "$as_me:17098: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17085: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17100: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -17090,7 +17105,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17093: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17108: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17100,7 +17115,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17103: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17118: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17133,10 +17148,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:17136: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:17151: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17139 "${as_me:-configure}"
++#line 17154 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -17185,12 +17200,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:17188: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17203: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17191: \$? = $ac_status" >&5
++ echo "$as_me:17206: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17193: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:17208: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -17262,12 +17277,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:17265: checking if this is really Intel C++ compiler" >&5
++ echo "$as_me:17280: 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 17270 "configure"
++#line 17285 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17284,16 +17299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17302: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17290: \$? = $ac_status" >&5
++ echo "$as_me:17305: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17293: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17308: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17296: \$? = $ac_status" >&5
++ echo "$as_me:17311: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17304,7 +17319,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:17307: result: $INTEL_CPLUSPLUS" >&5
++ echo "$as_me:17322: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ ;;
+ esac
+@@ -17313,11 +17328,11 @@
+ CLANG_CPLUSPLUS=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:17316: checking if this is really Clang C++ compiler" >&5
++ echo "$as_me:17331: 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 17320 "configure"
++#line 17335 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17334,16 +17349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17352: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17340: \$? = $ac_status" >&5
++ echo "$as_me:17355: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17343: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17358: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17346: \$? = $ac_status" >&5
++ echo "$as_me:17361: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_CPLUSPLUS=yes
+
+@@ -17353,7 +17368,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:17356: result: $CLANG_CPLUSPLUS" >&5
++ echo "$as_me:17371: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+
+@@ -17362,30 +17377,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:17365: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:17380: 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:17372: checking version of $CC" >&5
++ echo "$as_me:17387: 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:17376: result: $CLANG_VERSION" >&5
++ echo "$as_me:17391: 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:17383: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:17398: 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 17388 "configure"
++#line 17403 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -17399,16 +17414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17405: \$? = $ac_status" >&5
++ echo "$as_me:17420: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17408: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17411: \$? = $ac_status" >&5
++ echo "$as_me:17426: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -17419,13 +17434,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17422: result: $cf_clang_optok" >&5
++ echo "$as_me:17437: 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}:17428: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17443: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17442,7 +17457,7 @@
+ ac_main_return="return"
+
+ cat > conftest.$ac_ext <<EOF
+-#line 17445 "configure"
++#line 17460 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -17460,7 +17475,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+
+- { echo "$as_me:17463: checking for $CC warning options..." >&5
++ { echo "$as_me:17478: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-Wall"
+@@ -17477,12 +17492,12 @@
+ wd981
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+- if { (eval echo "$as_me:17480: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17495: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17483: \$? = $ac_status" >&5
++ echo "$as_me:17498: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17485: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17500: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ fi
+@@ -17491,7 +17506,7 @@
+
+ elif test "$GXX" = yes
+ then
+- { echo "$as_me:17494: checking for $CXX warning options..." >&5
++ { echo "$as_me:17509: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-W -Wall"
+@@ -17521,16 +17536,16 @@
+ Wundef $cf_gxx_extra_warnings Wno-unused
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+- if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17539: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17527: \$? = $ac_status" >&5
++ echo "$as_me:17542: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17529: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17544: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ else
+- test -n "$verbose" && echo "$as_me:17533: result: ... no -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17548: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ fi
+ done
+@@ -17548,7 +17563,7 @@
+ fi
+ fi
+
+-echo "$as_me:17551: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17566: 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.
+@@ -17558,7 +17573,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:17561: result: $enable_string_hacks" >&5
++echo "$as_me:17576: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17567,15 +17582,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:17570: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:17585: 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:17572: checking for strlcat" >&5
++ echo "$as_me:17587: 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 17578 "configure"
++#line 17593 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17606,16 +17621,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17624: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17612: \$? = $ac_status" >&5
++ echo "$as_me:17627: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17615: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17630: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17618: \$? = $ac_status" >&5
++ echo "$as_me:17633: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -17625,7 +17640,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17628: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17643: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -17635,7 +17650,7 @@
+
+ else
+
+- echo "$as_me:17638: checking for strlcat in -lbsd" >&5
++ echo "$as_me:17653: 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
+@@ -17643,7 +17658,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17646 "configure"
++#line 17661 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17662,16 +17677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17680: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17668: \$? = $ac_status" >&5
++ echo "$as_me:17683: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17671: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17686: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17674: \$? = $ac_status" >&5
++ echo "$as_me:17689: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17682,7 +17697,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17685: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17700: 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
+
+@@ -17705,23 +17720,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17708: checking for $ac_header" >&5
++echo "$as_me:17723: 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 17714 "configure"
++#line 17729 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17718: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17733: \"$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:17724: \$? = $ac_status" >&5
++ echo "$as_me:17739: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17740,7 +17755,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17743: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17758: 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
+@@ -17761,13 +17776,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17764: checking for $ac_func" >&5
++echo "$as_me:17779: 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 17770 "configure"
++#line 17785 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17798,16 +17813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17816: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17804: \$? = $ac_status" >&5
++ echo "$as_me:17819: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17807: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17822: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17810: \$? = $ac_status" >&5
++ echo "$as_me:17825: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -17817,7 +17832,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17820: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17835: 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
+@@ -17830,7 +17845,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:17833: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17848: 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.
+@@ -17840,7 +17855,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:17843: result: $with_assertions" >&5
++echo "$as_me:17858: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17856,7 +17871,7 @@
+
+ ### use option --disable-leaks to suppress "permanent" leaks, for testing
+
+-echo "$as_me:17859: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17874: 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.
+@@ -17878,7 +17893,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:17881: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17896: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -17992,23 +18007,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:17995: checking for dmalloc.h" >&5
++ echo "$as_me:18010: 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 18001 "configure"
++#line 18016 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18020: \"$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:18011: \$? = $ac_status" >&5
++ echo "$as_me:18026: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18027,11 +18042,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18030: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18045: 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:18034: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18049: 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
+@@ -18039,7 +18054,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18042 "configure"
++#line 18057 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18058,16 +18073,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18076: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18064: \$? = $ac_status" >&5
++ echo "$as_me:18079: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18067: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18082: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18070: \$? = $ac_status" >&5
++ echo "$as_me:18085: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18078,7 +18093,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18081: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18096: 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
+@@ -18093,7 +18108,7 @@
+
+ fi
+
+-echo "$as_me:18096: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18111: 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.
+@@ -18115,7 +18130,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:18118: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18133: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -18229,23 +18244,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:18232: checking for dbmalloc.h" >&5
++ echo "$as_me:18247: 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 18238 "configure"
++#line 18253 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18242: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18257: \"$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:18248: \$? = $ac_status" >&5
++ echo "$as_me:18263: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18264,11 +18279,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18267: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18282: 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:18271: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18286: 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
+@@ -18276,7 +18291,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18279 "configure"
++#line 18294 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18295,16 +18310,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18313: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18301: \$? = $ac_status" >&5
++ echo "$as_me:18316: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18304: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18319: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18307: \$? = $ac_status" >&5
++ echo "$as_me:18322: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18315,7 +18330,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18318: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18333: 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
+@@ -18330,7 +18345,7 @@
+
+ fi
+
+-echo "$as_me:18333: checking if you want to use valgrind for testing" >&5
++echo "$as_me:18348: 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.
+@@ -18352,7 +18367,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:18355: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18370: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -18465,7 +18480,7 @@
+ ;;
+ esac
+
+-echo "$as_me:18468: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18483: 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.
+@@ -18476,7 +18491,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:18479: result: $with_no_leaks" >&5
++echo "$as_me:18494: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -18528,7 +18543,7 @@
+ ;;
+ esac
+
+-echo "$as_me:18531: checking whether to add trace feature to all models" >&5
++echo "$as_me:18546: 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.
+@@ -18538,7 +18553,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18541: result: $cf_with_trace" >&5
++echo "$as_me:18556: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18652,7 +18667,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:18655: checking if we want to use GNAT projects" >&5
++echo "$as_me:18670: 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.
+@@ -18669,7 +18684,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:18672: result: $enable_gnat_projects" >&5
++echo "$as_me:18687: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -18682,14 +18697,14 @@
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ fi
+
+-echo "$as_me:18685: checking if ssp library is needed" >&5
++echo "$as_me:18700: 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 18692 "configure"
++#line 18707 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -18706,16 +18721,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18724: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18712: \$? = $ac_status" >&5
++ echo "$as_me:18727: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18715: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18730: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18718: \$? = $ac_status" >&5
++ echo "$as_me:18733: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -18725,7 +18740,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18728 "configure"
++#line 18743 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -18742,16 +18757,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18760: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18748: \$? = $ac_status" >&5
++ echo "$as_me:18763: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18751: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18766: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18754: \$? = $ac_status" >&5
++ echo "$as_me:18769: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -18765,7 +18780,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18768: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18783: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18791,13 +18806,13 @@
+
+ ;;
+ (*)
+-echo "$as_me:18794: checking for gettimeofday" >&5
++echo "$as_me:18809: 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 18800 "configure"
++#line 18815 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18828,16 +18843,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18846: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18834: \$? = $ac_status" >&5
++ echo "$as_me:18849: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18837: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18852: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18840: \$? = $ac_status" >&5
++ echo "$as_me:18855: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -18847,7 +18862,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18850: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18865: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -18857,7 +18872,7 @@
+
+ else
+
+-echo "$as_me:18860: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18875: 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
+@@ -18865,7 +18880,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18868 "configure"
++#line 18883 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18884,16 +18899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18887: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18902: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18890: \$? = $ac_status" >&5
++ echo "$as_me:18905: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18893: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18908: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18896: \$? = $ac_status" >&5
++ echo "$as_me:18911: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18904,7 +18919,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18907: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18922: 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
+
+@@ -18934,14 +18949,14 @@
+ ;;
+ esac
+
+-echo "$as_me:18937: checking if -lm needed for math functions" >&5
++echo "$as_me:18952: 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 18944 "configure"
++#line 18959 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -18957,16 +18972,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18975: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18963: \$? = $ac_status" >&5
++ echo "$as_me:18978: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18966: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18981: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18969: \$? = $ac_status" >&5
++ echo "$as_me:18984: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -18976,7 +18991,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18979: result: $cf_cv_need_libm" >&5
++echo "$as_me:18994: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18984,13 +18999,13 @@
+ fi
+
+ ### Checks for header files.
+-echo "$as_me:18987: checking for ANSI C header files" >&5
++echo "$as_me:19002: 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 18993 "configure"
++#line 19008 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -18998,13 +19013,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:19001: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19016: \"$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:19007: \$? = $ac_status" >&5
++ echo "$as_me:19022: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19026,7 +19041,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 19029 "configure"
++#line 19044 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -19044,7 +19059,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 19047 "configure"
++#line 19062 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -19065,7 +19080,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19068 "configure"
++#line 19083 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19091,15 +19106,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19094: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19109: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19097: \$? = $ac_status" >&5
++ echo "$as_me:19112: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:19099: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19114: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19102: \$? = $ac_status" >&5
++ echo "$as_me:19117: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -19112,7 +19127,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19115: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19130: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -19125,13 +19140,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:19128: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19143: 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 19134 "configure"
++#line 19149 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -19146,16 +19161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19149: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19164: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19152: \$? = $ac_status" >&5
++ echo "$as_me:19167: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19155: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19170: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19158: \$? = $ac_status" >&5
++ echo "$as_me:19173: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -19165,7 +19180,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19168: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19183: 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
+@@ -19178,7 +19193,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:19181: checking for opendir in -ldir" >&5
++ echo "$as_me:19196: 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
+@@ -19186,7 +19201,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19189 "configure"
++#line 19204 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19205,16 +19220,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19223: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19211: \$? = $ac_status" >&5
++ echo "$as_me:19226: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19214: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19229: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19217: \$? = $ac_status" >&5
++ echo "$as_me:19232: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -19225,14 +19240,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19228: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:19243: 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:19235: checking for opendir in -lx" >&5
++ echo "$as_me:19250: 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
+@@ -19240,7 +19255,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19243 "configure"
++#line 19258 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19259,16 +19274,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19277: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19265: \$? = $ac_status" >&5
++ echo "$as_me:19280: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19268: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19283: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19271: \$? = $ac_status" >&5
++ echo "$as_me:19286: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -19279,7 +19294,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19282: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19297: 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"
+@@ -19287,13 +19302,13 @@
+
+ fi
+
+-echo "$as_me:19290: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19305: 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 19296 "configure"
++#line 19311 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19309,16 +19324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19327: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19315: \$? = $ac_status" >&5
++ echo "$as_me:19330: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19318: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19333: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19321: \$? = $ac_status" >&5
++ echo "$as_me:19336: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -19328,7 +19343,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19331: result: $ac_cv_header_time" >&5
++echo "$as_me:19346: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -19343,7 +19358,7 @@
+ case "$host_os" in
+ (mingw*)
+ # -lsystre -ltre -lintl -liconv
+- echo "$as_me:19346: checking for regcomp in -lsystre" >&5
++ echo "$as_me:19361: 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
+@@ -19351,7 +19366,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19354 "configure"
++#line 19369 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19370,16 +19385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19373: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19388: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19376: \$? = $ac_status" >&5
++ echo "$as_me:19391: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19379: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19394: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19382: \$? = $ac_status" >&5
++ echo "$as_me:19397: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19390,11 +19405,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19393: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19408: 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:19397: checking for libiconv_open in -liconv" >&5
++ echo "$as_me:19412: 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
+@@ -19402,7 +19417,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19405 "configure"
++#line 19420 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19421,16 +19436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19439: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19427: \$? = $ac_status" >&5
++ echo "$as_me:19442: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19430: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19445: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19433: \$? = $ac_status" >&5
++ echo "$as_me:19448: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19441,7 +19456,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19444: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19459: 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
+
+@@ -19463,7 +19478,7 @@
+
+ fi
+
+- echo "$as_me:19466: checking for libintl_gettext in -lintl" >&5
++ echo "$as_me:19481: 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
+@@ -19471,7 +19486,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19474 "configure"
++#line 19489 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19490,16 +19505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19508: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19496: \$? = $ac_status" >&5
++ echo "$as_me:19511: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19499: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19514: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19502: \$? = $ac_status" >&5
++ echo "$as_me:19517: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19510,7 +19525,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19513: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19528: 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
+
+@@ -19532,7 +19547,7 @@
+
+ fi
+
+- echo "$as_me:19535: checking for tre_regcomp in -ltre" >&5
++ echo "$as_me:19550: 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
+@@ -19540,7 +19555,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19543 "configure"
++#line 19558 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19559,16 +19574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19562: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19565: \$? = $ac_status" >&5
++ echo "$as_me:19580: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19568: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19583: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19571: \$? = $ac_status" >&5
++ echo "$as_me:19586: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19579,7 +19594,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19582: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19597: 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
+
+@@ -19621,7 +19636,7 @@
+
+ else
+
+- echo "$as_me:19624: checking for regcomp in -lgnurx" >&5
++ echo "$as_me:19639: 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
+@@ -19629,7 +19644,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19632 "configure"
++#line 19647 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19648,16 +19663,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19651: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19666: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19654: \$? = $ac_status" >&5
++ echo "$as_me:19669: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19657: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19672: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19660: \$? = $ac_status" >&5
++ echo "$as_me:19675: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19668,7 +19683,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19671: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19686: 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
+
+@@ -19696,13 +19711,13 @@
+ ;;
+ (*)
+ cf_regex_libs="regex re"
+- echo "$as_me:19699: checking for regcomp" >&5
++ echo "$as_me:19714: 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 19705 "configure"
++#line 19720 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19733,16 +19748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19736: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19751: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19739: \$? = $ac_status" >&5
++ echo "$as_me:19754: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19742: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19757: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19745: \$? = $ac_status" >&5
++ echo "$as_me:19760: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_regcomp=yes
+ else
+@@ -19752,7 +19767,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19755: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19770: 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
+@@ -19761,7 +19776,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:19764: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19779: 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
+@@ -19769,7 +19784,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19772 "configure"
++#line 19787 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19788,16 +19803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19794: \$? = $ac_status" >&5
++ echo "$as_me:19809: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19797: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19812: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19800: \$? = $ac_status" >&5
++ echo "$as_me:19815: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -19808,7 +19823,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19811: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19826: 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
+
+@@ -19840,13 +19855,13 @@
+ esac
+
+ if test "$cf_regex_func" = no ; then
+- echo "$as_me:19843: checking for compile" >&5
++ echo "$as_me:19858: 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 19849 "configure"
++#line 19864 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19877,16 +19892,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19895: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19883: \$? = $ac_status" >&5
++ echo "$as_me:19898: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19886: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19901: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19889: \$? = $ac_status" >&5
++ echo "$as_me:19904: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_compile=yes
+ else
+@@ -19896,13 +19911,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19899: result: $ac_cv_func_compile" >&5
++echo "$as_me:19914: 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:19905: checking for compile in -lgen" >&5
++ echo "$as_me:19920: 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
+@@ -19910,7 +19925,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19913 "configure"
++#line 19928 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19929,16 +19944,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19947: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19935: \$? = $ac_status" >&5
++ echo "$as_me:19950: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19938: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19953: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19941: \$? = $ac_status" >&5
++ echo "$as_me:19956: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gen_compile=yes
+ else
+@@ -19949,7 +19964,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19952: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19967: 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
+
+@@ -19977,11 +19992,11 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- { echo "$as_me:19980: WARNING: cannot find regular expression library" >&5
++ { echo "$as_me:19995: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+
+-echo "$as_me:19984: checking for regular-expression headers" >&5
++echo "$as_me:19999: 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
+@@ -19993,7 +20008,7 @@
+ for cf_regex_hdr in regexp.h regexpr.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19996 "configure"
++#line 20011 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20010,16 +20025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20016: \$? = $ac_status" >&5
++ echo "$as_me:20031: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20019: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20034: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20022: \$? = $ac_status" >&5
++ echo "$as_me:20037: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20036,7 +20051,7 @@
+ for cf_regex_hdr in regex.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20039 "configure"
++#line 20054 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -20056,16 +20071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20059: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20074: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20062: \$? = $ac_status" >&5
++ echo "$as_me:20077: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20065: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20068: \$? = $ac_status" >&5
++ echo "$as_me:20083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20081,11 +20096,11 @@
+ esac
+
+ fi
+-echo "$as_me:20084: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20099: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+
+ case "$cf_cv_regex_hdrs" in
+- (no) { echo "$as_me:20088: WARNING: no regular expression header found" >&5
++ (no) { echo "$as_me:20103: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ (regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20122,23 +20137,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20125: checking for $ac_header" >&5
++echo "$as_me:20140: 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 20131 "configure"
++#line 20146 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20135: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20150: \"$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:20141: \$? = $ac_status" >&5
++ echo "$as_me:20156: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20157,7 +20172,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20160: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20175: 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
+@@ -20170,23 +20185,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:20173: checking for $ac_header" >&5
++echo "$as_me:20188: 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 20179 "configure"
++#line 20194 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20198: \"$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:20189: \$? = $ac_status" >&5
++ echo "$as_me:20204: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20205,7 +20220,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20208: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20223: 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
+@@ -20215,7 +20230,7 @@
+ fi
+ done
+
+-echo "$as_me:20218: checking for header declaring getopt variables" >&5
++echo "$as_me:20233: 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
+@@ -20225,7 +20240,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20228 "configure"
++#line 20243 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20238,16 +20253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20256: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20244: \$? = $ac_status" >&5
++ echo "$as_me:20259: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20247: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20262: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20250: \$? = $ac_status" >&5
++ echo "$as_me:20265: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -20259,7 +20274,7 @@
+ done
+
+ fi
+-echo "$as_me:20262: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20277: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -20276,14 +20291,14 @@
+
+ fi
+
+-echo "$as_me:20279: checking if external environ is declared" >&5
++echo "$as_me:20294: 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 20286 "configure"
++#line 20301 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_STDLIB_H
+@@ -20299,16 +20314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20317: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20305: \$? = $ac_status" >&5
++ echo "$as_me:20320: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20308: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20323: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20311: \$? = $ac_status" >&5
++ echo "$as_me:20326: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_environ=yes
+ else
+@@ -20319,7 +20334,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20322: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20337: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20334,14 +20349,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:20337: checking if external environ exists" >&5
++echo "$as_me:20352: 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 20344 "configure"
++#line 20359 "configure"
+ #include "confdefs.h"
+
+ #undef environ
+@@ -20356,16 +20371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20374: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20362: \$? = $ac_status" >&5
++ echo "$as_me:20377: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20365: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20380: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20368: \$? = $ac_status" >&5
++ echo "$as_me:20383: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_environ=yes
+ else
+@@ -20376,7 +20391,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20379: result: $cf_cv_have_environ" >&5
++echo "$as_me:20394: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20389,13 +20404,13 @@
+
+ fi
+
+-echo "$as_me:20392: checking for getenv" >&5
++echo "$as_me:20407: 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 20398 "configure"
++#line 20413 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20426,16 +20441,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20429: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20444: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20432: \$? = $ac_status" >&5
++ echo "$as_me:20447: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20435: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20450: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20438: \$? = $ac_status" >&5
++ echo "$as_me:20453: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_getenv=yes
+ else
+@@ -20445,19 +20460,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20448: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20463: 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:20454: checking for $ac_func" >&5
++echo "$as_me:20469: 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 20460 "configure"
++#line 20475 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20488,16 +20503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20494: \$? = $ac_status" >&5
++ echo "$as_me:20509: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20497: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20512: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20500: \$? = $ac_status" >&5
++ echo "$as_me:20515: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -20507,7 +20522,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20510: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20525: 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
+@@ -20517,7 +20532,7 @@
+ fi
+ done
+
+-echo "$as_me:20520: checking if getenv returns consistent values" >&5
++echo "$as_me:20535: 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
+@@ -20527,7 +20542,7 @@
+ cf_cv_consistent_getenv=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20530 "configure"
++#line 20545 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20636,15 +20651,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20639: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20654: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20642: \$? = $ac_status" >&5
++ echo "$as_me:20657: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:20644: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20659: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20647: \$? = $ac_status" >&5
++ echo "$as_me:20662: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_consistent_getenv=yes
+ else
+@@ -20657,7 +20672,7 @@
+ fi
+
+ fi
+-echo "$as_me:20660: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20675: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20672,18 +20687,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ test "x$cf_with_trace" = xyes
+ then
+- { echo "$as_me:20675: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++ { echo "$as_me:20690: 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:20679: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20694: 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 20686 "configure"
++#line 20701 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -20703,16 +20718,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20706: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20721: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20709: \$? = $ac_status" >&5
++ echo "$as_me:20724: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20712: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20727: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20715: \$? = $ac_status" >&5
++ echo "$as_me:20730: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -20724,7 +20739,7 @@
+
+ fi
+
+-echo "$as_me:20727: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20742: 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
+@@ -20739,13 +20754,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:20742: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20757: 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 20748 "configure"
++#line 20763 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -20803,16 +20818,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20821: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20809: \$? = $ac_status" >&5
++ echo "$as_me:20824: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20812: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20827: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20815: \$? = $ac_status" >&5
++ echo "$as_me:20830: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -20822,7 +20837,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20825: result: $ac_cv_c_const" >&5
++echo "$as_me:20840: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -20832,7 +20847,7 @@
+
+ fi
+
+-echo "$as_me:20835: checking for inline" >&5
++echo "$as_me:20850: 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
+@@ -20840,7 +20855,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20843 "configure"
++#line 20858 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20849,16 +20864,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20867: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20855: \$? = $ac_status" >&5
++ echo "$as_me:20870: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20858: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20873: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20861: \$? = $ac_status" >&5
++ echo "$as_me:20876: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20869,7 +20884,7 @@
+ done
+
+ fi
+-echo "$as_me:20872: result: $ac_cv_c_inline" >&5
++echo "$as_me:20887: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -20895,7 +20910,7 @@
+ :
+ elif test "$GCC" = yes
+ then
+- echo "$as_me:20898: checking if $CC supports options to tune inlining" >&5
++ echo "$as_me:20913: 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
+@@ -20904,7 +20919,7 @@
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20907 "configure"
++#line 20922 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20916,16 +20931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20934: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20922: \$? = $ac_status" >&5
++ echo "$as_me:20937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20925: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20928: \$? = $ac_status" >&5
++ echo "$as_me:20943: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gcc_inline=yes
+ else
+@@ -20937,7 +20952,7 @@
+ CFLAGS=$cf_save_CFLAGS
+
+ fi
+-echo "$as_me:20940: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20955: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+@@ -21043,7 +21058,7 @@
+ fi
+ fi
+
+-echo "$as_me:21046: checking for signal global datatype" >&5
++echo "$as_me:21061: 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
+@@ -21055,7 +21070,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21058 "configure"
++#line 21073 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21079,16 +21094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21082: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21097: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21085: \$? = $ac_status" >&5
++ echo "$as_me:21100: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21088: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21103: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21091: \$? = $ac_status" >&5
++ echo "$as_me:21106: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21102,7 +21117,7 @@
+
+ fi
+
+-echo "$as_me:21105: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21120: 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
+@@ -21111,7 +21126,7 @@
+
+ if test "$NCURSES_CHTYPE" = auto ; then
+
+-echo "$as_me:21114: checking for type of chtype" >&5
++echo "$as_me:21129: 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
+@@ -21121,7 +21136,7 @@
+ cf_cv_typeof_chtype=long
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21124 "configure"
++#line 21139 "configure"
+ #include "confdefs.h"
+
+ #define WANT_BITS 31
+@@ -21156,15 +21171,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21159: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21174: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21162: \$? = $ac_status" >&5
++ echo "$as_me:21177: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21164: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21179: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21167: \$? = $ac_status" >&5
++ echo "$as_me:21182: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21179,7 +21194,7 @@
+
+ fi
+
+-echo "$as_me:21182: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21197: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -21191,14 +21206,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+
+-echo "$as_me:21194: checking if unsigned literals are legal" >&5
++echo "$as_me:21209: 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 21201 "configure"
++#line 21216 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21210,16 +21225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21213: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21216: \$? = $ac_status" >&5
++ echo "$as_me:21231: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21219: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21234: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21222: \$? = $ac_status" >&5
++ echo "$as_me:21237: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unsigned_literals=yes
+ else
+@@ -21231,7 +21246,7 @@
+
+ fi
+
+-echo "$as_me:21234: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21249: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+
+ cf_cv_1UL="1"
+@@ -21247,14 +21262,14 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:21250: checking if external errno is declared" >&5
++echo "$as_me:21265: 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 21257 "configure"
++#line 21272 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_STDLIB_H
+@@ -21272,16 +21287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21278: \$? = $ac_status" >&5
++ echo "$as_me:21293: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21281: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21296: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21284: \$? = $ac_status" >&5
++ echo "$as_me:21299: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_errno=yes
+ else
+@@ -21292,7 +21307,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21295: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21310: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21307,14 +21322,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:21310: checking if external errno exists" >&5
++echo "$as_me:21325: 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 21317 "configure"
++#line 21332 "configure"
+ #include "confdefs.h"
+
+ #undef errno
+@@ -21329,16 +21344,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21332: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21347: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21335: \$? = $ac_status" >&5
++ echo "$as_me:21350: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21338: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21353: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21341: \$? = $ac_status" >&5
++ echo "$as_me:21356: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_errno=yes
+ else
+@@ -21349,7 +21364,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21352: result: $cf_cv_have_errno" >&5
++echo "$as_me:21367: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21362,7 +21377,7 @@
+
+ fi
+
+-echo "$as_me:21365: checking if data-only library module links" >&5
++echo "$as_me:21380: 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
+@@ -21370,20 +21385,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 21373 "configure"
++#line 21388 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:21376: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21391: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21379: \$? = $ac_status" >&5
++ echo "$as_me:21394: \$? = $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 21386 "configure"
++#line 21401 "configure"
+ int testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -21396,10 +21411,10 @@
+ #endif
+ }
+ EOF
+- if { (eval echo "$as_me:21399: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21414: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21402: \$? = $ac_status" >&5
++ echo "$as_me:21417: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21412,7 +21427,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21415 "configure"
++#line 21430 "configure"
+ #include "confdefs.h"
+
+ int main(void)
+@@ -21423,15 +21438,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21426: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21441: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21429: \$? = $ac_status" >&5
++ echo "$as_me:21444: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21431: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21446: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21434: \$? = $ac_status" >&5
++ echo "$as_me:21449: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -21446,7 +21461,7 @@
+
+ fi
+
+-echo "$as_me:21449: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21464: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21489,13 +21504,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21492: checking for $ac_func" >&5
++echo "$as_me:21507: 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 21498 "configure"
++#line 21513 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21526,16 +21541,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21529: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21544: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21532: \$? = $ac_status" >&5
++ echo "$as_me:21547: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21535: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21550: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21538: \$? = $ac_status" >&5
++ echo "$as_me:21553: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -21545,7 +21560,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21548: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21563: 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
+@@ -21555,14 +21570,14 @@
+ fi
+ done
+
+-echo "$as_me:21558: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:21573: 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 21565 "configure"
++#line 21580 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -21577,16 +21592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21595: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21583: \$? = $ac_status" >&5
++ echo "$as_me:21598: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21586: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21601: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21589: \$? = $ac_status" >&5
++ echo "$as_me:21604: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_PATH_TTYS=yes
+ else
+@@ -21596,7 +21611,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21599: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:21614: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+
+ if test $cf_cv_PATH_TTYS = no
+@@ -21618,7 +21633,7 @@
+
+ if test $cf_cv_PATH_TTYS != no
+ then
+- echo "$as_me:21621: checking if _PATH_TTYS file exists" >&5
++ echo "$as_me:21636: 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
+@@ -21628,7 +21643,7 @@
+ cf_cv_have_PATH_TTYS=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21631 "configure"
++#line 21646 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -21639,15 +21654,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21657: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21645: \$? = $ac_status" >&5
++ echo "$as_me:21660: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21647: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21662: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21650: \$? = $ac_status" >&5
++ echo "$as_me:21665: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_PATH_TTYS=yes
+ else
+@@ -21659,7 +21674,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21662: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:21677: 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
+@@ -21671,14 +21686,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+
+- echo "$as_me:21674: checking for getttynam" >&5
++ echo "$as_me:21689: 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 21681 "configure"
++#line 21696 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -21690,16 +21705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21696: \$? = $ac_status" >&5
++ echo "$as_me:21711: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21699: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21714: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21702: \$? = $ac_status" >&5
++ echo "$as_me:21717: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_getttynam=yes
+ else
+@@ -21709,7 +21724,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21712: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:21727: 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
+@@ -21719,7 +21734,7 @@
+
+ if test "x$ac_cv_func_getopt" = xno && \
+ test "x$cf_with_progs$cf_with_tests" != xnono; then
+- { { echo "$as_me:21722: error: getopt is required for building programs" >&5
++ { { echo "$as_me:21737: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -21728,7 +21743,7 @@
+ then
+ if test "x$ac_cv_func_vsnprintf" = xyes
+ then
+- { echo "$as_me:21731: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++ { echo "$as_me:21746: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ else
+
+@@ -21741,14 +21756,14 @@
+
+ if test "x$with_getcap" = "xyes" ; then
+
+-echo "$as_me:21744: checking for terminal-capability database functions" >&5
++echo "$as_me:21759: 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 21751 "configure"
++#line 21766 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -21768,16 +21783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21786: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21774: \$? = $ac_status" >&5
++ echo "$as_me:21789: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21792: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21780: \$? = $ac_status" >&5
++ echo "$as_me:21795: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent=yes
+ else
+@@ -21788,7 +21803,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21791: result: $cf_cv_cgetent" >&5
++echo "$as_me:21806: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+
+ if test "$cf_cv_cgetent" = yes
+@@ -21798,14 +21813,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+
+-echo "$as_me:21801: checking if cgetent uses const parameter" >&5
++echo "$as_me:21816: 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 21808 "configure"
++#line 21823 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21828,16 +21843,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21846: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21834: \$? = $ac_status" >&5
++ echo "$as_me:21849: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21837: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21852: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21840: \$? = $ac_status" >&5
++ echo "$as_me:21855: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent_const=yes
+ else
+@@ -21848,7 +21863,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21851: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21866: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ if test "$cf_cv_cgetent_const" = yes
+ then
+@@ -21862,14 +21877,14 @@
+
+ fi
+
+-echo "$as_me:21865: checking for isascii" >&5
++echo "$as_me:21880: 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 21872 "configure"
++#line 21887 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -21881,16 +21896,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21899: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21887: \$? = $ac_status" >&5
++ echo "$as_me:21902: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21890: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21905: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21893: \$? = $ac_status" >&5
++ echo "$as_me:21908: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_isascii=yes
+ else
+@@ -21901,7 +21916,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21904: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21919: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21909,10 +21924,10 @@
+ EOF
+
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21912: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21927: 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 21915 "configure"
++#line 21930 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21926,16 +21941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21944: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21932: \$? = $ac_status" >&5
++ echo "$as_me:21947: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21935: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21950: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21938: \$? = $ac_status" >&5
++ echo "$as_me:21953: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=no
+ else
+@@ -21943,7 +21958,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21946 "configure"
++#line 21961 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -21958,16 +21973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21976: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21964: \$? = $ac_status" >&5
++ echo "$as_me:21979: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21967: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21982: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21970: \$? = $ac_status" >&5
++ echo "$as_me:21985: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=yes
+
+@@ -21983,11 +21998,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21986: result: $sigact_bad" >&5
++echo "$as_me:22001: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+
+-echo "$as_me:21990: checking if nanosleep really works" >&5
++echo "$as_me:22005: 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
+@@ -21997,7 +22012,7 @@
+ cf_cv_func_nanosleep=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22000 "configure"
++#line 22015 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -22022,15 +22037,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22028: \$? = $ac_status" >&5
++ echo "$as_me:22043: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22030: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22045: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22033: \$? = $ac_status" >&5
++ echo "$as_me:22048: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_nanosleep=yes
+ else
+@@ -22042,7 +22057,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22045: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22060: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22059,23 +22074,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22062: checking for $ac_header" >&5
++echo "$as_me:22077: 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 22068 "configure"
++#line 22083 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22072: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22087: \"$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:22078: \$? = $ac_status" >&5
++ echo "$as_me:22093: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22094,7 +22109,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22097: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22112: 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
+@@ -22111,10 +22126,10 @@
+ (*) termios_bad=maybe ;;
+ esac
+ if test "$termios_bad" = maybe ; then
+- echo "$as_me:22114: checking whether termios.h needs _POSIX_SOURCE" >&5
++ echo "$as_me:22129: 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 22117 "configure"
++#line 22132 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22126,16 +22141,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22129: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22144: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22132: \$? = $ac_status" >&5
++ echo "$as_me:22147: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22135: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22150: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22138: \$? = $ac_status" >&5
++ echo "$as_me:22153: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=no
+ else
+@@ -22143,7 +22158,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22146 "configure"
++#line 22161 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22157,16 +22172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22160: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22175: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22163: \$? = $ac_status" >&5
++ echo "$as_me:22178: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22166: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22181: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22169: \$? = $ac_status" >&5
++ echo "$as_me:22184: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=unknown
+ else
+@@ -22182,19 +22197,19 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:22185: result: $termios_bad" >&5
++ echo "$as_me:22200: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ fi
+ fi
+
+-echo "$as_me:22190: checking for tcgetattr" >&5
++echo "$as_me:22205: 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 22197 "configure"
++#line 22212 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22222,16 +22237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22240: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22228: \$? = $ac_status" >&5
++ echo "$as_me:22243: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22231: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22246: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22234: \$? = $ac_status" >&5
++ echo "$as_me:22249: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_tcgetattr=yes
+ else
+@@ -22241,21 +22256,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22244: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22259: 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:22251: checking for vsscanf function or workaround" >&5
++echo "$as_me:22266: 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 22258 "configure"
++#line 22273 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -22271,16 +22286,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22289: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22277: \$? = $ac_status" >&5
++ echo "$as_me:22292: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22295: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22283: \$? = $ac_status" >&5
++ echo "$as_me:22298: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22288,7 +22303,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22291 "configure"
++#line 22306 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -22310,16 +22325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22328: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22316: \$? = $ac_status" >&5
++ echo "$as_me:22331: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22319: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22334: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22322: \$? = $ac_status" >&5
++ echo "$as_me:22337: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22327,7 +22342,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22330 "configure"
++#line 22345 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -22349,16 +22364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22367: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22355: \$? = $ac_status" >&5
++ echo "$as_me:22370: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22358: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22373: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22361: \$? = $ac_status" >&5
++ echo "$as_me:22376: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=_doscan
+ else
+@@ -22373,7 +22388,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22376: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22391: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+
+ case "$cf_cv_func_vsscanf" in
+@@ -22399,23 +22414,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22402: checking for $ac_header" >&5
++echo "$as_me:22417: 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 22408 "configure"
++#line 22423 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22412: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22427: \"$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:22418: \$? = $ac_status" >&5
++ echo "$as_me:22433: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22434,7 +22449,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22437: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22452: 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
+@@ -22444,7 +22459,7 @@
+ fi
+ done
+
+-echo "$as_me:22447: checking for working mkstemp" >&5
++echo "$as_me:22462: 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
+@@ -22455,7 +22470,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22458 "configure"
++#line 22473 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22496,15 +22511,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22514: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22502: \$? = $ac_status" >&5
++ echo "$as_me:22517: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22519: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22507: \$? = $ac_status" >&5
++ echo "$as_me:22522: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -22519,16 +22534,16 @@
+ fi
+
+ fi
+-echo "$as_me:22522: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22537: 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:22525: checking for mkstemp" >&5
++ echo "$as_me:22540: 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 22531 "configure"
++#line 22546 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22559,16 +22574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22562: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22577: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22565: \$? = $ac_status" >&5
++ echo "$as_me:22580: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22568: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22583: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22571: \$? = $ac_status" >&5
++ echo "$as_me:22586: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -22578,7 +22593,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22581: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22596: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -22599,21 +22614,21 @@
+ fi
+
+ if test "x$cross_compiling" = xyes ; then
+- { echo "$as_me:22602: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++ { echo "$as_me:22617: 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:22605: checking whether setvbuf arguments are reversed" >&5
++ echo "$as_me:22620: 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:22611: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:22626: 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 22616 "configure"
++#line 22631 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22630,15 +22645,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22648: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22636: \$? = $ac_status" >&5
++ echo "$as_me:22651: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22638: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22653: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22641: \$? = $ac_status" >&5
++ echo "$as_me:22656: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22651,7 +22666,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22654: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22669: 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
+
+@@ -22662,13 +22677,13 @@
+ fi
+
+ fi
+-echo "$as_me:22665: checking for intptr_t" >&5
++echo "$as_me:22680: 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 22671 "configure"
++#line 22686 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22683,16 +22698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22701: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22689: \$? = $ac_status" >&5
++ echo "$as_me:22704: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22692: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22707: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22695: \$? = $ac_status" >&5
++ echo "$as_me:22710: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_intptr_t=yes
+ else
+@@ -22702,7 +22717,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22705: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22720: 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
+ :
+@@ -22714,13 +22729,13 @@
+
+ fi
+
+-echo "$as_me:22717: checking for ssize_t" >&5
++echo "$as_me:22732: 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 22723 "configure"
++#line 22738 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22735,16 +22750,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22753: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22741: \$? = $ac_status" >&5
++ echo "$as_me:22756: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22744: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22759: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22747: \$? = $ac_status" >&5
++ echo "$as_me:22762: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_ssize_t=yes
+ else
+@@ -22754,7 +22769,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22757: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22772: 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
+ :
+@@ -22766,14 +22781,14 @@
+
+ fi
+
+-echo "$as_me:22769: checking for type sigaction_t" >&5
++echo "$as_me:22784: 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 22776 "configure"
++#line 22791 "configure"
+ #include "confdefs.h"
+
+ #include <signal.h>
+@@ -22786,16 +22801,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22789: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22804: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22792: \$? = $ac_status" >&5
++ echo "$as_me:22807: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22795: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22810: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22798: \$? = $ac_status" >&5
++ echo "$as_me:22813: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_type_sigaction=yes
+ else
+@@ -22806,14 +22821,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:22809: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22824: 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:22816: checking declaration of size-change" >&5
++echo "$as_me:22831: 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
+@@ -22834,7 +22849,7 @@
+
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22837 "configure"
++#line 22852 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -22884,16 +22899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22902: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22890: \$? = $ac_status" >&5
++ echo "$as_me:22905: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22893: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22908: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22896: \$? = $ac_status" >&5
++ echo "$as_me:22911: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sizechange=yes
+ else
+@@ -22912,7 +22927,7 @@
+ done
+
+ fi
+-echo "$as_me:22915: result: $cf_cv_sizechange" >&5
++echo "$as_me:22930: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+
+@@ -22930,13 +22945,13 @@
+ esac
+ fi
+
+-echo "$as_me:22933: checking for memmove" >&5
++echo "$as_me:22948: 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 22939 "configure"
++#line 22954 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22967,16 +22982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22973: \$? = $ac_status" >&5
++ echo "$as_me:22988: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22976: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22991: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22979: \$? = $ac_status" >&5
++ echo "$as_me:22994: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_memmove=yes
+ else
+@@ -22986,19 +23001,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22989: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23004: 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:22995: checking for bcopy" >&5
++echo "$as_me:23010: 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 23001 "configure"
++#line 23016 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23029,16 +23044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23047: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23035: \$? = $ac_status" >&5
++ echo "$as_me:23050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23038: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23041: \$? = $ac_status" >&5
++ echo "$as_me:23056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_bcopy=yes
+ else
+@@ -23048,11 +23063,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23051: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23066: 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:23055: checking if bcopy does overlapping moves" >&5
++ echo "$as_me:23070: 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
+@@ -23062,7 +23077,7 @@
+ cf_cv_good_bcopy=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23065 "configure"
++#line 23080 "configure"
+ #include "confdefs.h"
+
+ int main(void) {
+@@ -23076,15 +23091,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23094: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23082: \$? = $ac_status" >&5
++ echo "$as_me:23097: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23084: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23087: \$? = $ac_status" >&5
++ echo "$as_me:23102: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_good_bcopy=yes
+ else
+@@ -23097,7 +23112,7 @@
+ fi
+
+ fi
+-echo "$as_me:23100: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23115: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+
+ else
+@@ -23124,13 +23139,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23127: checking for $ac_func" >&5
++echo "$as_me:23142: 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 23133 "configure"
++#line 23148 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23161,16 +23176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23164: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23179: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23167: \$? = $ac_status" >&5
++ echo "$as_me:23182: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23170: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23185: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23173: \$? = $ac_status" >&5
++ echo "$as_me:23188: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -23180,7 +23195,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23183: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23198: 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
+@@ -23190,7 +23205,7 @@
+ fi
+ done
+ }
+-echo "$as_me:23193: checking if poll really works" >&5
++echo "$as_me:23208: 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
+@@ -23200,7 +23215,7 @@
+ cf_cv_working_poll=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23203 "configure"
++#line 23218 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -23252,15 +23267,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23255: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23270: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23258: \$? = $ac_status" >&5
++ echo "$as_me:23273: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23260: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23275: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23263: \$? = $ac_status" >&5
++ echo "$as_me:23278: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -23272,21 +23287,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23275: result: $cf_cv_working_poll" >&5
++echo "$as_me:23290: 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:23282: checking for va_copy" >&5
++echo "$as_me:23297: 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 23289 "configure"
++#line 23304 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23303,16 +23318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23321: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23309: \$? = $ac_status" >&5
++ echo "$as_me:23324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23315: \$? = $ac_status" >&5
++ echo "$as_me:23330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -23322,7 +23337,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23325: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23340: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23334,14 +23349,14 @@
+
+ else # !cf_cv_have_va_copy
+
+-echo "$as_me:23337: checking for __va_copy" >&5
++echo "$as_me:23352: 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 23344 "configure"
++#line 23359 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23358,16 +23373,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23376: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23364: \$? = $ac_status" >&5
++ echo "$as_me:23379: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23367: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23382: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23370: \$? = $ac_status" >&5
++ echo "$as_me:23385: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -23377,7 +23392,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23380: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23395: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23389,14 +23404,14 @@
+
+ else # !cf_cv_have___va_copy
+
+-echo "$as_me:23392: checking for __builtin_va_copy" >&5
++echo "$as_me:23407: 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 23399 "configure"
++#line 23414 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23413,16 +23428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23431: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23419: \$? = $ac_status" >&5
++ echo "$as_me:23434: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23422: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23437: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23425: \$? = $ac_status" >&5
++ echo "$as_me:23440: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23432,7 +23447,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23435: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23450: 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 &&
+@@ -23450,14 +23465,14 @@
+ ;;
+
+ (*)
+- echo "$as_me:23453: checking if we can simply copy va_list" >&5
++ echo "$as_me:23468: 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 23460 "configure"
++#line 23475 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23474,16 +23489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23477: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23492: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23480: \$? = $ac_status" >&5
++ echo "$as_me:23495: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23483: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23498: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23486: \$? = $ac_status" >&5
++ echo "$as_me:23501: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_pointer_va_list=yes
+ else
+@@ -23493,19 +23508,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23496: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23511: 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:23501: checking if we can copy va_list indirectly" >&5
++ echo "$as_me:23516: 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 23508 "configure"
++#line 23523 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23522,16 +23537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23540: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23528: \$? = $ac_status" >&5
++ echo "$as_me:23543: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23546: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23534: \$? = $ac_status" >&5
++ echo "$as_me:23549: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_array_va_list=yes
+ else
+@@ -23541,7 +23556,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23544: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23559: 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
+@@ -23552,13 +23567,13 @@
+ ;;
+ esac
+
+-echo "$as_me:23555: checking for pid_t" >&5
++echo "$as_me:23570: 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 23561 "configure"
++#line 23576 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23573,16 +23588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23591: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23579: \$? = $ac_status" >&5
++ echo "$as_me:23594: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23582: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23597: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23585: \$? = $ac_status" >&5
++ echo "$as_me:23600: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -23592,7 +23607,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23595: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23610: 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
+ :
+@@ -23607,23 +23622,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:23610: checking for $ac_header" >&5
++echo "$as_me:23625: 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 23616 "configure"
++#line 23631 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23635: \"$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:23626: \$? = $ac_status" >&5
++ echo "$as_me:23641: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23642,7 +23657,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23645: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23660: 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
+@@ -23655,13 +23670,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23658: checking for $ac_func" >&5
++echo "$as_me:23673: 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 23664 "configure"
++#line 23679 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23692,16 +23707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23695: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23710: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23698: \$? = $ac_status" >&5
++ echo "$as_me:23713: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23701: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23716: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23704: \$? = $ac_status" >&5
++ echo "$as_me:23719: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -23711,7 +23726,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23714: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23729: 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
+@@ -23723,7 +23738,7 @@
+
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:23726: checking for working fork" >&5
++ echo "$as_me:23741: 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
+@@ -23746,15 +23761,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23764: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23752: \$? = $ac_status" >&5
++ echo "$as_me:23767: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23754: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23769: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23757: \$? = $ac_status" >&5
++ echo "$as_me:23772: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -23766,7 +23781,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23769: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23784: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -23780,12 +23795,12 @@
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+- { echo "$as_me:23783: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:23798: 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:23788: checking for working vfork" >&5
++ echo "$as_me:23803: 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
+@@ -23794,7 +23809,7 @@
+ ac_cv_func_vfork_works=cross
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23797 "configure"
++#line 23812 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -23891,15 +23906,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23909: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23897: \$? = $ac_status" >&5
++ echo "$as_me:23912: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23899: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23914: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23902: \$? = $ac_status" >&5
++ echo "$as_me:23917: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -23911,13 +23926,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23914: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23929: 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:23920: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:23935: 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
+
+@@ -23942,7 +23957,7 @@
+
+ fi
+
+-echo "$as_me:23945: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23960: 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
+@@ -23952,7 +23967,7 @@
+ cf_cv_fopen_bin_r=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23955 "configure"
++#line 23970 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -23985,15 +24000,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24003: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23991: \$? = $ac_status" >&5
++ echo "$as_me:24006: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23993: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24008: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23996: \$? = $ac_status" >&5
++ echo "$as_me:24011: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fopen_bin_r=yes
+ else
+@@ -24006,7 +24021,7 @@
+ fi
+
+ fi
+-echo "$as_me:24009: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24024: 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
+@@ -24015,7 +24030,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:24018: checking for openpty in -lutil" >&5
++echo "$as_me:24033: 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
+@@ -24023,7 +24038,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24026 "configure"
++#line 24041 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -24042,16 +24057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24045: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24060: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24048: \$? = $ac_status" >&5
++ echo "$as_me:24063: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24051: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24054: \$? = $ac_status" >&5
++ echo "$as_me:24069: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -24062,7 +24077,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24065: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24080: 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
+@@ -24070,7 +24085,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:24073: checking for openpty header" >&5
++echo "$as_me:24088: 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
+@@ -24097,7 +24112,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24100 "configure"
++#line 24115 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -24114,16 +24129,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24117: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24132: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24120: \$? = $ac_status" >&5
++ echo "$as_me:24135: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24123: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24138: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24126: \$? = $ac_status" >&5
++ echo "$as_me:24141: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -24141,7 +24156,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:24144: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24159: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24214,7 +24229,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24217 "configure"
++#line 24232 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24226,16 +24241,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24229: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24244: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24232: \$? = $ac_status" >&5
++ echo "$as_me:24247: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24235: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24250: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24238: \$? = $ac_status" >&5
++ echo "$as_me:24253: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -24252,7 +24267,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}:24255: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24270: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -24288,7 +24303,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}:24291: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24306: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -24299,7 +24314,7 @@
+ else
+ case "$with_hashed_db" in
+ (./*|../*|/*)
+- { echo "$as_me:24302: WARNING: no such directory $with_hashed_db" >&5
++ { echo "$as_me:24317: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ ;;
+ (*)
+@@ -24371,7 +24386,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24374 "configure"
++#line 24389 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24383,16 +24398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24401: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24389: \$? = $ac_status" >&5
++ echo "$as_me:24404: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24392: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24407: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24395: \$? = $ac_status" >&5
++ echo "$as_me:24410: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -24409,7 +24424,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}:24412: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24427: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -24489,7 +24504,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}:24492: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24507: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -24506,23 +24521,23 @@
+ fi
+ esac
+
+-echo "$as_me:24509: checking for db.h" >&5
++echo "$as_me:24524: 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 24515 "configure"
++#line 24530 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:24519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24534: \"$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:24525: \$? = $ac_status" >&5
++ echo "$as_me:24540: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24541,11 +24556,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24544: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24559: 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:24548: checking for version of db" >&5
++echo "$as_me:24563: 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
+@@ -24556,10 +24571,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+
+-echo "${as_me:-configure}:24559: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24574: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24562 "configure"
++#line 24577 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24589,16 +24604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24592: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24607: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24595: \$? = $ac_status" >&5
++ echo "$as_me:24610: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24598: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24613: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24601: \$? = $ac_status" >&5
++ echo "$as_me:24616: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -24612,16 +24627,16 @@
+ done
+
+ fi
+-echo "$as_me:24615: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24630: 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:24619: error: Cannot determine version of db" >&5
++ { { echo "$as_me:24634: 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:24624: checking for db libraries" >&5
++echo "$as_me:24639: 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
+@@ -24651,10 +24666,10 @@
+
+ fi
+
+-echo "${as_me:-configure}:24654: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24669: testing checking for library $cf_db_libs ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24657 "configure"
++#line 24672 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24709,16 +24724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24727: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24715: \$? = $ac_status" >&5
++ echo "$as_me:24730: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24718: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24733: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24721: \$? = $ac_status" >&5
++ echo "$as_me:24736: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -24738,11 +24753,11 @@
+ done
+
+ fi
+-echo "$as_me:24741: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24756: 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:24745: error: Cannot determine library for db" >&5
++ { { echo "$as_me:24760: 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
+@@ -24768,7 +24783,7 @@
+
+ else
+
+- { { echo "$as_me:24771: error: Cannot find db.h" >&5
++ { { echo "$as_me:24786: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -24783,7 +24798,7 @@
+
+ # Just in case, check if the C compiler has a bool type.
+
+-echo "$as_me:24786: checking if we should include stdbool.h" >&5
++echo "$as_me:24801: 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
+@@ -24791,7 +24806,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24794 "configure"
++#line 24809 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -24803,23 +24818,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24809: \$? = $ac_status" >&5
++ echo "$as_me:24824: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24812: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24827: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24815: \$? = $ac_status" >&5
++ echo "$as_me:24830: \$? = $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 24822 "configure"
++#line 24837 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -24835,16 +24850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24853: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24841: \$? = $ac_status" >&5
++ echo "$as_me:24856: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24844: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24859: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24847: \$? = $ac_status" >&5
++ echo "$as_me:24862: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -24858,13 +24873,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:24861: result: yes" >&5
++then echo "$as_me:24876: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:24863: result: no" >&5
++else echo "$as_me:24878: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:24867: checking for builtin bool type" >&5
++echo "$as_me:24882: 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
+@@ -24872,7 +24887,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24875 "configure"
++#line 24890 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -24887,16 +24902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24890: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24905: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24893: \$? = $ac_status" >&5
++ echo "$as_me:24908: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24896: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24911: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24899: \$? = $ac_status" >&5
++ echo "$as_me:24914: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -24909,9 +24924,9 @@
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:24912: result: yes" >&5
++then echo "$as_me:24927: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:24914: result: no" >&5
++else echo "$as_me:24929: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -24928,10 +24943,10 @@
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+- echo "$as_me:24931: checking if we already have C++ library" >&5
++ echo "$as_me:24946: 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 24934 "configure"
++#line 24949 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -24945,16 +24960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24948: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24963: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24951: \$? = $ac_status" >&5
++ echo "$as_me:24966: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24954: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24969: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24957: \$? = $ac_status" >&5
++ echo "$as_me:24972: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_libstdcpp=yes
+ else
+@@ -24963,7 +24978,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:24966: result: $cf_have_libstdcpp" >&5
++ echo "$as_me:24981: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+@@ -24982,7 +24997,7 @@
+ ;;
+ esac
+
+- echo "$as_me:24985: checking for library $cf_stdcpp_libname" >&5
++ echo "$as_me:25000: 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
+@@ -25008,7 +25023,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25011 "configure"
++#line 25026 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25022,16 +25037,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25040: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25028: \$? = $ac_status" >&5
++ echo "$as_me:25043: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25031: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25046: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25034: \$? = $ac_status" >&5
++ echo "$as_me:25049: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -25043,7 +25058,7 @@
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:25046: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25061: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25065,7 +25080,7 @@
+ fi
+ fi
+
+- echo "$as_me:25068: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:25083: 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
+@@ -25080,15 +25095,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:25083: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25098: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25086: \$? = $ac_status" >&5
++ echo "$as_me:25101: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:25088: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:25103: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25091: \$? = $ac_status" >&5
++ echo "$as_me:25106: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -25099,10 +25114,10 @@
+
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+- echo "$as_me:25102: result: yes" >&5
++ echo "$as_me:25117: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:25105: result: no" >&5
++ echo "$as_me:25120: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25122,7 +25137,7 @@
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:25125: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:25140: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+
+@@ -25143,7 +25158,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25146 "configure"
++#line 25161 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25157,16 +25172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25160: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25175: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25163: \$? = $ac_status" >&5
++ echo "$as_me:25178: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25166: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25181: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25169: \$? = $ac_status" >&5
++ echo "$as_me:25184: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -25203,7 +25218,7 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25206 "configure"
++#line 25221 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -25217,16 +25232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25220: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25235: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25223: \$? = $ac_status" >&5
++ echo "$as_me:25238: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25226: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25241: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25229: \$? = $ac_status" >&5
++ echo "$as_me:25244: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -25259,7 +25274,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save"
+- echo "$as_me:25262: result: $cf_cxx_library" >&5
++ echo "$as_me:25277: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -25275,7 +25290,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:25278: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25293: 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
+@@ -25292,18 +25307,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 25295 "configure"
++#line 25310 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25300: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25315: \"$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:25306: \$? = $ac_status" >&5
++ echo "$as_me:25321: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25326,17 +25341,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25329 "configure"
++#line 25344 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25333: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25348: \"$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:25339: \$? = $ac_status" >&5
++ echo "$as_me:25354: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25373,7 +25388,7 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25376: result: $CXXCPP" >&5
++echo "$as_me:25391: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25383,18 +25398,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 25386 "configure"
++#line 25401 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25391: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25406: \"$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:25397: \$? = $ac_status" >&5
++ echo "$as_me:25412: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25417,17 +25432,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25420 "configure"
++#line 25435 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25424: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25439: \"$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:25430: \$? = $ac_status" >&5
++ echo "$as_me:25445: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25455,7 +25470,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:25458: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:25473: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -25470,23 +25485,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25473: checking for $ac_header" >&5
++echo "$as_me:25488: 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 25479 "configure"
++#line 25494 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25483: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25498: \"$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:25489: \$? = $ac_status" >&5
++ echo "$as_me:25504: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25505,7 +25520,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25508: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25523: 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
+@@ -25518,23 +25533,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25521: checking for $ac_header" >&5
++echo "$as_me:25536: 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 25527 "configure"
++#line 25542 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25531: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25546: \"$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:25537: \$? = $ac_status" >&5
++ echo "$as_me:25552: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25553,7 +25568,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25556: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25571: 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
+@@ -25564,10 +25579,10 @@
+ done
+
+ if test x"$ac_cv_header_iostream" = xyes ; then
+- echo "$as_me:25567: checking if iostream uses std-namespace" >&5
++ echo "$as_me:25582: 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 25570 "configure"
++#line 25585 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25584,16 +25599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25587: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25590: \$? = $ac_status" >&5
++ echo "$as_me:25605: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25593: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25608: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25596: \$? = $ac_status" >&5
++ echo "$as_me:25611: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -25602,7 +25617,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:25605: result: $cf_iostream_namespace" >&5
++ echo "$as_me:25620: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+
+@@ -25613,7 +25628,7 @@
+ fi
+ fi
+
+-echo "$as_me:25616: checking if we should include stdbool.h" >&5
++echo "$as_me:25631: 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
+@@ -25621,7 +25636,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25624 "configure"
++#line 25639 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -25633,23 +25648,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25651: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25639: \$? = $ac_status" >&5
++ echo "$as_me:25654: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25642: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25657: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25645: \$? = $ac_status" >&5
++ echo "$as_me:25660: \$? = $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 25652 "configure"
++#line 25667 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -25665,16 +25680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25683: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25671: \$? = $ac_status" >&5
++ echo "$as_me:25686: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25674: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25689: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25677: \$? = $ac_status" >&5
++ echo "$as_me:25692: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -25688,13 +25703,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:25691: result: yes" >&5
++then echo "$as_me:25706: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25693: result: no" >&5
++else echo "$as_me:25708: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:25697: checking for builtin bool type" >&5
++echo "$as_me:25712: 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
+@@ -25702,7 +25717,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25705 "configure"
++#line 25720 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -25717,16 +25732,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25735: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25723: \$? = $ac_status" >&5
++ echo "$as_me:25738: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25726: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25741: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25729: \$? = $ac_status" >&5
++ echo "$as_me:25744: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -25739,19 +25754,19 @@
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:25742: result: yes" >&5
++then echo "$as_me:25757: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25744: result: no" >&5
++else echo "$as_me:25759: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:25748: checking for bool" >&5
++echo "$as_me:25763: 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 25754 "configure"
++#line 25769 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -25787,16 +25802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25790: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25805: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25793: \$? = $ac_status" >&5
++ echo "$as_me:25808: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25796: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25811: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25799: \$? = $ac_status" >&5
++ echo "$as_me:25814: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -25806,10 +25821,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25809: result: $ac_cv_type_bool" >&5
++echo "$as_me:25824: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:25812: checking size of bool" >&5
++echo "$as_me:25827: 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
+@@ -25818,7 +25833,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25821 "configure"
++#line 25836 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -25851,21 +25866,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25869: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25857: \$? = $ac_status" >&5
++ echo "$as_me:25872: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25860: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25875: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25863: \$? = $ac_status" >&5
++ echo "$as_me:25878: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25868 "configure"
++#line 25883 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -25898,16 +25913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25901: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25904: \$? = $ac_status" >&5
++ echo "$as_me:25919: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25907: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25922: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25910: \$? = $ac_status" >&5
++ echo "$as_me:25925: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -25923,7 +25938,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25926 "configure"
++#line 25941 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -25956,16 +25971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25974: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25962: \$? = $ac_status" >&5
++ echo "$as_me:25977: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25980: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25968: \$? = $ac_status" >&5
++ echo "$as_me:25983: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -25981,7 +25996,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 25984 "configure"
++#line 25999 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26014,16 +26029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26032: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26020: \$? = $ac_status" >&5
++ echo "$as_me:26035: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26023: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26038: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26026: \$? = $ac_status" >&5
++ echo "$as_me:26041: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -26036,12 +26051,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:26039: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:26054: 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 26044 "configure"
++#line 26059 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26078,15 +26093,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26081: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26096: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26084: \$? = $ac_status" >&5
++ echo "$as_me:26099: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26086: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26101: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26089: \$? = $ac_status" >&5
++ echo "$as_me:26104: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26102,13 +26117,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26105: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26120: 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:26111: checking for type of bool" >&5
++echo "$as_me:26126: 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
+@@ -26127,7 +26142,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26130 "configure"
++#line 26145 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26169,15 +26184,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26187: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26175: \$? = $ac_status" >&5
++ echo "$as_me:26190: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26177: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26192: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26180: \$? = $ac_status" >&5
++ echo "$as_me:26195: \$? = $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
+@@ -26194,19 +26209,19 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:26197: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26212: 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:26204: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:26219: 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:26209: checking for special defines needed for etip.h" >&5
++echo "$as_me:26224: 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"
+@@ -26224,7 +26239,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 26227 "configure"
++#line 26242 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -26238,16 +26253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26256: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26244: \$? = $ac_status" >&5
++ echo "$as_me:26259: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26247: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26262: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26250: \$? = $ac_status" >&5
++ echo "$as_me:26265: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -26268,12 +26283,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:26271: result: $cf_result" >&5
++echo "$as_me:26286: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+
+ if test -n "$CXX"; then
+-echo "$as_me:26276: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26291: 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
+@@ -26290,7 +26305,7 @@
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26293 "configure"
++#line 26308 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -26309,15 +26324,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26327: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26315: \$? = $ac_status" >&5
++ echo "$as_me:26330: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26317: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26332: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26320: \$? = $ac_status" >&5
++ echo "$as_me:26335: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -26336,7 +26351,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:26339: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26354: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26346,7 +26361,7 @@
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:26349: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26364: 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
+@@ -26360,7 +26375,7 @@
+ ac_main_return="return"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26363 "configure"
++#line 26378 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -26404,16 +26419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26407: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26422: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26410: \$? = $ac_status" >&5
++ echo "$as_me:26425: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26413: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26428: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26416: \$? = $ac_status" >&5
++ echo "$as_me:26431: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -26431,7 +26446,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:26434: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26449: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -26480,13 +26495,13 @@
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+-echo "$as_me:26483: checking for bool" >&5
++echo "$as_me:26498: 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 26489 "configure"
++#line 26504 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26522,16 +26537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26540: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26528: \$? = $ac_status" >&5
++ echo "$as_me:26543: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26546: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26534: \$? = $ac_status" >&5
++ echo "$as_me:26549: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -26541,10 +26556,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26544: result: $ac_cv_type_bool" >&5
++echo "$as_me:26559: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:26547: checking size of bool" >&5
++echo "$as_me:26562: 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
+@@ -26553,7 +26568,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26556 "configure"
++#line 26571 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26586,21 +26601,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26589: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26604: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26592: \$? = $ac_status" >&5
++ echo "$as_me:26607: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26595: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26610: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26598: \$? = $ac_status" >&5
++ echo "$as_me:26613: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26603 "configure"
++#line 26618 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26633,16 +26648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26651: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26639: \$? = $ac_status" >&5
++ echo "$as_me:26654: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26642: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26657: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26645: \$? = $ac_status" >&5
++ echo "$as_me:26660: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -26658,7 +26673,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26661 "configure"
++#line 26676 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26691,16 +26706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26694: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26709: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26697: \$? = $ac_status" >&5
++ echo "$as_me:26712: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26700: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26715: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26703: \$? = $ac_status" >&5
++ echo "$as_me:26718: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -26716,7 +26731,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 26719 "configure"
++#line 26734 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26749,16 +26764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26767: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26755: \$? = $ac_status" >&5
++ echo "$as_me:26770: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26758: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26773: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26761: \$? = $ac_status" >&5
++ echo "$as_me:26776: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -26771,12 +26786,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:26774: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:26789: 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 26779 "configure"
++#line 26794 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26813,15 +26828,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26831: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26819: \$? = $ac_status" >&5
++ echo "$as_me:26834: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26821: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26824: \$? = $ac_status" >&5
++ echo "$as_me:26839: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26837,13 +26852,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26840: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26855: 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:26846: checking for type of bool" >&5
++echo "$as_me:26861: 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
+@@ -26862,7 +26877,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26865 "configure"
++#line 26880 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -26904,15 +26919,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26922: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26910: \$? = $ac_status" >&5
++ echo "$as_me:26925: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26912: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26927: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26915: \$? = $ac_status" >&5
++ echo "$as_me:26930: \$? = $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
+@@ -26929,26 +26944,26 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:26932: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26947: 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:26939: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:26954: 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:26945: checking for fallback type of bool" >&5
++ echo "$as_me:26960: 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:26951: result: $cf_cv_type_of_bool" >&5
++ echo "$as_me:26966: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ fi
+ fi
+@@ -26977,7 +26992,7 @@
+
+ if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+- { echo "$as_me:26980: WARNING: libtool does not support Ada - disabling feature" >&5
++ { echo "$as_me:26995: 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
+@@ -26994,7 +27009,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:26997: checking for $ac_word" >&5
++echo "$as_me:27012: 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
+@@ -27011,7 +27026,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:27014: found $ac_dir/$ac_word" >&5
++ echo "$as_me:27029: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -27023,10 +27038,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+ if test -n "$cf_TEMP_gnat"; then
+- echo "$as_me:27026: result: $cf_TEMP_gnat" >&5
++ echo "$as_me:27041: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+- echo "$as_me:27029: result: no" >&5
++ echo "$as_me:27044: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -27036,7 +27051,7 @@
+ unset cf_cv_gnat_version
+ unset cf_TEMP_gnat
+
+-echo "$as_me:27039: checking for $cf_prog_gnat version" >&5
++echo "$as_me:27054: 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
+@@ -27047,7 +27062,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:27050: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27065: 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
+@@ -27076,7 +27091,7 @@
+ cd conftest.src
+ for cf_gprconfig in Ada C
+ do
+- echo "$as_me:27079: checking for gprconfig name for $cf_gprconfig" >&5
++ echo "$as_me:27094: 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
+@@ -27095,10 +27110,10 @@
+ if test -n "$cf_gprconfig_value"
+ then
+ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+- echo "$as_me:27098: result: $cf_gprconfig_value" >&5
++ echo "$as_me:27113: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ else
+- echo "$as_me:27101: result: missing" >&5
++ echo "$as_me:27116: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ cf_ada_config="#"
+ break
+@@ -27111,7 +27126,7 @@
+ if test "x$cf_ada_config" != "x#"
+ then
+
+-echo "$as_me:27114: checking for gnat version" >&5
++echo "$as_me:27129: 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
+@@ -27122,7 +27137,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:27125: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27140: 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
+
+@@ -27131,7 +27146,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { 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:27149: 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
+ ;;
+@@ -27139,7 +27154,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:27142: checking for $ac_word" >&5
++echo "$as_me:27157: 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
+@@ -27154,7 +27169,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:27157: found $ac_dir/$ac_word" >&5
++echo "$as_me:27172: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -27163,20 +27178,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:27166: result: $M4_exists" >&5
++ echo "$as_me:27181: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:27169: result: no" >&5
++ echo "$as_me:27184: 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:27175: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++ { echo "$as_me:27190: 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:27179: checking if GNAT works" >&5
++ echo "$as_me:27194: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf ./conftest* ./*~conftest*
+@@ -27204,7 +27219,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+
+- echo "$as_me:27207: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:27222: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ else
+@@ -27216,7 +27231,7 @@
+
+ ADAFLAGS="$ADAFLAGS -gnatpn"
+
+- echo "$as_me:27219: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:27234: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -27233,10 +27248,10 @@
+
+ ;;
+ esac
+- echo "$as_me:27236: result: $ADAFLAGS" >&5
++ echo "$as_me:27251: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:27239: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27254: 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
+@@ -27246,11 +27261,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:27249: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27264: 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:27253: checking if GNAT supports generics" >&5
++echo "$as_me:27268: 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])
+@@ -27260,7 +27275,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:27263: result: $cf_gnat_generics" >&5
++echo "$as_me:27278: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -27272,7 +27287,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:27275: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27290: 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
+@@ -27320,7 +27335,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:27323: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27338: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27333,7 +27348,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27336: checking if GNAT supports project files" >&5
++echo "$as_me:27351: 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]*)
+@@ -27396,15 +27411,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:27399: result: $cf_gnat_projects" >&5
++echo "$as_me:27414: 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:27405: checking if GNAT supports libraries" >&5
++ echo "$as_me:27420: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:27407: result: $cf_gnat_libraries" >&5
++ echo "$as_me:27422: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -27424,7 +27439,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:27427: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:27442: 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
+@@ -27436,7 +27451,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:27439: checking for ada-compiler" >&5
++echo "$as_me:27454: 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.
+@@ -27447,12 +27462,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:27450: result: $cf_ada_compiler" >&5
++echo "$as_me:27465: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:27455: checking for ada-include" >&5
++echo "$as_me:27470: 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.
+@@ -27488,7 +27503,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:27491: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:27506: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -27497,10 +27512,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:27500: result: $ADA_INCLUDE" >&5
++echo "$as_me:27515: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:27503: checking for ada-objects" >&5
++echo "$as_me:27518: 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.
+@@ -27536,7 +27551,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:27539: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:27554: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -27545,10 +27560,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:27548: result: $ADA_OBJECTS" >&5
++echo "$as_me:27563: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:27551: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27566: 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.
+@@ -27558,14 +27573,14 @@
+ else
+ with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27561: result: $with_ada_sharedlib" >&5
++echo "$as_me:27576: 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:27568: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++ { echo "$as_me:27583: 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
+@@ -27585,7 +27600,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:27588: checking for ada-libname" >&5
++echo "$as_me:27603: 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.
+@@ -27601,7 +27616,7 @@
+ ;;
+ esac
+
+-echo "$as_me:27604: result: $ADA_LIBNAME" >&5
++echo "$as_me:27619: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ fi
+@@ -27612,13 +27627,13 @@
+
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+- echo "$as_me:27615: checking for wchar_t" >&5
++ echo "$as_me:27630: 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 27621 "configure"
++#line 27636 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27633,16 +27648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27651: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27639: \$? = $ac_status" >&5
++ echo "$as_me:27654: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27642: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27657: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27645: \$? = $ac_status" >&5
++ echo "$as_me:27660: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_wchar_t=yes
+ else
+@@ -27652,10 +27667,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27655: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27670: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+
+-echo "$as_me:27658: checking size of wchar_t" >&5
++echo "$as_me:27673: 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
+@@ -27664,7 +27679,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27667 "configure"
++#line 27682 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27676,21 +27691,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27694: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27682: \$? = $ac_status" >&5
++ echo "$as_me:27697: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27685: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27700: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27688: \$? = $ac_status" >&5
++ echo "$as_me:27703: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27693 "configure"
++#line 27708 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27702,16 +27717,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27720: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27708: \$? = $ac_status" >&5
++ echo "$as_me:27723: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27711: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27726: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27714: \$? = $ac_status" >&5
++ echo "$as_me:27729: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -27727,7 +27742,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27730 "configure"
++#line 27745 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27739,16 +27754,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27742: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27757: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27745: \$? = $ac_status" >&5
++ echo "$as_me:27760: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27748: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27763: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27751: \$? = $ac_status" >&5
++ echo "$as_me:27766: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -27764,7 +27779,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 27767 "configure"
++#line 27782 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27776,16 +27791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27794: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27782: \$? = $ac_status" >&5
++ echo "$as_me:27797: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27785: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27800: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27788: \$? = $ac_status" >&5
++ echo "$as_me:27803: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -27798,12 +27813,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:27801: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:27816: 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 27806 "configure"
++#line 27821 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27819,15 +27834,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27822: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27837: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27825: \$? = $ac_status" >&5
++ echo "$as_me:27840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27827: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27842: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27830: \$? = $ac_status" >&5
++ echo "$as_me:27845: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27843,7 +27858,7 @@
+ ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27846: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27861: 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
+@@ -27856,7 +27871,7 @@
+ then
+ test -n "$verbose" && echo " test failed (assume 2)" 1>&6
+
+-echo "${as_me:-configure}:27859: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27874: testing test failed (assume 2) ..." 1>&5
+
+ sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ mv confdefs.tmp confdefs.h
+@@ -27874,7 +27889,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27877: checking for library subsets" >&5
++echo "$as_me:27892: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -27928,7 +27943,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:27931: result: $LIB_SUBSETS" >&5
++echo "$as_me:27946: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -27959,7 +27974,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:27962: checking default library suffix" >&5
++echo "$as_me:27977: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -27970,10 +27985,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27973: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27988: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:27976: checking default library-dependency suffix" >&5
++echo "$as_me:27991: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -28056,10 +28071,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:28059: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28074: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:28062: checking default object directory" >&5
++echo "$as_me:28077: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28075,11 +28090,11 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:28078: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28093: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28082: checking c++ library-dependency suffix" >&5
++echo "$as_me:28097: 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++)
+@@ -28172,7 +28187,7 @@
+ fi
+
+ fi
+-echo "$as_me:28175: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28190: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -28348,19 +28363,19 @@
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:28351: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:28366: 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 28356 "configure"
++#line 28371 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28363: \$? = $ac_status" >&5
++ echo "$as_me:28378: \$? = $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
+@@ -28371,10 +28386,10 @@
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28374 "configure"
++#line 28389 "configure"
+ #include "confdefs.h"
+
+-#line 28377 "configure"
++#line 28392 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -28389,16 +28404,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28392: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28407: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28395: \$? = $ac_status" >&5
++ echo "$as_me:28410: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:28398: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28413: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28401: \$? = $ac_status" >&5
++ echo "$as_me:28416: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ # some linkers simply ignore the -dynamic
+@@ -28421,7 +28436,7 @@
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:28424: result: $cf_ldflags_static" >&5
++ echo "$as_me:28439: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test "$cf_ldflags_static" != yes
+@@ -28437,7 +28452,7 @@
+ ;;
+ esac
+
+-echo "$as_me:28440: checking where we will install curses.h" >&5
++echo "$as_me:28455: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+
+ includesubdir=
+@@ -28447,7 +28462,7 @@
+ then
+ includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28450: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28465: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28455,7 +28470,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:28458: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:28473: 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
+@@ -28483,7 +28498,7 @@
+
+ # pkgsrc uses these
+
+-echo "$as_me:28486: checking for desired basename for form library" >&5
++echo "$as_me:28501: 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.
+@@ -28503,10 +28518,10 @@
+ ;;
+ esac
+
+-echo "$as_me:28506: result: $FORM_NAME" >&5
++echo "$as_me:28521: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:28509: checking for desired basename for menu library" >&5
++echo "$as_me:28524: 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.
+@@ -28526,10 +28541,10 @@
+ ;;
+ esac
+
+-echo "$as_me:28529: result: $MENU_NAME" >&5
++echo "$as_me:28544: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:28532: checking for desired basename for panel library" >&5
++echo "$as_me:28547: 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.
+@@ -28549,10 +28564,10 @@
+ ;;
+ esac
+
+-echo "$as_me:28552: result: $PANEL_NAME" >&5
++echo "$as_me:28567: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:28555: checking for desired basename for cxx library" >&5
++echo "$as_me:28570: 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.
+@@ -28572,13 +28587,13 @@
+ ;;
+ esac
+
+-echo "$as_me:28575: result: $CXX_NAME" >&5
++echo "$as_me:28590: 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:28581: checking for src modules" >&5
++echo "$as_me:28596: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -28647,7 +28662,7 @@
+ fi
+ fi
+ done
+-echo "$as_me:28650: result: $cf_cv_src_modules" >&5
++echo "$as_me:28665: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28808,7 +28823,7 @@
+ (*-D_XOPEN_SOURCE_EXTENDED*)
+ test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+
+-echo "${as_me:-configure}:28811: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28826: 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//'`
+@@ -28819,7 +28834,7 @@
+
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28822: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28837: 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
+@@ -28835,7 +28850,7 @@
+ done
+ test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28838: result: $PKG_CFLAGS" >&5
++echo "$as_me:28853: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this.
+@@ -28896,7 +28911,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}:28899: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28914: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+
+ fi
+
+@@ -28923,7 +28938,7 @@
+
+ # This is used for the *-config script and *.pc data files.
+
+-echo "$as_me:28926: checking for linker search path" >&5
++echo "$as_me:28941: 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
+@@ -28971,7 +28986,7 @@
+ cf_pathlist="$cf_pathlist /lib /usr/lib"
+ ;;
+ (*)
+- { echo "$as_me:28974: WARNING: problem with Solaris architecture" >&5
++ { echo "$as_me:28989: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ ;;
+ esac
+@@ -29012,7 +29027,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+
+ fi
+-echo "$as_me:29015: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29030: 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'`
+@@ -29102,7 +29117,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29105: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29120: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29281,7 +29296,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:29284: error: ambiguous option: $1
++ { { echo "$as_me:29299: 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;}
+@@ -29300,7 +29315,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:29303: error: unrecognized option: $1
++ -*) { { echo "$as_me:29318: 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;}
+@@ -29426,7 +29441,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:29429: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:29444: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -29938,7 +29953,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:29941: creating $ac_file" >&5
++ { echo "$as_me:29956: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -29956,7 +29971,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:29959: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:29974: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -29969,7 +29984,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:29972: error: cannot find input file: $f" >&5
++ { { echo "$as_me:29987: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -29985,7 +30000,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:29988: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:30003: 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;}
+@@ -29994,7 +30009,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:29997: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:30012: 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;}
+@@ -30031,7 +30046,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:30034: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:30049: 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;}
+@@ -30042,7 +30057,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:30045: WARNING: Some variables may not be substituted:
++ { echo "$as_me:30060: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30091,7 +30106,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:30094: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:30109: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -30102,7 +30117,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30105: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30120: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -30115,7 +30130,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30118: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30133: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30173,7 +30188,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:30176: $ac_file is unchanged" >&5
++ { echo "$as_me:30191: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30560,7 +30575,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}:30563: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30578: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+ with_shared_cxx=yes
+ ;;
+Index: configure.in
+Prereq: 1.742
+--- ncurses-6.3-20220409+/configure.in 2022-03-05 22:13:12.000000000 +0000
++++ ncurses-6.3-20220416/configure.in 2022-04-17 00:26:25.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.742 2022/03/05 22:13:12 tom Exp $
++dnl $Id: configure.in,v 1.744 2022/04/17 00:26:25 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210101)
+-AC_REVISION($Revision: 1.742 $)
++AC_REVISION($Revision: 1.744 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+
+@@ -693,6 +693,15 @@
+ WHICH_XTERM=$with_xterm_new
+ AC_SUBST(WHICH_XTERM)
+
++case $host_os in
++(*linux-gnu|*cygwin|*mingw32|*msys)
++ want_xterm_kbs=DEL
++ ;;
++(*)
++ want_xterm_kbs=BS
++ ;;
++esac
++
+ AC_MSG_CHECKING(if xterm backspace sends BS or DEL)
+ AC_ARG_WITH(xterm-kbs,
+ [ --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL],
+@@ -713,6 +722,11 @@
+ XTERM_KBS=$with_xterm_kbs
+ AC_SUBST(XTERM_KBS)
+
++if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
++then
++ AC_MSG_WARN(expected --with-xterm-kbs=$want_xterm_kbs for $host_os)
++fi
++
+ MAKE_TERMINFO=
+ if test "$use_database" = no ; then
+ TERMINFO="${datadir}/terminfo"
+Index: dist.mk
+Prereq: 1.1474
+--- ncurses-6.3-20220409+/dist.mk 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/dist.mk 2022-04-16 12:59:30.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1474 2022/04/09 12:59:03 tom Exp $
++# $Id: dist.mk,v 1.1475 2022/04/16 12:59:30 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 = 20220409
++NCURSES_PATCH = 20220416
+
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.3-20220409+/doc/html/man/adacurses6-config.1.html 2022-02-20 00:42:56.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/adacurses6-config.1.html 2022-04-16 20:02:16.000000000 +0000
+@@ -126,7 +126,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.3-20220409+/doc/html/man/captoinfo.1m.html 2022-02-20 00:42:56.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/captoinfo.1m.html 2022-04-16 20:02:16.000000000 +0000
+@@ -199,7 +199,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+ </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+Index: doc/html/man/clear.1.html
+--- ncurses-6.3-20220409+/doc/html/man/clear.1.html 2022-02-20 00:42:56.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/clear.1.html 2022-04-16 20:02:16.000000000 +0000
+@@ -150,7 +150,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>xterm(1)</STRONG>.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.3-20220409+/doc/html/man/curs_attr.3x.html 2022-02-12 20:17:48.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/curs_attr.3x.html 2022-04-16 20:02:17.000000000 +0000
+@@ -28,7 +28,7 @@
+ * sale, use or other dealings in this Software without prior written *
+ * authorization. *
+ ****************************************************************************
+- * @Id: curs_attr.3x,v 1.71 2022/02/12 20:07:29 tom Exp @
++ * @Id: curs_attr.3x,v 1.72 2022/04/16 19:18:32 tom Exp @
+ * ---------------------------------------------------------------------------
+ * attr_get
+ * .br
+@@ -410,35 +410,34 @@
+ tion uses that parameter in ABI 6 for the functions which have a color-
+ pair parameter to support <EM>extended</EM> <EM>color</EM> <EM>pairs</EM>:
+
+- <STRONG>o</STRONG> For functions which modify the color, e.g., <STRONG>wattr_set</STRONG>, if <EM>opts</EM> is
+- set it is treated as a pointer to <STRONG>int</STRONG>, and used to set the color
+- pair instead of the <STRONG>short</STRONG> <EM>pair</EM> parameter.
++ <STRONG>o</STRONG> For functions which modify the color, e.g., <STRONG>wattr_set</STRONG> and <STRONG>wattr_on</STRONG>,
++ if <EM>opts</EM> is set it is treated as a pointer to <STRONG>int</STRONG>, and used to set
++ the color pair instead of the <STRONG>short</STRONG> <EM>pair</EM> parameter.
+
+ <STRONG>o</STRONG> For functions which retrieve the color, e.g., <STRONG>wattr_get</STRONG>, if <EM>opts</EM> is
+ set it is treated as a pointer to <STRONG>int</STRONG>, and used to retrieve the
+- color pair as an <STRONG>int</STRONG> value, in addition retrieving it via the stan-
+- dard pointer to <STRONG>short</STRONG> parameter.
++ color pair as an <STRONG>int</STRONG> value, in addition to retrieving it via the
++ standard pointer to <STRONG>short</STRONG> parameter.
+
+- The remaining functions which have <EM>opts</EM>, but do not manipulate color,
+- e.g., <STRONG>wattr_on</STRONG> and <STRONG>wattr_off</STRONG> are not used by this implementation except
+- to check that they are <STRONG>NULL</STRONG>.
++ <STRONG>o</STRONG> For functions which turn attributes off, e.g., <STRONG>wattr_off</STRONG>, the <EM>opts</EM>
++ parameter is ignored except except to check that it is <STRONG>NULL</STRONG>.
+
+
+ </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
+ These functions are supported in the XSI Curses standard, Issue 4. The
+- standard defined the dedicated type for highlights, <STRONG>attr_t</STRONG>, which was
++ standard defined the dedicated type for highlights, <STRONG>attr_t</STRONG>, which was
+ not defined in SVr4 curses. The functions taking <STRONG>attr_t</STRONG> arguments were
+ not supported under SVr4.
+
+ Very old versions of this library did not force an update of the screen
+- when changing the attributes. Use <STRONG>touchwin</STRONG> to force the screen to
++ when changing the attributes. Use <STRONG>touchwin</STRONG> to force the screen to
+ match the updated attributes.
+
+- The XSI Curses standard states that whether the traditional functions
+- <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG> can manipulate attributes other than <STRONG>A_BLINK</STRONG>,
+- <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is "unspecified".
+- Under this implementation as well as SVr4 curses, these functions cor-
+- rectly manipulate all other highlights (specifically, <STRONG>A_ALTCHARSET</STRONG>,
++ The XSI Curses standard states that whether the traditional functions
++ <STRONG>attron</STRONG>/<STRONG>attroff</STRONG>/<STRONG>attrset</STRONG> can manipulate attributes other than <STRONG>A_BLINK</STRONG>,
++ <STRONG>A_BOLD</STRONG>, <STRONG>A_DIM</STRONG>, <STRONG>A_REVERSE</STRONG>, <STRONG>A_STANDOUT</STRONG>, or <STRONG>A_UNDERLINE</STRONG> is "unspecified".
++ Under this implementation as well as SVr4 curses, these functions cor-
++ rectly manipulate all other highlights (specifically, <STRONG>A_ALTCHARSET</STRONG>,
+ <STRONG>A_PROTECT</STRONG>, and <STRONG>A_INVIS</STRONG>).
+
+ XSI Curses added these entry points:
+@@ -446,7 +445,7 @@
+ <STRONG>attr_get</STRONG>, <STRONG>attr_on</STRONG>, <STRONG>attr_off</STRONG>, <STRONG>attr_set</STRONG>, <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, <STRONG>wat-</STRONG>
+ <STRONG>tr_get</STRONG>, <STRONG>wattr_set</STRONG>
+
+- The new functions are intended to work with a new series of highlight
++ The new functions are intended to work with a new series of highlight
+ macros prefixed with <STRONG>WA_</STRONG>. The older macros have direct counterparts in
+ the newer set of names:
+
+@@ -461,11 +460,11 @@
+ <STRONG>WA_BOLD</STRONG> Extra bright or bold
+ <STRONG>WA_ALTCHARSET</STRONG> Alternate character set
+
+- XSI curses does not assign values to these symbols, nor does it state
++ XSI curses does not assign values to these symbols, nor does it state
+ whether or not they are related to the similarly-named A_NORMAL, etc.:
+
+- <STRONG>o</STRONG> The XSI curses standard specifies that each pair of corresponding
+- <STRONG>A_</STRONG> and <STRONG>WA_</STRONG>-using functions operates on the same current-highlight
++ <STRONG>o</STRONG> The XSI curses standard specifies that each pair of corresponding
++ <STRONG>A_</STRONG> and <STRONG>WA_</STRONG>-using functions operates on the same current-highlight
+ information.
+
+ <STRONG>o</STRONG> However, in some implementations, those symbols have unrelated val-
+@@ -473,17 +472,25 @@
+
+ For example, the Solaris <EM>xpg4</EM> (X/Open) curses declares <STRONG>attr_t</STRONG> to be
+ an unsigned short integer (16-bits), while <STRONG>chtype</STRONG> is a unsigned in-
+- teger (32-bits). The <STRONG>WA_</STRONG> symbols in this case are different from
+- the <STRONG>A_</STRONG> symbols because they are used for a smaller datatype which
++ teger (32-bits). The <STRONG>WA_</STRONG> symbols in this case are different from
++ the <STRONG>A_</STRONG> symbols because they are used for a smaller datatype which
+ does not represent <STRONG>A_CHARTEXT</STRONG> or <STRONG>A_COLOR</STRONG>.
+
+ In this implementation (as in many others), the values happen to be
+- the same because it simplifies copying information between <STRONG>chtype</STRONG>
++ the same because it simplifies copying information between <STRONG>chtype</STRONG>
+ and <STRONG>cchar_t</STRONG> variables.
+
++ <STRONG>o</STRONG> Because ncurses's <STRONG>attr_t</STRONG> can hold a color pair (in the <STRONG>A_COLOR</STRONG>
++ field), a call to <STRONG>wattr_on</STRONG>, <STRONG>wattr_off</STRONG>, or <STRONG>wattr_set</STRONG> may alter the
++ window's color. If the color pair information in the attribute pa-
++ rameter is zero, no change is made to the window's color.
++
++ This is consistent with SVr4 curses; X/Open Curses does not specify
++ this.
++
+ The XSI standard extended conformance level adds new highlights <STRONG>A_HORI-</STRONG>
+- <STRONG>ZONTAL</STRONG>, <STRONG>A_LEFT</STRONG>, <STRONG>A_LOW</STRONG>, <STRONG>A_RIGHT</STRONG>, <STRONG>A_TOP</STRONG>, <STRONG>A_VERTICAL</STRONG> (and corresponding
+- <STRONG>WA_</STRONG> macros for each). As of August 2013, no known terminal provides
++ <STRONG>ZONTAL</STRONG>, <STRONG>A_LEFT</STRONG>, <STRONG>A_LOW</STRONG>, <STRONG>A_RIGHT</STRONG>, <STRONG>A_TOP</STRONG>, <STRONG>A_VERTICAL</STRONG> (and corresponding
++ <STRONG>WA_</STRONG> macros for each). As of August 2013, no known terminal provides
+ these highlights (i.e., via the <STRONG>sgr1</STRONG> capability).
+
+
+@@ -499,10 +506,10 @@
+ <STRONG>o</STRONG> returns an error if the color pair parameter for <STRONG>wcolor_set</STRONG> is out-
+ side the range 0..COLOR_PAIRS-1.
+
+- <STRONG>o</STRONG> does not return an error if either of the parameters of <STRONG>wattr_get</STRONG>
++ <STRONG>o</STRONG> does not return an error if either of the parameters of <STRONG>wattr_get</STRONG>
+ used for retrieving attribute or color-pair values is <STRONG>NULL</STRONG>.
+
+- Functions with a "mv" prefix first perform a cursor movement using
++ Functions with a "mv" prefix first perform a cursor movement using
+ <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
+ the window pointer is null.
+
+Index: doc/html/man/form.3x.html
+--- ncurses-6.3-20220409+/doc/html/man/form.3x.html 2022-02-20 00:42:59.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/form.3x.html 2022-04-16 20:02:19.000000000 +0000
+@@ -248,7 +248,7 @@
+ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed
+ descriptions of the entry points.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.3-20220409+/doc/html/man/infocmp.1m.html 2022-02-20 00:43:00.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/infocmp.1m.html 2022-04-16 20:02:20.000000000 +0000
+@@ -514,7 +514,7 @@
+
+ https://invisible-island.net/ncurses/tctest.html
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+ </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.3-20220409+/doc/html/man/infotocap.1m.html 2022-02-20 00:43:00.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/infotocap.1m.html 2022-04-16 20:02:20.000000000 +0000
+@@ -91,7 +91,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+ </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+Index: doc/html/man/menu.3x.html
+--- ncurses-6.3-20220409+/doc/html/man/menu.3x.html 2022-02-20 00:43:00.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/menu.3x.html 2022-04-16 20:02:20.000000000 +0000
+@@ -223,7 +223,7 @@
+ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed
+ descriptions of the entry points.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.3-20220409+/doc/html/man/ncurses.3x.html 2022-02-20 00:43:01.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/ncurses.3x.html 2022-04-16 20:02:21.000000000 +0000
+@@ -60,7 +60,7 @@
+ method of updating character screens with reasonable optimization.
+ This implementation is "new curses" (ncurses) and is the approved
+ replacement for 4.4BSD classic curses, which has been discontinued.
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+ The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4
+ UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.3-20220409+/doc/html/man/ncurses6-config.1.html 2022-02-20 00:43:01.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/ncurses6-config.1.html 2022-04-16 20:02:21.000000000 +0000
+@@ -113,7 +113,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.3-20220409+/doc/html/man/panel.3x.html 2022-02-20 00:43:01.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/panel.3x.html 2022-04-16 20:02:21.000000000 +0000
+@@ -281,7 +281,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+ </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.3-20220409+/doc/html/man/tabs.1.html 2022-02-20 00:43:02.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/tabs.1.html 2022-04-16 20:02:21.000000000 +0000
+@@ -252,7 +252,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.3-20220409+/doc/html/man/terminfo.5.html 2022-02-20 00:43:02.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/terminfo.5.html 2022-04-16 20:02:21.000000000 +0000
+@@ -106,7 +106,7 @@
+ have, by specifying how to perform screen operations, and by specifying
+ padding requirements and initialization sequences.
+
+- This manual describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This manual describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+ </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.3-20220409+/doc/html/man/tic.1m.html 2022-02-20 00:43:02.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/tic.1m.html 2022-04-16 20:02:21.000000000 +0000
+@@ -461,7 +461,7 @@
+ <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
+ <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+ </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
+Index: doc/html/man/toe.1m.html
+--- ncurses-6.3-20220409+/doc/html/man/toe.1m.html 2022-02-20 00:43:02.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/toe.1m.html 2022-04-16 20:02:21.000000000 +0000
+@@ -171,7 +171,7 @@
+ <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
+ <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/tput.1.html
+--- ncurses-6.3-20220409+/doc/html/man/tput.1.html 2022-02-20 00:43:02.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/tput.1.html 2022-04-16 20:02:22.000000000 +0000
+@@ -545,7 +545,7 @@
+ </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
+ <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: doc/html/man/tset.1.html
+--- ncurses-6.3-20220409+/doc/html/man/tset.1.html 2022-02-20 00:43:02.000000000 +0000
++++ ncurses-6.3-20220416/doc/html/man/tset.1.html 2022-04-16 20:02:22.000000000 +0000
+@@ -391,7 +391,7 @@
+ <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
+ <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
+
+- This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220219).
++ This describes <STRONG>ncurses</STRONG> version 6.3 (patch 20220416).
+
+
+
+Index: man/curs_attr.3x
+Prereq: 1.71
+--- ncurses-6.3-20220409+/man/curs_attr.3x 2022-02-12 20:07:29.000000000 +0000
++++ ncurses-6.3-20220416/man/curs_attr.3x 2022-04-16 19:18:32.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization. *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.71 2022/02/12 20:07:29 tom Exp $
++.\" $Id: curs_attr.3x,v 1.72 2022/04/16 19:18:32 tom Exp $
+ .TH curs_attr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el .ds `` ``
+@@ -484,7 +484,7 @@
+ have a color-pair parameter to support \fIextended color pairs\fP:
+ .bP
+ For functions which modify the color, e.g.,
+-\fBwattr_set\fP,
++\fBwattr_set\fP and \fBwattr_on\fP,
+ if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+ and used to set the color pair instead of the \fBshort\fP \fIpair\fP parameter.
+ .bP
+@@ -492,13 +492,13 @@
+ \fBwattr_get\fP,
+ if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+ and used to retrieve the color pair as an \fBint\fP value,
+-in addition
++in addition to
+ retrieving it via the standard pointer to \fBshort\fP parameter.
+-.PP
+-The remaining functions which have \fIopts\fP,
+-but do not manipulate color,
+-e.g., \fBwattr_on\fP and \fBwattr_off\fP
+-are not used by this implementation except to check that they are \fBNULL\fP.
++.bP
++For functions which turn attributes off, e.g.,
++\fBwattr_off\fP,
++the \fIopts\fP parameter is ignored except
++except to check that it is \fBNULL\fP.
+ .\" ---------------------------------------------------------------------------
+ .SH PORTABILITY
+ These functions are supported in the XSI Curses standard, Issue 4.
+@@ -568,6 +568,19 @@
+ In this implementation (as in many others), the values happen to be
+ the same because it simplifies copying information between
+ \fBchtype\fP and \fBcchar_t\fP variables.
++.bP
++Because ncurses's \fBattr_t\fP can hold a color pair
++(in the \fBA_COLOR\fP field),
++a call to
++\fBwattr_on\fP,
++\fBwattr_off\fP, or
++\fBwattr_set\fP
++may alter the window's color.
++If the color pair information in the attribute parameter is zero,
++no change is made to the window's color.
++.IP
++This is consistent with SVr4 curses;
++X/Open Curses does not specify this.
+ .PP
+ The XSI standard extended conformance level adds new highlights
+ \fBA_HORIZONTAL\fP, \fBA_LEFT\fP, \fBA_LOW\fP, \fBA_RIGHT\fP, \fBA_TOP\fP,
+Index: ncurses/base/lib_wattron.c
+Prereq: 1.12
+--- ncurses-6.3-20220409+/ncurses/base/lib_wattron.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/ncurses/base/lib_wattron.c 2022-04-15 22:34:38.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey *
++ * Copyright 2020,2022 Thomas E. Dickey *
+ * Copyright 1998-2009,2010 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -43,7 +43,7 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+
+-MODULE_ID("$Id: lib_wattron.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_wattron.c,v 1.13 2022/04/15 22:34:38 tom Exp $")
+
+ NCURSES_EXPORT(int)
+ wattr_on(WINDOW *win, attr_t at, void *opts GCC_UNUSED)
+@@ -55,8 +55,10 @@
+ GET_WINDOW_PAIR(win)));
+
+ if_EXT_COLORS({
+- if (at & A_COLOR)
++ if (at & A_COLOR) {
+ win->_color = PairNumber(at);
++ set_extended_pair(opts, win->_color);
++ }
+ });
+ toggle_attr_on(WINDOW_ATTRS(win), at);
+ returnCode(OK);
+Index: ncurses/tinfo/alloc_entry.c
+Prereq: 1.68
+--- ncurses-6.3-20220409+/ncurses/tinfo/alloc_entry.c 2022-02-26 22:19:31.000000000 +0000
++++ ncurses-6.3-20220416/ncurses/tinfo/alloc_entry.c 2022-04-16 22:46:53.000000000 +0000
+@@ -48,13 +48,11 @@
+
+ #include <tic.h>
+
+-MODULE_ID("$Id: alloc_entry.c,v 1.68 2022/02/26 22:19:31 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.69 2022/04/16 22:46:53 tom Exp $")
+
+ #define ABSENT_OFFSET -1
+ #define CANCELLED_OFFSET -2
+
+-#define MAX_STRTAB 4096 /* documented maximum entry size */
+-
+ static char *stringbuf; /* buffer for string capabilities */
+ static size_t next_free; /* next free character in stringbuf */
+
+@@ -74,7 +72,7 @@
+ }
+
+ if (stringbuf == NULL)
+- TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
++ TYPE_MALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf);
+
+ next_free = 0;
+
+@@ -111,11 +109,11 @@
+ * Cheat a little by making an empty string point to the end of the
+ * previous string.
+ */
+- if (next_free < MAX_STRTAB) {
++ if (next_free < MAX_ENTRY_SIZE) {
+ result = (stringbuf + next_free - 1);
+ }
+- } else if (next_free + len < MAX_STRTAB) {
+- _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
++ } else if (next_free + len < MAX_ENTRY_SIZE) {
++ _nc_STRCPY(&stringbuf[next_free], string, MAX_ENTRY_SIZE);
+ DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
+ DEBUG(7, ("at location %d", (int) next_free));
+ next_free += len;
+Index: ncurses/tinfo/read_entry.c
+Prereq: 1.161
+--- ncurses-6.3-20220409+/ncurses/tinfo/read_entry.c 2021-06-26 19:43:17.000000000 +0000
++++ ncurses-6.3-20220416/ncurses/tinfo/read_entry.c 2022-04-16 21:00:00.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * 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 *
+@@ -42,7 +42,7 @@
+
+ #include <tic.h>
+
+-MODULE_ID("$Id: read_entry.c,v 1.161 2021/06/26 19:43:17 tom Exp $")
++MODULE_ID("$Id: read_entry.c,v 1.162 2022/04/16 21:00:00 tom Exp $")
+
+ #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
+
+@@ -145,6 +145,7 @@
+ {
+ int i;
+ char *p;
++ bool corrupt = FALSE;
+
+ for (i = 0; i < count; i++) {
+ if (IS_NEG1(buf + 2 * i)) {
+@@ -154,8 +155,20 @@
+ } else if (MyNumber(buf + 2 * i) > size) {
+ Strings[i] = ABSENT_STRING;
+ } else {
+- Strings[i] = (MyNumber(buf + 2 * i) + table);
+- TR(TRACE_DATABASE, ("Strings[%d] = %s", i, _nc_visbuf(Strings[i])));
++ int nn = MyNumber(buf + 2 * i);
++ if (nn >= 0 && nn < size) {
++ Strings[i] = (nn + table);
++ TR(TRACE_DATABASE, ("Strings[%d] = %s", i,
++ _nc_visbuf(Strings[i])));
++ } else {
++ if (!corrupt) {
++ corrupt = TRUE;
++ TR(TRACE_DATABASE,
++ ("ignore out-of-range index %d to Strings[]", nn));
++ _nc_warning("corrupt data found in convert_strings");
++ }
++ Strings[i] = ABSENT_STRING;
++ }
+ }
+
+ /* make sure all strings are NUL terminated */
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220409+/package/debian-mingw/changelog 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/debian-mingw/changelog 2022-04-16 12:59:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220409) unstable; urgency=low
++ncurses6 (6.3+20220416) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Apr 2022 08:59:03 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Apr 2022 08:59:30 -0400
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220409+/package/debian-mingw64/changelog 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/debian-mingw64/changelog 2022-04-16 12:59:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220409) unstable; urgency=low
++ncurses6 (6.3+20220416) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Apr 2022 08:59:03 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Apr 2022 08:59:30 -0400
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.3-20220409+/package/debian/changelog 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/debian/changelog 2022-04-16 12:59:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220409) unstable; urgency=low
++ncurses6 (6.3+20220416) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Apr 2022 08:59:03 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Apr 2022 08:59:30 -0400
+
+ ncurses6 (5.9-20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.514
+--- ncurses-6.3-20220409+/package/mingw-ncurses.nsi 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/mingw-ncurses.nsi 2022-04-16 12:59:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.514 2022/04/09 12:59:03 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.515 2022/04/16 12:59:30 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 "0409"
++!define VERSION_MMDD "0416"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220409+/package/mingw-ncurses.spec 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/mingw-ncurses.spec 2022-04-16 12:59:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220409
++Release: 20220416
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220409+/package/ncurses.spec 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/ncurses.spec 2022-04-16 12:59:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220409
++Release: 20220416
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220409+/package/ncursest.spec 2022-04-09 12:59:03.000000000 +0000
++++ ncurses-6.3-20220416/package/ncursest.spec 2022-04-16 12:59:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220409
++Release: 20220416
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/README
+Prereq: 1.74
+--- ncurses-6.3-20220409+/test/README 2022-04-09 23:01:27.000000000 +0000
++++ ncurses-6.3-20220416/test/README 2022-04-16 18:25:47.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright 2018-2020,2021 Thomas E. Dickey --
++-- Copyright 2018-2021,2022 Thomas E. Dickey --
+ -- Copyright 1998-2017,2018 Free Software Foundation, Inc. --
+ -- --
+ -- Permission is hereby granted, free of charge, to any person obtaining a --
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: README,v 1.74 2022/04/09 23:01:27 tom Exp $
++-- $Id: README,v 1.75 2022/04/16 18:25:47 tom Exp $
+ -------------------------------------------------------------------------------
+
+ The programs in this directory are used to test and demonstrate ncurses.
+Index: test/clip_printw.c
+Prereq: 1.19
+--- ncurses-6.3-20220409+/test/clip_printw.c 2020-05-10 00:40:23.000000000 +0000
++++ ncurses-6.3-20220416/test/clip_printw.c 2022-04-16 18:26:05.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey *
++ * Copyright 2019-2020,2022 Thomas E. Dickey *
+ * Copyright 2008-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: clip_printw.c,v 1.19 2020/05/10 00:40:23 tom Exp $
++ * $Id: clip_printw.c,v 1.20 2022/04/16 18:26:05 tom Exp $
+ *
+ * demonstrate how to use printw without wrapping.
+ */
+@@ -361,6 +361,7 @@
+ int
+ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+ {
++ setlocale(LC_ALL, "");
+ initscr();
+ cbreak();
+ noecho();
+Index: test/color_content.c
+Prereq: 1.12
+--- ncurses-6.3-20220409+/test/color_content.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/test/color_content.c 2022-04-16 18:26:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+@@ -26,7 +26,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: color_content.c,v 1.12 2020/02/02 23:34:34 tom Exp $
++ * $Id: color_content.c,v 1.13 2022/04/16 18:26:40 tom Exp $
+ */
+
+ #define NEED_TIME_H
+@@ -118,6 +118,7 @@
+ static void
+ setup_test(void)
+ {
++ setlocale(LC_ALL, "");
+ initscr();
+ cbreak();
+ noecho();
+Index: test/color_set.c
+Prereq: 1.10
+--- ncurses-6.3-20220409+/test/color_set.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/test/color_set.c 2022-04-16 18:26:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey *
++ * Copyright 2020,2020,2022 Thomas E. Dickey *
+ * Copyright 2003-2012,2014 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: color_set.c,v 1.10 2020/02/02 23:34:34 tom Exp $
++ * $Id: color_set.c,v 1.11 2022/04/16 18:26:40 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -41,6 +41,7 @@
+ {
+ NCURSES_COLOR_T f, b;
+
++ setlocale(LC_ALL, "");
+ initscr();
+ cbreak();
+ noecho();
+Index: test/demo_altkeys.c
+Prereq: 1.14
+--- ncurses-6.3-20220409+/test/demo_altkeys.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/test/demo_altkeys.c 2022-04-16 18:26:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * Copyright 2005-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: demo_altkeys.c,v 1.14 2020/02/02 23:34:34 tom Exp $
++ * $Id: demo_altkeys.c,v 1.15 2022/04/16 18:26:57 tom Exp $
+ *
+ * Demonstrate the define_key() function.
+ * Thomas Dickey - 2005/10/22
+@@ -82,6 +82,7 @@
+
+ unlink(MY_LOGFILE);
+
++ setlocale(LC_ALL, "");
+ if (newterm(0, stdout, stdin) == 0) {
+ fprintf(stderr, "Cannot initialize terminal\n");
+ ExitProgram(EXIT_FAILURE);
+Index: test/demo_defkey.c
+Prereq: 1.31
+--- ncurses-6.3-20220409+/test/demo_defkey.c 2020-12-26 17:55:13.000000000 +0000
++++ ncurses-6.3-20220416/test/demo_defkey.c 2022-04-16 18:26:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * Copyright 2002-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: demo_defkey.c,v 1.31 2020/12/26 17:55:13 tom Exp $
++ * $Id: demo_defkey.c,v 1.32 2022/04/16 18:26:57 tom Exp $
+ *
+ * Demonstrate the define_key() function.
+ * Thomas Dickey - 2002/11/23
+@@ -224,6 +224,7 @@
+
+ unlink(MY_LOGFILE);
+
++ setlocale(LC_ALL, "");
+ initscr();
+ (void) cbreak(); /* take input chars one at a time, no wait for \n */
+ (void) noecho(); /* don't echo input */
+Index: test/demo_keyok.c
+Prereq: 1.7
+--- ncurses-6.3-20220409+/test/demo_keyok.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/test/demo_keyok.c 2022-04-16 18:26:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey *
++ * Copyright 2020,2022 Thomas E. Dickey *
+ * Copyright 2002-2006,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: demo_keyok.c,v 1.7 2020/02/02 23:34:34 tom Exp $
++ * $Id: demo_keyok.c,v 1.8 2022/04/16 18:26:57 tom Exp $
+ *
+ * Demonstrate the keyok() function.
+ * Thomas Dickey - 2002/11/23
+@@ -44,6 +44,7 @@
+ int ch;
+ WINDOW *win;
+
++ setlocale(LC_ALL, "");
+ initscr();
+ (void) cbreak(); /* take input chars one at a time, no wait for \n */
+ (void) noecho(); /* don't echo input */
+Index: test/dots_xcurses.c
+Prereq: 1.24
+--- ncurses-6.3-20220409+/test/dots_xcurses.c 2020-08-29 16:22:03.000000000 +0000
++++ ncurses-6.3-20220416/test/dots_xcurses.c 2022-04-16 18:27:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * Copyright 2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -30,7 +30,7 @@
+ /*
+ * Author: Thomas E. Dickey
+ *
+- * $Id: dots_xcurses.c,v 1.24 2020/08/29 16:22:03 juergen Exp $
++ * $Id: dots_xcurses.c,v 1.25 2022/04/16 18:27:24 tom Exp $
+ *
+ * A simple demo of the wide-curses interface used for comparison with termcap.
+ */
+@@ -193,6 +193,7 @@
+ }
+ }
+
++ setlocale(LC_ALL, "");
+ srand((unsigned) time(0));
+
+ SetupAlarm(r_option);
+Index: test/extended_color.c
+Prereq: 1.15
+--- ncurses-6.3-20220409+/test/extended_color.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/test/extended_color.c 2022-04-16 18:27:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * Copyright 2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: extended_color.c,v 1.15 2020/02/02 23:34:34 tom Exp $
++ * $Id: extended_color.c,v 1.16 2022/04/16 18:27:24 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -175,6 +175,7 @@
+ }
+ }
+
++ setlocale(LC_ALL, "");
+ slk_init(1);
+ sp = newterm(NULL, stdout, stdin);
+ cbreak();
+Index: test/pair_content.c
+Prereq: 1.14
+--- ncurses-6.3-20220409+/test/pair_content.c 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220416/test/pair_content.c 2022-04-16 18:27:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey *
++ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+@@ -26,7 +26,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: pair_content.c,v 1.14 2020/02/02 23:34:34 tom Exp $
++ * $Id: pair_content.c,v 1.15 2022/04/16 18:27:24 tom Exp $
+ */
+
+ #define NEED_TIME_H
+@@ -115,6 +115,7 @@
+ static void
+ setup_test(void)
+ {
++ setlocale(LC_ALL, "");
+ initscr();
+ cbreak();
+ noecho();
+Index: test/picsmap.c
+Prereq: 1.144
+--- ncurses-6.3-20220409+/test/picsmap.c 2022-02-19 21:30:04.000000000 +0000
++++ ncurses-6.3-20220416/test/picsmap.c 2022-04-16 18:21:05.000000000 +0000
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.144 2022/02/19 21:30:04 tom Exp $
++ * $Id: picsmap.c,v 1.145 2022/04/16 18:21:05 tom Exp $
+ *
+ * Author: Thomas E. Dickey
+ *
+@@ -1527,6 +1527,7 @@
+ (void) opt_d;
+ if (isatty(fileno(stdout))) {
+ in_curses = TRUE;
++ setlocale(LC_ALL, "");
+ initscr();
+ cbreak();
+ noecho();
+Index: test/test_unget_wch.c
+Prereq: 1.2
+--- ncurses-6.3-20220409+/test/test_unget_wch.c 2022-04-09 23:47:04.000000000 +0000
++++ ncurses-6.3-20220416/test/test_unget_wch.c 2022-04-16 17:04:04.000000000 +0000
+@@ -26,7 +26,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: test_unget_wch.c,v 1.2 2022/04/09 23:47:04 tom Exp $
++ * $Id: test_unget_wch.c,v 1.3 2022/04/16 17:04:04 tom Exp $
+ *
+ * Demonstrate the unget_wch and unget functions.
+ */
+@@ -39,6 +39,7 @@
+ {
+ int step = 0;
+
++ setlocale(LC_ALL, "");
+ initscr();
+ keypad(stdscr, TRUE);
+ cbreak();
+Index: test/test_vid_puts.c
+Prereq: 1.12
+--- ncurses-6.3-20220409+/test/test_vid_puts.c 2021-04-25 00:10:43.000000000 +0000
++++ ncurses-6.3-20220416/test/test_vid_puts.c 2022-04-16 18:27:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey *
++ * Copyright 2020-2021,2022 Thomas E. Dickey *
+ * Copyright 2013-2014,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: test_vid_puts.c,v 1.12 2021/04/25 00:10:43 tom Exp $
++ * $Id: test_vid_puts.c,v 1.13 2022/04/16 18:27:24 tom Exp $
+ *
+ * Demonstrate the vid_puts and vid_attr functions.
+ * Thomas Dickey - 2013/01/12
+@@ -138,6 +138,7 @@
+ if (optind < argc)
+ usage();
+
++ setlocale(LC_ALL, "");
+ if (no_init) {
+ START_TRACE();
+ } else {