aboutsummaryrefslogtreecommitdiff
path: root/packages/ncurses/6.5/ncurses-6.5-20241130.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/ncurses/6.5/ncurses-6.5-20241130.patch')
-rw-r--r--packages/ncurses/6.5/ncurses-6.5-20241130.patch28725
1 files changed, 28725 insertions, 0 deletions
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241130.patch b/packages/ncurses/6.5/ncurses-6.5-20241130.patch
new file mode 100644
index 00000000..50a40ed1
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241130.patch
@@ -0,0 +1,28725 @@
+# ncurses 6.5 - patch 20241130 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+# https://invisible-island.net/archives/ncurses/
+# https://invisible-mirror.net/archives/ncurses/
+# https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+# https://invisible-island.net/archives/ncurses/6.5
+# https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241130.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created Sun Dec 1 01:12:32 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS | 9
+# VERSION | 2
+# aclocal.m4 | 9
+# configure | 4461 ++++++++++++++++++-------------------
+# dist.mk | 4
+# form/fld_def.c | 6
+# form/fld_dup.c | 6
+# menu/mf_common.h | 6
+# ncurses/base/lib_addch.c | 4
+# ncurses/curses.priv.h | 4
+# ncurses/tinfo/comp_expand.c | 6
+# ncurses/tinfo/hashed_db.c | 4
+# ncurses/trace/visbuf.c | 6
+# ncurses/win32con/win_driver.c | 13
+# package/debian-mingw/changelog | 4
+# package/debian-mingw64/changelog | 4
+# package/debian/changelog | 4
+# package/mingw-ncurses.nsi | 4
+# package/mingw-ncurses.spec | 2
+# package/ncurses.spec | 2
+# package/ncursest.spec | 2
+# progs/infocmp.c | 4
+# progs/tic.c | 10
+# progs/tput.c | 8
+# progs/tset.c | 4
+# test/aclocal.m4 | 9
+# test/back_ground.c | 12
+# test/background.c | 12
+# test/bs.c | 8
+# test/cardfile.c | 8
+# test/color_content.c | 12
+# test/combine.c | 22
+# test/configure | 3449 ++++++++++++++--------------
+# test/demo_menus.c | 8
+# test/demo_tabs.c | 10
+# test/demo_termcap.c | 6
+# test/demo_terminfo.c | 6
+# test/dots_curses.c | 6
+# test/dots_xcurses.c | 4
+# test/filter.c | 14
+# test/gdc.c | 4
+# test/hashtest.c | 22
+# test/list_keys.c | 6
+# test/ncurses.c | 12
+# test/padview.c | 14
+# test/pair_content.c | 12
+# test/picsmap.c | 10
+# test/savescreen.c | 4
+# test/test_arrays.c | 32
+# test/test_endwin.c | 12
+# test/test_mouse.c | 6
+# test/view.c | 14
+# test/worm.c | 33
+# 53 files changed, 4182 insertions(+), 4173 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq: 1.4203
+--- ncurses-6.5-20241123+/NEWS 2024-11-23 22:57:05.000000000 +0000
++++ ncurses-6.5-20241130/NEWS 2024-11-30 19:41:55.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4203 2024/11/23 22:57:05 tom Exp $
++-- $Id: NEWS,v 1.4207 2024/11/30 19:41:55 tom Exp $
+ -------------------------------------------------------------------------------
+
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,13 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+
++20241130
++ + improve configure check for lint program.
++ + adjust options in test-programs to allow for consistent use of -c/-l
++ for command/logging.
++ + modify win_driver.c for MinGW to handle shift-tab and control-tab as
++ back-tab (report by Axel Reinhold)
++
+ 20241123
+ + remove dependency on stdbool.h from configure script check for type
+ of bool when C++ binding is omitted (report by Sam James).
+Index: VERSION
+--- ncurses-6.5-20241123+/VERSION 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/VERSION 2024-11-30 10:55:07.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.5 20241123
++5:0:10 6.5 20241130
+Index: aclocal.m4
+Prereq: 1.1090
+--- ncurses-6.5-20241123+/aclocal.m4 2024-11-09 23:12:47.000000000 +0000
++++ ncurses-6.5-20241130/aclocal.m4 2024-11-30 19:41:19.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1090 2024/11/09 23:12:47 tom Exp $
++dnl $Id: aclocal.m4,v 1.1091 2024/11/30 19:41:19 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -7169,14 +7169,17 @@
+ AC_SUBST(LDCONFIG)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
++dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
+ dnl ------------
+ AC_DEFUN([CF_PROG_LINT],
+ [
+ AC_CHECK_PROGS(LINT, lint cppcheck splint)
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++ test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++ ;;
+ (xcppcheck|x*/cppcheck)
+- test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++ test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ ;;
+ esac
+ AC_SUBST(LINT_OPTS)
+Index: configure
+--- ncurses-6.5-20241123+/configure 2024-11-23 22:59:00.000000000 +0000
++++ ncurses-6.5-20241130/configure 2024-11-30 19:42:38.000000000 +0000
+@@ -4220,23 +4220,26 @@
+ done
+
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++ test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++ ;;
+ (xcppcheck|x*/cppcheck)
+- test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++ test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ ;;
+ esac
+
+-echo "$as_me:4228: checking whether ln -s works" >&5
++echo "$as_me:4231: checking whether ln -s works" >&5
+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+- echo "$as_me:4232: result: yes" >&5
++ echo "$as_me:4235: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:4235: result: no, using $LN_S" >&5
++ echo "$as_me:4238: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+
+-echo "$as_me:4239: checking if $LN_S -f options work" >&5
++echo "$as_me:4242: checking if $LN_S -f options work" >&5
+ echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
+
+ rm -f conf$$.src conf$$dst
+@@ -4248,12 +4251,12 @@
+ cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4251: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4254: result: $cf_prog_ln_sf" >&5
+ echo "${ECHO_T}$cf_prog_ln_sf" >&6
+
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+
+-echo "$as_me:4256: checking for long file names" >&5
++echo "$as_me:4259: checking for long file names" >&5
+ echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+ if test "${ac_cv_sys_long_file_names+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4292,7 +4295,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4295: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4298: result: $ac_cv_sys_long_file_names" >&5
+ echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+ if test "$ac_cv_sys_long_file_names" = yes; then
+
+@@ -4311,7 +4314,7 @@
+ withval="$with_config_suffix"
+ case "x$withval" in
+ (xyes|xno)
+- { echo "$as_me:4314: WARNING: expected a value for config-suffix option" >&5
++ { echo "$as_me:4317: WARNING: expected a value for config-suffix option" >&5
+ echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
+ ;;
+ (*) cf_config_suffix="$withval"
+@@ -4321,7 +4324,7 @@
+
+ # If we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:4324: checking if you want to use pkg-config" >&5
++echo "$as_me:4327: checking if you want to use pkg-config" >&5
+ echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
+
+ # Check whether --with-pkg-config or --without-pkg-config was given.
+@@ -4331,7 +4334,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:4334: result: $cf_pkg_config" >&5
++echo "$as_me:4337: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -4343,7 +4346,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:4346: checking for $ac_word" >&5
++echo "$as_me:4349: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4360,7 +4363,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+- echo "$as_me:4363: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4366: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4371,10 +4374,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:4374: result: $PKG_CONFIG" >&5
++ echo "$as_me:4377: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:4377: result: no" >&5
++ echo "$as_me:4380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4383,7 +4386,7 @@
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:4386: checking for $ac_word" >&5
++echo "$as_me:4389: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4400,7 +4403,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+- echo "$as_me:4403: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4406: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4412,10 +4415,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:4415: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:4418: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:4418: result: no" >&5
++ echo "$as_me:4421: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4456,24 +4459,24 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4459: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:4462: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ elif test "x$cf_pkg_config" != xno ; then
+- { echo "$as_me:4466: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:4469: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+
+ case "$PKG_CONFIG" in
+ (no|none|yes)
+- echo "$as_me:4472: checking for pkg-config library directory" >&5
++ echo "$as_me:4475: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:4476: checking for $PKG_CONFIG library directory" >&5
++ echo "$as_me:4479: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ ;;
+ esac
+@@ -4500,7 +4503,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4506: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+@@ -4511,16 +4514,16 @@
+ ;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:4514: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4517: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:4519: result: auto" >&5
++ echo "$as_me:4522: result: auto" >&5
+ echo "${ECHO_T}auto" >&6
+ cf_search_path=
+ # Look for the library directory using the same prefix as the executable
+- echo "$as_me:4523: checking for search-list" >&5
++ echo "$as_me:4526: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -4555,11 +4558,11 @@
+ "`
+ fi
+
+- echo "$as_me:4558: result: $cf_search_path" >&5
++ echo "$as_me:4561: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:4562: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:4565: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4567,7 +4570,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:4570: checking for first directory" >&5
++ echo "$as_me:4573: checking for first directory" >&5
+ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
+ cf_pkg_config_path=none
+ for cf_config in $cf_search_path
+@@ -4578,7 +4581,7 @@
+ break
+ fi
+ done
+- echo "$as_me:4581: result: $cf_pkg_config_path" >&5
++ echo "$as_me:4584: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4588,7 +4591,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:4591: checking for workaround" >&5
++ echo "$as_me:4594: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -4611,17 +4614,17 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:4614: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4617: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+ if test "x$PKG_CONFIG" != xnone
+ then
+- echo "$as_me:4621: checking if we should install .pc files for $PKG_CONFIG" >&5
++ echo "$as_me:4624: checking if we should install .pc files for $PKG_CONFIG" >&5
+ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
+ else
+- echo "$as_me:4624: checking if we should install .pc files" >&5
++ echo "$as_me:4627: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+
+@@ -4632,7 +4635,7 @@
+ else
+ enable_pc_files=no
+ fi;
+-echo "$as_me:4635: result: $enable_pc_files" >&5
++echo "$as_me:4638: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+
+ if test "x$enable_pc_files" != xno
+@@ -4640,7 +4643,7 @@
+ MAKE_PC_FILES=
+ case "x$PKG_CONFIG_LIBDIR" in
+ (xno|xnone|xyes|x)
+- { echo "$as_me:4643: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++ { echo "$as_me:4646: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ ;;
+ (*)
+@@ -4669,7 +4672,7 @@
+ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4672: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++ { { echo "$as_me:4675: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4683,7 +4686,7 @@
+
+ if test -z "$MAKE_PC_FILES"
+ then
+- echo "$as_me:4686: checking for suffix to add to pkg-config files" >&5
++ echo "$as_me:4689: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4698,13 +4701,13 @@
+ esac
+ fi;
+ test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+- echo "$as_me:4701: result: $PC_MODULE_SUFFIX" >&5
++ echo "$as_me:4704: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+
+ fi
+
+-echo "$as_me:4707: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4710: checking if we should assume mixed-case filenames" >&5
+ echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+
+ # Check whether --enable-mixed-case or --disable-mixed-case was given.
+@@ -4714,11 +4717,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:4717: result: $enable_mixedcase" >&5
++echo "$as_me:4720: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:4721: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4724: checking if filesystem supports mixed-case filenames" >&5
+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
+ if test "${cf_cv_mixedcase+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4745,7 +4748,7 @@
+ fi
+
+ fi
+-echo "$as_me:4748: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4751: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4764,7 +4767,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4767: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4770: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -4784,16 +4787,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:4787: result: yes" >&5
++ echo "$as_me:4790: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:4791: result: no" >&5
++ echo "$as_me:4794: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:4796: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4799: checking for \".PHONY\" make-support" >&5
+ echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
+ if test "${cf_cv_make_PHONY+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4848,7 +4851,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:4851: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4854: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4859,7 +4862,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4862: checking for $ac_word" >&5
++echo "$as_me:4865: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4874,7 +4877,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4877: found $ac_dir/$ac_word" >&5
++echo "$as_me:4880: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4882,10 +4885,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:4885: result: $CTAGS" >&5
++ echo "$as_me:4888: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:4888: result: no" >&5
++ echo "$as_me:4891: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4896,7 +4899,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4899: checking for $ac_word" >&5
++echo "$as_me:4902: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4911,7 +4914,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4914: found $ac_dir/$ac_word" >&5
++echo "$as_me:4917: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4919,10 +4922,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4922: result: $ETAGS" >&5
++ echo "$as_me:4925: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4925: result: no" >&5
++ echo "$as_me:4928: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4931,7 +4934,7 @@
+
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:4934: checking for $ac_word" >&5
++echo "$as_me:4937: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4946,7 +4949,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:4949: found $ac_dir/$ac_word" >&5
++echo "$as_me:4952: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4955,17 +4958,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4958: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4961: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4961: result: no" >&5
++ echo "$as_me:4964: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$cf_cv_mixedcase" = yes ; then
+ # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:4968: checking for $ac_word" >&5
++echo "$as_me:4971: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4980,7 +4983,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:4983: found $ac_dir/$ac_word" >&5
++echo "$as_me:4986: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4989,10 +4992,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4992: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4995: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4995: result: no" >&5
++ echo "$as_me:4998: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5012,7 +5015,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:5015: checking for makeflags variable" >&5
++echo "$as_me:5018: checking for makeflags variable" >&5
+ echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
+ if test "${cf_cv_makeflags+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5042,7 +5045,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5048: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -5050,13 +5053,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:5053: result: $cf_cv_makeflags" >&5
++echo "$as_me:5056: result: $cf_cv_makeflags" >&5
+ echo "${ECHO_T}$cf_cv_makeflags" >&6
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:5059: checking for $ac_word" >&5
++echo "$as_me:5062: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5071,7 +5074,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-echo "$as_me:5074: found $ac_dir/$ac_word" >&5
++echo "$as_me:5077: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5079,10 +5082,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:5082: result: $RANLIB" >&5
++ echo "$as_me:5085: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:5085: result: no" >&5
++ echo "$as_me:5088: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5091,7 +5094,7 @@
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:5094: checking for $ac_word" >&5
++echo "$as_me:5097: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5106,7 +5109,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+-echo "$as_me:5109: found $ac_dir/$ac_word" >&5
++echo "$as_me:5112: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5115,10 +5118,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:5118: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:5121: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:5121: result: no" >&5
++ echo "$as_me:5124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5130,7 +5133,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ld; ac_word=$2
+-echo "$as_me:5133: checking for $ac_word" >&5
++echo "$as_me:5136: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5145,7 +5148,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LD="${ac_tool_prefix}ld"
+-echo "$as_me:5148: found $ac_dir/$ac_word" >&5
++echo "$as_me:5151: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5153,10 +5156,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:5156: result: $LD" >&5
++ echo "$as_me:5159: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:5159: result: no" >&5
++ echo "$as_me:5162: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5165,7 +5168,7 @@
+ ac_ct_LD=$LD
+ # Extract the first word of "ld", so it can be a program name with args.
+ set dummy ld; ac_word=$2
+-echo "$as_me:5168: checking for $ac_word" >&5
++echo "$as_me:5171: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5180,7 +5183,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LD="ld"
+-echo "$as_me:5183: found $ac_dir/$ac_word" >&5
++echo "$as_me:5186: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5189,10 +5192,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:5192: result: $ac_ct_LD" >&5
++ echo "$as_me:5195: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:5195: result: no" >&5
++ echo "$as_me:5198: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5204,7 +5207,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:5207: checking for $ac_word" >&5
++echo "$as_me:5210: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5219,7 +5222,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:5222: found $ac_dir/$ac_word" >&5
++echo "$as_me:5225: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5227,10 +5230,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5230: result: $AR" >&5
++ echo "$as_me:5233: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5233: result: no" >&5
++ echo "$as_me:5236: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5239,7 +5242,7 @@
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:5242: checking for $ac_word" >&5
++echo "$as_me:5245: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5254,7 +5257,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:5257: found $ac_dir/$ac_word" >&5
++echo "$as_me:5260: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5263,10 +5266,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5266: result: $ac_ct_AR" >&5
++ echo "$as_me:5269: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5269: result: no" >&5
++ echo "$as_me:5272: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5278,7 +5281,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nm; ac_word=$2
+-echo "$as_me:5281: checking for $ac_word" >&5
++echo "$as_me:5284: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5293,7 +5296,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NM="${ac_tool_prefix}nm"
+-echo "$as_me:5296: found $ac_dir/$ac_word" >&5
++echo "$as_me:5299: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5301,10 +5304,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+- echo "$as_me:5304: result: $NM" >&5
++ echo "$as_me:5307: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+- echo "$as_me:5307: result: no" >&5
++ echo "$as_me:5310: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5313,7 +5316,7 @@
+ ac_ct_NM=$NM
+ # Extract the first word of "nm", so it can be a program name with args.
+ set dummy nm; ac_word=$2
+-echo "$as_me:5316: checking for $ac_word" >&5
++echo "$as_me:5319: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5328,7 +5331,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NM="nm"
+-echo "$as_me:5331: found $ac_dir/$ac_word" >&5
++echo "$as_me:5334: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5337,10 +5340,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+- echo "$as_me:5340: result: $ac_ct_NM" >&5
++ echo "$as_me:5343: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+- echo "$as_me:5343: result: no" >&5
++ echo "$as_me:5346: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5352,7 +5355,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:5355: checking for $ac_word" >&5
++echo "$as_me:5358: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5367,7 +5370,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:5370: found $ac_dir/$ac_word" >&5
++echo "$as_me:5373: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5375,10 +5378,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5378: result: $AR" >&5
++ echo "$as_me:5381: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5381: result: no" >&5
++ echo "$as_me:5384: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5387,7 +5390,7 @@
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:5390: checking for $ac_word" >&5
++echo "$as_me:5393: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5402,7 +5405,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:5405: found $ac_dir/$ac_word" >&5
++echo "$as_me:5408: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5411,10 +5414,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5414: result: $ac_ct_AR" >&5
++ echo "$as_me:5417: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5417: result: no" >&5
++ echo "$as_me:5420: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5423,7 +5426,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:5426: checking for options to update archives" >&5
++echo "$as_me:5429: checking for options to update archives" >&5
+ echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
+ if test "${cf_cv_ar_flags+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5460,13 +5463,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 5463 "configure"
++#line 5466 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:5466: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:5469: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5469: \$? = $ac_status" >&5
++ echo "$as_me:5472: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+ echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
+ $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null
+@@ -5477,7 +5480,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5483: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -5487,7 +5490,7 @@
+ esac
+
+ fi
+-echo "$as_me:5490: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5493: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -5498,7 +5501,7 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+-echo "$as_me:5501: checking for an installation directory prefix" >&5
++echo "$as_me:5504: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5511,10 +5514,10 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:5514: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5517: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
+-echo "$as_me:5517: checking if installation directory prefix should be merged" >&5
++echo "$as_me:5520: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -5531,7 +5534,7 @@
+ cf_install_prefix=no
+
+ fi;
+-echo "$as_me:5534: result: $cf_install_prefix" >&5
++echo "$as_me:5537: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+
+ if test "$cf_install_prefix" = yes ; then
+@@ -5572,7 +5575,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5575: checking for $ac_word" >&5
++echo "$as_me:5578: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5587,7 +5590,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_BUILD_CC="$ac_prog"
+-echo "$as_me:5590: found $ac_dir/$ac_word" >&5
++echo "$as_me:5593: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5595,10 +5598,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:5598: result: $BUILD_CC" >&5
++ echo "$as_me:5601: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:5601: result: no" >&5
++ echo "$as_me:5604: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5607,12 +5610,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:5610: checking for native build C compiler" >&5
++ echo "$as_me:5613: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:5612: result: $BUILD_CC" >&5
++ echo "$as_me:5615: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:5615: checking for native build C preprocessor" >&5
++ echo "$as_me:5618: checking for native build C preprocessor" >&5
+ echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
+
+ # Check whether --with-build-cpp or --without-build-cpp was given.
+@@ -5622,10 +5625,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:5625: result: $BUILD_CPP" >&5
++ echo "$as_me:5628: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:5628: checking for native build C flags" >&5
++ echo "$as_me:5631: checking for native build C flags" >&5
+ echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
+
+ # Check whether --with-build-cflags or --without-build-cflags was given.
+@@ -5633,10 +5636,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:5636: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:5639: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:5639: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:5642: checking for native build C preprocessor-flags" >&5
+ echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
+
+ # Check whether --with-build-cppflags or --without-build-cppflags was given.
+@@ -5644,10 +5647,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:5647: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:5650: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:5650: checking for native build linker-flags" >&5
++ echo "$as_me:5653: checking for native build linker-flags" >&5
+ echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
+
+ # Check whether --with-build-ldflags or --without-build-ldflags was given.
+@@ -5655,10 +5658,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:5658: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:5661: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:5661: checking for native build linker-libraries" >&5
++ echo "$as_me:5664: checking for native build linker-libraries" >&5
+ echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
+
+ # Check whether --with-build-libs or --without-build-libs was given.
+@@ -5666,7 +5669,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:5669: result: $BUILD_LIBS" >&5
++ echo "$as_me:5672: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -5675,7 +5678,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:5678: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:5681: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+
+ cf_save_crossed=$cross_compiling
+@@ -5689,7 +5692,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5692 "configure"
++#line 5695 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -5699,15 +5702,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5705: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5705: \$? = $ac_status" >&5
++ echo "$as_me:5708: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5707: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5710: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5710: \$? = $ac_status" >&5
++ echo "$as_me:5713: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -5722,12 +5725,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:5725: result: $cf_ok_build_cc" >&5
++ echo "$as_me:5728: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+
+ if test "$cf_ok_build_cc" != yes
+ then
+- { { echo "$as_me:5730: error: Cross-build requires two compilers.
++ { { echo "$as_me:5733: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&5
+ echo "$as_me: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&2;}
+@@ -5752,7 +5755,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:5755: checking if libtool -version-number should be used" >&5
++echo "$as_me:5758: checking if libtool -version-number should be used" >&5
+ echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
+
+ # Check whether --enable-libtool-version or --disable-libtool-version was given.
+@@ -5769,7 +5772,7 @@
+ cf_libtool_version=yes
+
+ fi;
+-echo "$as_me:5772: result: $cf_libtool_version" >&5
++echo "$as_me:5775: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+
+ if test "$cf_libtool_version" = yes ; then
+@@ -5778,25 +5781,25 @@
+ LIBTOOL_VERSION="-version-info"
+ case "x$VERSION" in
+ (x)
+- { echo "$as_me:5781: WARNING: VERSION was not set" >&5
++ { echo "$as_me:5784: WARNING: VERSION was not set" >&5
+ echo "$as_me: WARNING: VERSION was not set" >&2;}
+ ;;
+ (x*.*.*)
+ ABI_VERSION="$VERSION"
+ test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6
+
+-echo "${as_me:-configure}:5788: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5791: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+
+ ;;
+ (x*:*:*)
+ ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
+ test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6
+
+-echo "${as_me:-configure}:5795: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5798: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:5799: WARNING: unexpected VERSION value: $VERSION" >&5
++ { echo "$as_me:5802: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ ;;
+ esac
+@@ -5818,7 +5821,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+
+-echo "$as_me:5821: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5824: checking if you want to build libraries with libtool" >&5
+ echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
+
+ # Check whether --with-libtool or --without-libtool was given.
+@@ -5828,7 +5831,7 @@
+ else
+ with_libtool=no
+ fi;
+-echo "$as_me:5831: result: $with_libtool" >&5
++echo "$as_me:5834: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+
+@@ -5857,7 +5860,7 @@
+ with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:5860: error: expected a pathname, not \"$with_libtool\"" >&5
++ { { echo "$as_me:5863: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -5870,7 +5873,7 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5873: checking for $ac_word" >&5
++echo "$as_me:5876: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5885,7 +5888,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5888: found $ac_dir/$ac_word" >&5
++echo "$as_me:5891: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5893,10 +5896,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5896: result: $LIBTOOL" >&5
++ echo "$as_me:5899: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5899: result: no" >&5
++ echo "$as_me:5902: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5909,7 +5912,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5912: checking for $ac_word" >&5
++echo "$as_me:5915: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5924,7 +5927,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5927: found $ac_dir/$ac_word" >&5
++echo "$as_me:5930: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5932,10 +5935,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:5935: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:5938: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:5938: result: no" >&5
++ echo "$as_me:5941: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5966,7 +5969,7 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5969: checking for $ac_word" >&5
++echo "$as_me:5972: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5981,7 +5984,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5984: found $ac_dir/$ac_word" >&5
++echo "$as_me:5987: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5989,10 +5992,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5992: result: $LIBTOOL" >&5
++ echo "$as_me:5995: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5995: result: no" >&5
++ echo "$as_me:5998: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6005,7 +6008,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:6008: checking for $ac_word" >&5
++echo "$as_me:6011: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6020,7 +6023,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:6023: found $ac_dir/$ac_word" >&5
++echo "$as_me:6026: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -6028,10 +6031,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:6031: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:6034: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:6034: result: no" >&5
++ echo "$as_me:6037: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6053,7 +6056,7 @@
+ fi
+ fi
+ if test -z "$LIBTOOL" ; then
+- { { echo "$as_me:6056: error: Cannot find libtool" >&5
++ { { echo "$as_me:6059: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6069,7 +6072,7 @@
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+- echo "$as_me:6072: checking version of $LIBTOOL" >&5
++ echo "$as_me:6075: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6080,7 +6083,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+- echo "$as_me:6083: result: $cf_cv_libtool_version" >&5
++ echo "$as_me:6086: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+
+ if test -n "$cf_cv_libtool_version"
+@@ -6090,19 +6093,19 @@
+ (*...GNU-libtool...*)
+ ;;
+ (*)
+- { { echo "$as_me:6093: error: This is not GNU libtool" >&5
++ { { echo "$as_me:6096: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ else
+- { { echo "$as_me:6099: error: No version found for $LIBTOOL" >&5
++ { { echo "$as_me:6102: error: No version found for $LIBTOOL" >&5
+ echo "$as_me: error: No version found for $LIBTOOL" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ else
+- { { echo "$as_me:6105: error: GNU libtool has not been found" >&5
++ { { echo "$as_me:6108: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6138,7 +6141,7 @@
+
+ else
+
+-echo "$as_me:6141: checking if you want to build shared libraries" >&5
++echo "$as_me:6144: checking if you want to build shared libraries" >&5
+ echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
+
+ # Check whether --with-shared or --without-shared was given.
+@@ -6148,11 +6151,11 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:6151: result: $with_shared" >&5
++echo "$as_me:6154: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
+
+-echo "$as_me:6155: checking if you want to build static libraries" >&5
++echo "$as_me:6158: checking if you want to build static libraries" >&5
+ echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
+
+ # Check whether --with-normal or --without-normal was given.
+@@ -6162,11 +6165,11 @@
+ else
+ with_normal=yes
+ fi;
+-echo "$as_me:6165: result: $with_normal" >&5
++echo "$as_me:6168: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
+
+-echo "$as_me:6169: checking if you want to build debug libraries" >&5
++echo "$as_me:6172: checking if you want to build debug libraries" >&5
+ echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
+
+ # Check whether --with-debug or --without-debug was given.
+@@ -6176,11 +6179,11 @@
+ else
+ with_debug=yes
+ fi;
+-echo "$as_me:6179: result: $with_debug" >&5
++echo "$as_me:6182: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
+
+-echo "$as_me:6183: checking if you want to build profiling libraries" >&5
++echo "$as_me:6186: checking if you want to build profiling libraries" >&5
+ echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
+
+ # Check whether --with-profile or --without-profile was given.
+@@ -6190,7 +6193,7 @@
+ else
+ with_profile=no
+ fi;
+-echo "$as_me:6193: result: $with_profile" >&5
++echo "$as_me:6196: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+
+@@ -6198,7 +6201,7 @@
+
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6201: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6204: checking if you want to build C++ shared libraries" >&5
+ echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
+
+ # Check whether --with-cxx-shared or --without-cxx-shared was given.
+@@ -6208,26 +6211,26 @@
+ else
+ with_shared_cxx=no
+ fi;
+-echo "$as_me:6211: result: $with_shared_cxx" >&5
++echo "$as_me:6214: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+
+ ###############################################################################
+
+-echo "$as_me:6218: checking for specified models" >&5
++echo "$as_me:6221: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+ test "$with_libtool" != "no" && cf_list_models=libtool
+-echo "$as_me:6222: result: $cf_list_models" >&5
++echo "$as_me:6225: result: $cf_list_models" >&5
+ echo "${ECHO_T}$cf_list_models" >&6
+
+ ### Use the first model as the default, and save its suffix for use in building
+ ### up test-applications.
+-echo "$as_me:6227: checking for default model" >&5
++echo "$as_me:6230: checking for default model" >&5
+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
+-echo "$as_me:6230: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6233: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6241,7 +6244,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+
+-echo "$as_me:6244: checking if you want to have a library-prefix" >&5
++echo "$as_me:6247: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -6251,7 +6254,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:6254: result: $with_lib_prefix" >&5
++echo "$as_me:6257: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -6282,24 +6285,24 @@
+
+ LIB_SUFFIX=
+
+- echo "$as_me:6285: checking for PATH separator" >&5
++ echo "$as_me:6288: checking for PATH separator" >&5
+ echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (os2*) PATH_SEPARATOR=';' ;;
+ (*) ${PATH_SEPARATOR:=':'} ;;
+ esac
+
+- echo "$as_me:6292: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:6295: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+ # headers needed for checks...
+-echo "$as_me:6296: checking for ANSI C header files" >&5
++echo "$as_me:6299: 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 6302 "configure"
++#line 6305 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -6307,13 +6310,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:6310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6313: \"$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:6316: \$? = $ac_status" >&5
++ echo "$as_me:6319: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6335,7 +6338,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 6338 "configure"
++#line 6341 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6353,7 +6356,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 6356 "configure"
++#line 6359 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6374,7 +6377,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6377 "configure"
++#line 6380 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6400,15 +6403,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6406: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6406: \$? = $ac_status" >&5
++ echo "$as_me:6409: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6408: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6411: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6411: \$? = $ac_status" >&5
++ echo "$as_me:6414: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6421,7 +6424,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6424: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6427: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6437,28 +6440,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6440: checking for $ac_header" >&5
++echo "$as_me:6443: 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 6446 "configure"
++#line 6449 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6455: \$? = $ac_status" >&5
++ echo "$as_me:6458: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6458: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6461: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6461: \$? = $ac_status" >&5
++ echo "$as_me:6464: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6468,7 +6471,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6471: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6474: 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
+@@ -6478,13 +6481,13 @@
+ fi
+ done
+
+-echo "$as_me:6481: checking whether exit is declared" >&5
++echo "$as_me:6484: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6487 "configure"
++#line 6490 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6499,16 +6502,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6505: \$? = $ac_status" >&5
++ echo "$as_me:6508: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6508: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6511: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6511: \$? = $ac_status" >&5
++ echo "$as_me:6514: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6518,19 +6521,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6521: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6524: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+
+ 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:6527: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6530: 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 6533 "configure"
++#line 6536 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -6545,16 +6548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6551: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6551: \$? = $ac_status" >&5
++ echo "$as_me:6554: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6554: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6557: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6557: \$? = $ac_status" >&5
++ echo "$as_me:6560: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6564,7 +6567,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6567: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6570: 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
+@@ -6577,7 +6580,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:6580: checking for opendir in -ldir" >&5
++ echo "$as_me:6583: 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
+@@ -6585,7 +6588,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6588 "configure"
++#line 6591 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6604,16 +6607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6607: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6610: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6610: \$? = $ac_status" >&5
++ echo "$as_me:6613: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6613: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6616: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6616: \$? = $ac_status" >&5
++ echo "$as_me:6619: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -6624,14 +6627,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6627: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6630: 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:6634: checking for opendir in -lx" >&5
++ echo "$as_me:6637: 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
+@@ -6639,7 +6642,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6642 "configure"
++#line 6645 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6658,16 +6661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6661: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6664: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6664: \$? = $ac_status" >&5
++ echo "$as_me:6667: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6667: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6670: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6670: \$? = $ac_status" >&5
++ echo "$as_me:6673: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -6678,7 +6681,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6681: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6684: 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"
+@@ -6688,7 +6691,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:6691: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6694: checking if you want to build a separate terminfo library" >&5
+ echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
+
+ # Check whether --with-termlib or --without-termlib was given.
+@@ -6698,10 +6701,10 @@
+ else
+ with_termlib=no
+ fi;
+-echo "$as_me:6701: result: $with_termlib" >&5
++echo "$as_me:6704: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+
+-echo "$as_me:6704: checking if you want to build a separate tic library" >&5
++echo "$as_me:6707: checking if you want to build a separate tic library" >&5
+ echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
+
+ # Check whether --with-ticlib or --without-ticlib was given.
+@@ -6711,7 +6714,7 @@
+ else
+ with_ticlib=no
+ fi;
+-echo "$as_me:6714: result: $with_ticlib" >&5
++echo "$as_me:6717: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6724,7 +6727,7 @@
+ test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+
+-echo "$as_me:6727: checking for default loader flags" >&5
++echo "$as_me:6730: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case "$DFT_LWR_MODEL" in
+ (libtool) LD_MODEL='' ;;
+@@ -6733,13 +6736,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:6736: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6739: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+
+ case "$DFT_LWR_MODEL" in
+ (shared)
+
+-echo "$as_me:6742: checking if rpath option should be used" >&5
++echo "$as_me:6745: checking if rpath option should be used" >&5
+ echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
+
+ # Check whether --enable-rpath or --disable-rpath was given.
+@@ -6749,10 +6752,10 @@
+ else
+ cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6752: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6755: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+
+-echo "$as_me:6755: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6758: checking if shared libraries should be relinked during install" >&5
+ echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
+
+ # Check whether --enable-relink or --disable-relink was given.
+@@ -6762,7 +6765,7 @@
+ else
+ cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6765: result: $cf_cv_do_relink" >&5
++echo "$as_me:6768: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ ;;
+ esac
+@@ -6773,7 +6776,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:6776: checking for an rpath option" >&5
++ echo "$as_me:6779: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -6804,12 +6807,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:6807: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:6810: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:6812: checking if we need a space after rpath option" >&5
++ echo "$as_me:6815: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ cf_save_LIBS="$LIBS"
+
+@@ -6830,7 +6833,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6833 "configure"
++#line 6836 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -6842,16 +6845,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6848: \$? = $ac_status" >&5
++ echo "$as_me:6851: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6851: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6854: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6854: \$? = $ac_status" >&5
++ echo "$as_me:6857: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -6861,7 +6864,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:6864: result: $cf_rpath_space" >&5
++ echo "$as_me:6867: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -6883,7 +6886,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:6886: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:6889: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6898,9 +6901,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:6901: result: $withval" >&5
++ echo "$as_me:6904: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:6903: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:6906: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -6909,7 +6912,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:6912: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:6915: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -6932,14 +6935,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:6935: checking which $CC option to use" >&5
++ echo "$as_me:6938: checking which $CC option to use" >&5
+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ for CC_SHARED_OPTS in -fPIC -fpic ''
+ do
+ CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6942 "configure"
++#line 6945 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6951,16 +6954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6957: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6957: \$? = $ac_status" >&5
++ echo "$as_me:6960: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6963: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6963: \$? = $ac_status" >&5
++ echo "$as_me:6966: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -6969,7 +6972,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:6972: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:6975: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -7040,7 +7043,7 @@
+ MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ cf_cv_shlib_version_infix=yes
+- echo "$as_me:7043: checking if ld -search_paths_first works" >&5
++ echo "$as_me:7046: checking if ld -search_paths_first works" >&5
+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7049,7 +7052,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7052 "configure"
++#line 7055 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -7061,16 +7064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7064: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7067: \$? = $ac_status" >&5
++ echo "$as_me:7070: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7070: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7073: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7073: \$? = $ac_status" >&5
++ echo "$as_me:7076: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7081,7 +7084,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7084: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7087: result: $cf_cv_ldflags_search_paths_first" >&5
+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ if test "$cf_cv_ldflags_search_paths_first" = yes; then
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+@@ -7431,7 +7434,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7434 "configure"
++#line 7437 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7443,16 +7446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7449: \$? = $ac_status" >&5
++ echo "$as_me:7452: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7452: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7455: \$? = $ac_status" >&5
++ echo "$as_me:7458: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -7489,7 +7492,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:7492: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:7495: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -7499,7 +7502,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 7502 "${as_me:-configure}"
++#line 7505 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -7511,18 +7514,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:7514: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:7517: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+- if { (eval echo "$as_me:7516: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:7519: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7519: \$? = $ac_status" >&5
++ echo "$as_me:7522: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:7521: result: yes" >&5
++ echo "$as_me:7524: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:7525: result: no" >&5
++ echo "$as_me:7528: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -7537,17 +7540,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:7540: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7543: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+
+ test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6
+
+-echo "${as_me:-configure}:7544: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7547: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ for model in $cf_list_models ; do
+ case "$model" in
+ (libtool)
+
+-echo "$as_me:7550: checking for additional libtool options" >&5
++echo "$as_me:7553: checking for additional libtool options" >&5
+ echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
+
+ # Check whether --with-libtool-opts or --without-libtool-opts was given.
+@@ -7557,7 +7560,7 @@
+ else
+ with_libtool_opts=no
+ fi;
+-echo "$as_me:7560: result: $with_libtool_opts" >&5
++echo "$as_me:7563: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+
+ case .$with_libtool_opts in
+@@ -7568,7 +7571,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7571: checking if exported-symbols file should be used" >&5
++echo "$as_me:7574: checking if exported-symbols file should be used" >&5
+ echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
+
+ # Check whether --with-export-syms or --without-export-syms was given.
+@@ -7583,7 +7586,7 @@
+ with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+
+ fi
+-echo "$as_me:7586: result: $with_export_syms" >&5
++echo "$as_me:7589: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7594,15 +7597,15 @@
+ ;;
+ (shared)
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+- { { echo "$as_me:7597: error: Shared libraries are not supported in this version" >&5
++ { { echo "$as_me:7600: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ # workaround for inept transition to PIE vs PIC...
+- echo "$as_me:7602: checking if current CFLAGS link properly" >&5
++ echo "$as_me:7605: checking if current CFLAGS link properly" >&5
+ echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7605 "configure"
++#line 7608 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7614,16 +7617,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7617: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7620: \$? = $ac_status" >&5
++ echo "$as_me:7623: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7623: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7626: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7626: \$? = $ac_status" >&5
++ echo "$as_me:7629: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cflags_work=yes
+ else
+@@ -7632,18 +7635,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7635: result: $cf_cflags_work" >&5
++ echo "$as_me:7638: result: $cf_cflags_work" >&5
+ echo "${ECHO_T}$cf_cflags_work" >&6
+ if test "$cf_cflags_work" = no
+ then
+ test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6
+
+-echo "${as_me:-configure}:7641: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7644: testing try to work around by appending shared-options ..." 1>&5
+
+ CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ fi
+
+-echo "$as_me:7646: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7649: checking if versioned-symbols file should be used" >&5
+ echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
+
+ # Check whether --with-versioned-syms or --without-versioned-syms was given.
+@@ -7661,18 +7664,18 @@
+ (xno)
+ ;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+- test -f "$with_versioned_syms" || { { echo "$as_me:7664: error: expected a filename: $with_versioned_syms" >&5
++ test -f "$with_versioned_syms" || { { echo "$as_me:7667: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ (*)
+- test -f "$with_versioned_syms" || { { echo "$as_me:7669: error: expected a filename: $with_versioned_syms" >&5
++ test -f "$with_versioned_syms" || { { echo "$as_me:7672: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+ { (exit 1); exit 1; }; }
+ with_versioned_syms=`pwd`/"$with_versioned_syms"
+ ;;
+ esac
+-echo "$as_me:7675: result: $with_versioned_syms" >&5
++echo "$as_me:7678: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+
+ RESULTING_SYMS=
+@@ -7688,7 +7691,7 @@
+ MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
+ test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6
+
+-echo "${as_me:-configure}:7691: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7694: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*-dy\ *)
+@@ -7696,11 +7699,11 @@
+ MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
+ test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6
+
+-echo "${as_me:-configure}:7699: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7702: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:7703: WARNING: this system does not support versioned-symbols" >&5
++ { echo "$as_me:7706: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ ;;
+ esac
+@@ -7712,7 +7715,7 @@
+ # symbols.
+ if test "x$VERSIONED_SYMS" != "x"
+ then
+- echo "$as_me:7715: checking if wildcards can be used to selectively omit symbols" >&5
++ echo "$as_me:7718: checking if wildcards can be used to selectively omit symbols" >&5
+ echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
+ WILDCARD_SYMS=no
+
+@@ -7749,7 +7752,7 @@
+ } submodule_1.0;
+ EOF
+ cat >conftest.$ac_ext <<EOF
+-#line 7752 "configure"
++#line 7755 "configure"
+ extern int _ismissing(void); int _ismissing(void) { return 1; }
+ extern int _localf1(void); int _localf1(void) { return 1; }
+ extern int _localf2(void); int _localf2(void) { return 2; }
+@@ -7780,7 +7783,7 @@
+ cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ ][DT][ ]'`"
+ test -n "$cf_missing" && WILDCARD_SYMS=yes
+ fi
+- echo "$as_me:7783: result: $WILDCARD_SYMS" >&5
++ echo "$as_me:7786: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ rm -f conftest.*
+ fi
+@@ -7793,7 +7796,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+
+-echo "$as_me:7796: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7799: checking if you want to link with the GPM mouse library" >&5
+ echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
+
+ # Check whether --with-gpm or --without-gpm was given.
+@@ -7803,27 +7806,27 @@
+ else
+ with_gpm=maybe
+ fi;
+-echo "$as_me:7806: result: $with_gpm" >&5
++echo "$as_me:7809: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7810: checking for gpm.h" >&5
++ echo "$as_me:7813: checking for gpm.h" >&5
+ echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
+ if test "${ac_cv_header_gpm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7816 "configure"
++#line 7819 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:7820: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7823: \"$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:7826: \$? = $ac_status" >&5
++ echo "$as_me:7829: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7842,7 +7845,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7845: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7848: result: $ac_cv_header_gpm_h" >&5
+ echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
+ if test "$ac_cv_header_gpm_h" = yes; then
+
+@@ -7853,7 +7856,7 @@
+ if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
+ test -n "$verbose" && echo " assuming we really have GPM library" 1>&6
+
+-echo "${as_me:-configure}:7856: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7859: testing assuming we really have GPM library ..." 1>&5
+
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7861,7 +7864,7 @@
+
+ with_gpm=yes
+ else
+- echo "$as_me:7864: checking for Gpm_Open in -lgpm" >&5
++ echo "$as_me:7867: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7869,7 +7872,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7872 "configure"
++#line 7875 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7888,16 +7891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7894: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7894: \$? = $ac_status" >&5
++ echo "$as_me:7897: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7897: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7900: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7900: \$? = $ac_status" >&5
++ echo "$as_me:7903: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7908,18 +7911,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7911: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7914: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+ with_gpm=yes
+ else
+
+ if test "$with_gpm" = maybe; then
+- { echo "$as_me:7918: WARNING: Cannot link with GPM library" >&5
++ { echo "$as_me:7921: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ with_gpm=no
+ else
+- { { echo "$as_me:7922: error: Cannot link with GPM library" >&5
++ { { echo "$as_me:7925: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7930,7 +7933,7 @@
+
+ else
+
+- test "$with_gpm" != maybe && { echo "$as_me:7933: WARNING: Cannot find GPM header" >&5
++ test "$with_gpm" != maybe && { echo "$as_me:7936: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ with_gpm=no
+
+@@ -7939,7 +7942,7 @@
+ fi
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7942: checking if you want to load GPM dynamically" >&5
++ echo "$as_me:7945: checking if you want to load GPM dynamically" >&5
+ echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
+
+ # Check whether --with-dlsym or --without-dlsym was given.
+@@ -7949,18 +7952,18 @@
+ else
+ with_dlsym=yes
+ fi;
+- echo "$as_me:7952: result: $with_dlsym" >&5
++ echo "$as_me:7955: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ if test "x$with_dlsym" = xyes ; then
+
+ cf_have_dlsym=no
+-echo "$as_me:7957: checking for dlsym" >&5
++echo "$as_me:7960: checking for dlsym" >&5
+ echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
+ if test "${ac_cv_func_dlsym+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7963 "configure"
++#line 7966 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7991,16 +7994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7997: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7997: \$? = $ac_status" >&5
++ echo "$as_me:8000: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8000: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8003: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8003: \$? = $ac_status" >&5
++ echo "$as_me:8006: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_dlsym=yes
+ else
+@@ -8010,14 +8013,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8013: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8016: result: $ac_cv_func_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_func_dlsym" >&6
+ if test "$ac_cv_func_dlsym" = yes; then
+ cf_have_dlsym=yes
+ else
+
+ cf_have_libdl=no
+-echo "$as_me:8020: checking for dlsym in -ldl" >&5
++echo "$as_me:8023: checking for dlsym in -ldl" >&5
+ echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8025,7 +8028,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8028 "configure"
++#line 8031 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8044,16 +8047,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8050: \$? = $ac_status" >&5
++ echo "$as_me:8053: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8056: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8056: \$? = $ac_status" >&5
++ echo "$as_me:8059: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8064,7 +8067,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8067: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8070: result: $ac_cv_lib_dl_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+ if test "$ac_cv_lib_dl_dlsym" = yes; then
+
+@@ -8093,10 +8096,10 @@
+ LIBS="$cf_add_libs"
+ }
+
+- echo "$as_me:8096: checking whether able to link to dl*() functions" >&5
++ echo "$as_me:8099: checking whether able to link to dl*() functions" >&5
+ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8099 "configure"
++#line 8102 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -8114,16 +8117,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8120: \$? = $ac_status" >&5
++ echo "$as_me:8123: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8123: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8126: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8126: \$? = $ac_status" >&5
++ echo "$as_me:8129: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cat >>confdefs.h <<\EOF
+@@ -8134,15 +8137,15 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { { echo "$as_me:8137: error: Cannot link test program for libdl" >&5
++ { { echo "$as_me:8140: error: Cannot link test program for libdl" >&5
+ echo "$as_me: error: Cannot link test program for libdl" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8142: result: ok" >&5
++ echo "$as_me:8145: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+- { { echo "$as_me:8145: error: Cannot find dlsym function" >&5
++ { { echo "$as_me:8148: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8150,12 +8153,12 @@
+ if test "x$with_gpm" != xyes ; then
+ test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6
+
+-echo "${as_me:-configure}:8153: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8156: testing assuming soname for gpm is $with_gpm ..." 1>&5
+
+ cf_cv_gpm_soname="$with_gpm"
+ else
+
+-echo "$as_me:8158: checking for soname of gpm library" >&5
++echo "$as_me:8161: checking for soname of gpm library" >&5
+ echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
+ if test "${cf_cv_gpm_soname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8189,15 +8192,15 @@
+ done
+ LIBS="$cf_add_libs"
+
+- if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8195: \$? = $ac_status" >&5
++ echo "$as_me:8198: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8197: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8200: \$? = $ac_status" >&5
++ echo "$as_me:8203: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+ cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
+ test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
+@@ -8208,7 +8211,7 @@
+ fi
+
+ fi
+-echo "$as_me:8211: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8214: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+
+ fi
+@@ -8276,7 +8279,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+
+-echo "$as_me:8279: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8282: checking for Gpm_Wgetch in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8284,7 +8287,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8287 "configure"
++#line 8290 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8303,16 +8306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8309: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8309: \$? = $ac_status" >&5
++ echo "$as_me:8312: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8315: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8315: \$? = $ac_status" >&5
++ echo "$as_me:8318: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8323,11 +8326,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8326: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8329: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then
+
+-echo "$as_me:8330: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8333: checking if GPM is weakly bound to curses library" >&5
+ echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
+ if test "${cf_cv_check_gpm_wgetch+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8351,15 +8354,15 @@
+ # to rely on the static library, noting that some packagers may not
+ # include it.
+ LIBS="-static -lgpm -dynamic $LIBS"
+- if { (eval echo "$as_me:8354: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8357: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8357: \$? = $ac_status" >&5
++ echo "$as_me:8360: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8362: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8362: \$? = $ac_status" >&5
++ echo "$as_me:8365: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+ cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
+ test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -8371,11 +8374,11 @@
+ fi
+
+ fi
+-echo "$as_me:8374: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8377: result: $cf_cv_check_gpm_wgetch" >&5
+ echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
+
+ if test "$cf_cv_check_gpm_wgetch" != yes ; then
+- { echo "$as_me:8378: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++ { echo "$as_me:8381: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+ echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
+ fi
+
+@@ -8383,7 +8386,7 @@
+
+ fi
+
+-echo "$as_me:8386: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8389: checking if you want to use PCRE2 for regular-expressions" >&5
+ echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
+
+ # Check whether --with-pcre2 or --without-pcre2 was given.
+@@ -8392,7 +8395,7 @@
+
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8395: result: $with_pcre2" >&5
++echo "$as_me:8398: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+
+ if test "x$with_pcre2" != xno ; then
+@@ -8403,17 +8406,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
+ test -n "$verbose" && echo " found package $cf_with_pcre2" 1>&6
+
+-echo "${as_me:-configure}:8406: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8409: testing found package $cf_with_pcre2 ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_with_pcre2" 2>/dev/null`"
+ test -n "$verbose" && echo " package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:8412: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8415: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:8416: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8419: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8537,7 +8540,7 @@
+ fi
+
+ done
+- cf_with_pcre2_ok=yes || { { echo "$as_me:8540: error: Cannot find PCRE2 library" >&5
++ cf_with_pcre2_ok=yes || { { echo "$as_me:8543: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -8550,7 +8553,7 @@
+ (*pcre2-posix*|*pcreposix*)
+ ;;
+ (*)
+- echo "$as_me:8553: checking for regcomp in -lpcre2-posix" >&5
++ echo "$as_me:8556: checking for regcomp in -lpcre2-posix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8558,7 +8561,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8561 "configure"
++#line 8564 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8577,16 +8580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8583: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8583: \$? = $ac_status" >&5
++ echo "$as_me:8586: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8586: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8589: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8589: \$? = $ac_status" >&5
++ echo "$as_me:8592: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8597,7 +8600,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8600: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8603: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
+ if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then
+
+@@ -8618,7 +8621,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- echo "$as_me:8621: checking for regcomp in -lpcreposix" >&5
++ echo "$as_me:8624: checking for regcomp in -lpcreposix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8626,7 +8629,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8629 "configure"
++#line 8632 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8645,16 +8648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8651: \$? = $ac_status" >&5
++ echo "$as_me:8654: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8654: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8657: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8657: \$? = $ac_status" >&5
++ echo "$as_me:8660: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8665,7 +8668,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8668: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8671: result: $ac_cv_lib_pcreposix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
+ if test "$ac_cv_lib_pcreposix_regcomp" = yes; then
+
+@@ -8686,7 +8689,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- { { echo "$as_me:8689: error: Cannot find PCRE2 POSIX library" >&5
++ { { echo "$as_me:8692: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8701,23 +8704,23 @@
+ for ac_header in pcre2posix.h pcreposix.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8704: checking for $ac_header" >&5
++echo "$as_me:8707: 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 8710 "configure"
++#line 8713 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8717: \"$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:8720: \$? = $ac_status" >&5
++ echo "$as_me:8723: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8736,7 +8739,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8742: 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
+@@ -8749,13 +8752,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:8752: checking for $ac_func" >&5
++echo "$as_me:8755: 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 8758 "configure"
++#line 8761 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8786,16 +8789,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8792: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8792: \$? = $ac_status" >&5
++ echo "$as_me:8795: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8795: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8798: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8798: \$? = $ac_status" >&5
++ echo "$as_me:8801: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -8805,7 +8808,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8808: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8811: 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
+@@ -8819,7 +8822,7 @@
+
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:8822: checking if you want to use sysmouse" >&5
++echo "$as_me:8825: checking if you want to use sysmouse" >&5
+ echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
+
+ # Check whether --with-sysmouse or --without-sysmouse was given.
+@@ -8831,7 +8834,7 @@
+ fi;
+ if test "$cf_with_sysmouse" != no ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8834 "configure"
++#line 8837 "configure"
+ #include "confdefs.h"
+
+ #include <osreldate.h>
+@@ -8854,16 +8857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8860: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8860: \$? = $ac_status" >&5
++ echo "$as_me:8863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8863: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8866: \$? = $ac_status" >&5
++ echo "$as_me:8869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_with_sysmouse=yes
+ else
+@@ -8873,7 +8876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8876: result: $cf_with_sysmouse" >&5
++echo "$as_me:8879: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8883,7 +8886,7 @@
+ fi
+
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8886: checking if you want to disable library suffixes" >&5
++echo "$as_me:8889: checking if you want to disable library suffixes" >&5
+ echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
+
+ # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
+@@ -8900,13 +8903,13 @@
+ disable_lib_suffixes=no
+
+ fi;
+-echo "$as_me:8903: result: $disable_lib_suffixes" >&5
++echo "$as_me:8906: result: $disable_lib_suffixes" >&5
+ echo "${ECHO_T}$disable_lib_suffixes" >&6
+
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
+
+-echo "$as_me:8909: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8912: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -8924,22 +8927,22 @@
+
+ fi;
+ if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+-echo "$as_me:8927: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8930: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:8932: checking for updated LDFLAGS" >&5
++echo "$as_me:8935: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+- echo "$as_me:8935: result: maybe" >&5
++ echo "$as_me:8938: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+
+ for ac_prog in ldd
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8942: checking for $ac_word" >&5
++echo "$as_me:8945: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8954,7 +8957,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:8957: found $ac_dir/$ac_word" >&5
++echo "$as_me:8960: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8962,10 +8965,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:8965: result: $cf_ldd_prog" >&5
++ echo "$as_me:8968: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:8968: result: no" >&5
++ echo "$as_me:8971: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8979,7 +8982,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8982 "configure"
++#line 8985 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8991,16 +8994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8997: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8997: \$? = $ac_status" >&5
++ echo "$as_me:9000: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9000: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9003: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9003: \$? = $ac_status" >&5
++ echo "$as_me:9006: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -9028,7 +9031,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9034: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -9040,11 +9043,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9043: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9046: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9047: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9050: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9081,7 +9084,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9087: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9094,11 +9097,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9097: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9100: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9101: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9104: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9135,7 +9138,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9138: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9141: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9148,14 +9151,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9151: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9154: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9155: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9158: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:9158: result: no" >&5
++ echo "$as_me:9161: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9169,7 +9172,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+- echo "$as_me:9172: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++ echo "$as_me:9175: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+ echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
+
+ # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
+@@ -9186,7 +9189,7 @@
+ disable_pkg_ldflags=no
+
+ fi;
+- echo "$as_me:9189: result: $disable_pkg_ldflags" >&5
++ echo "$as_me:9192: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9194,7 +9197,7 @@
+ ###############################################################################
+
+ ### use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9197: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9200: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+
+@@ -9213,11 +9216,11 @@
+ esac
+
+ fi;
+-echo "$as_me:9216: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9219: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+
+ ### use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9220: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9223: checking if you wish to install ncurses overwriting curses" >&5
+ echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
+
+ # Check whether --enable-overwrite or --disable-overwrite was given.
+@@ -9227,10 +9230,10 @@
+ else
+ if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9230: result: $with_overwrite" >&5
++echo "$as_me:9233: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+
+-echo "$as_me:9233: checking if external terminfo-database is used" >&5
++echo "$as_me:9236: checking if external terminfo-database is used" >&5
+ echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
+
+ # Check whether --enable-database or --disable-database was given.
+@@ -9240,7 +9243,7 @@
+ else
+ use_database=yes
+ fi;
+-echo "$as_me:9243: result: $use_database" >&5
++echo "$as_me:9246: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+
+ case "$host_os" in
+@@ -9256,7 +9259,7 @@
+ if test "$use_database" != no ; then
+ NCURSES_USE_DATABASE=1
+
+- echo "$as_me:9259: checking which terminfo source-file will be installed" >&5
++ echo "$as_me:9262: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+
+ # Check whether --with-database or --without-database was given.
+@@ -9264,10 +9267,10 @@
+ withval="$with_database"
+ TERMINFO_SRC=$withval
+ fi;
+- echo "$as_me:9267: result: $TERMINFO_SRC" >&5
++ echo "$as_me:9270: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+
+- echo "$as_me:9270: checking whether to use hashed database instead of directory/tree" >&5
++ echo "$as_me:9273: checking whether to use hashed database instead of directory/tree" >&5
+ echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
+
+ # Check whether --with-hashed-db or --without-hashed-db was given.
+@@ -9277,13 +9280,13 @@
+ else
+ with_hashed_db=no
+ fi;
+- echo "$as_me:9280: result: $with_hashed_db" >&5
++ echo "$as_me:9283: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ with_hashed_db=no
+ fi
+
+-echo "$as_me:9286: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9289: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9293,7 +9296,7 @@
+ else
+ with_fallback=
+ fi;
+-echo "$as_me:9296: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9299: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+
+ case ".$with_fallback" in
+@@ -9301,7 +9304,7 @@
+ FALLBACK_LIST=
+ ;;
+ (.yes)
+- { echo "$as_me:9304: WARNING: expected a list of terminal descriptions" >&5
++ { echo "$as_me:9307: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ ;;
+ (*)
+@@ -9317,7 +9320,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}tic; ac_word=$2
+-echo "$as_me:9320: checking for $ac_word" >&5
++echo "$as_me:9323: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_TIC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9332,7 +9335,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_TIC="${ac_tool_prefix}tic"
+-echo "$as_me:9335: found $ac_dir/$ac_word" >&5
++echo "$as_me:9338: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9340,10 +9343,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+- echo "$as_me:9343: result: $TIC" >&5
++ echo "$as_me:9346: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9346: result: no" >&5
++ echo "$as_me:9349: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9352,7 +9355,7 @@
+ ac_ct_TIC=$TIC
+ # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:9355: checking for $ac_word" >&5
++echo "$as_me:9358: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9367,7 +9370,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_TIC="tic"
+-echo "$as_me:9370: found $ac_dir/$ac_word" >&5
++echo "$as_me:9373: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9375,10 +9378,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+- echo "$as_me:9378: result: $ac_ct_TIC" >&5
++ echo "$as_me:9381: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+- echo "$as_me:9381: result: no" >&5
++ echo "$as_me:9384: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9390,7 +9393,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}infocmp; ac_word=$2
+-echo "$as_me:9393: checking for $ac_word" >&5
++echo "$as_me:9396: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_INFOCMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9405,7 +9408,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
+-echo "$as_me:9408: found $ac_dir/$ac_word" >&5
++echo "$as_me:9411: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9413,10 +9416,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9416: result: $INFOCMP" >&5
++ echo "$as_me:9419: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9419: result: no" >&5
++ echo "$as_me:9422: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9425,7 +9428,7 @@
+ ac_ct_INFOCMP=$INFOCMP
+ # Extract the first word of "infocmp", so it can be a program name with args.
+ set dummy infocmp; ac_word=$2
+-echo "$as_me:9428: checking for $ac_word" >&5
++echo "$as_me:9431: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9440,7 +9443,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_INFOCMP="infocmp"
+-echo "$as_me:9443: found $ac_dir/$ac_word" >&5
++echo "$as_me:9446: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9448,10 +9451,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+- echo "$as_me:9451: result: $ac_ct_INFOCMP" >&5
++ echo "$as_me:9454: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+- echo "$as_me:9454: result: no" >&5
++ echo "$as_me:9457: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9466,10 +9469,10 @@
+ # Check whether --with-tic-path or --without-tic-path was given.
+ if test "${with_tic_path+set}" = set; then
+ withval="$with_tic_path"
+- echo "$as_me:9469: checking for tic program for fallbacks" >&5
++ echo "$as_me:9472: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ TIC=$withval
+- echo "$as_me:9472: result: $TIC" >&5
++ echo "$as_me:9475: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9495,7 +9498,7 @@
+ TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9498: error: expected a pathname, not \"$TIC\"" >&5
++ { { echo "$as_me:9501: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9508,7 +9511,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:9511: checking for $ac_word" >&5
++echo "$as_me:9514: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9525,7 +9528,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_TIC="$ac_dir/$ac_word"
+- echo "$as_me:9528: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9531: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9536,10 +9539,10 @@
+ TIC=$ac_cv_path_TIC
+
+ if test -n "$TIC"; then
+- echo "$as_me:9539: result: $TIC" >&5
++ echo "$as_me:9542: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9542: result: no" >&5
++ echo "$as_me:9545: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9596,7 +9599,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9599: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9602: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -9611,7 +9614,7 @@
+
+ if test -z "$TIC"
+ then
+- { echo "$as_me:9614: WARNING: no tic program found for fallbacks" >&5
++ { echo "$as_me:9617: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ fi
+
+@@ -9620,10 +9623,10 @@
+ # Check whether --with-infocmp-path or --without-infocmp-path was given.
+ if test "${with_infocmp_path+set}" = set; then
+ withval="$with_infocmp_path"
+- echo "$as_me:9623: checking for infocmp program for fallbacks" >&5
++ echo "$as_me:9626: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ INFOCMP=$withval
+- echo "$as_me:9626: result: $INFOCMP" >&5
++ echo "$as_me:9629: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9649,7 +9652,7 @@
+ INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9652: error: expected a pathname, not \"$INFOCMP\"" >&5
++ { { echo "$as_me:9655: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9662,7 +9665,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:9665: checking for $ac_word" >&5
++echo "$as_me:9668: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_INFOCMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9679,7 +9682,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_INFOCMP="$ac_dir/$ac_word"
+- echo "$as_me:9682: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9685: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9690,10 +9693,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9693: result: $INFOCMP" >&5
++ echo "$as_me:9696: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9696: result: no" >&5
++ echo "$as_me:9699: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9750,7 +9753,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9753: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9756: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -9765,7 +9768,7 @@
+
+ if test -z "$INFOCMP"
+ then
+- { echo "$as_me:9768: WARNING: no infocmp program found for fallbacks" >&5
++ { echo "$as_me:9771: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ fi
+
+@@ -9775,7 +9778,7 @@
+ test -z "$INFOCMP" && FALLBACK_LIST=
+ if test -z "$FALLBACK_LIST"
+ then
+- { echo "$as_me:9778: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++ { echo "$as_me:9781: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+ echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
+ fi
+ fi
+@@ -9783,7 +9786,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+
+-echo "$as_me:9786: checking if you want modern xterm or antique" >&5
++echo "$as_me:9789: checking if you want modern xterm or antique" >&5
+ echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
+
+ # Check whether --with-xterm-new or --without-xterm-new was given.
+@@ -9797,7 +9800,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*) with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9800: result: $with_xterm_new" >&5
++echo "$as_me:9803: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+
+@@ -9810,7 +9813,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9813: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9816: 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.
+@@ -9834,13 +9837,13 @@
+ with_xterm_kbs=$withval
+ ;;
+ esac
+-echo "$as_me:9837: result: $with_xterm_kbs" >&5
++echo "$as_me:9840: 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:9843: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++ { echo "$as_me:9846: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+
+@@ -9850,7 +9853,7 @@
+ MAKE_TERMINFO="#"
+ else
+
+-echo "$as_me:9853: checking for list of terminfo directories" >&5
++echo "$as_me:9856: 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.
+@@ -9888,7 +9891,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9891: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:9894: 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; }; }
+ ;;
+@@ -9911,7 +9914,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9914: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9917: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9920,13 +9923,13 @@
+
+ case "x$TERMINFO" in
+ x???:*)
+- { echo "$as_me:9923: WARNING: ignoring non-directory/file TERMINFO value" >&5
++ { echo "$as_me:9926: 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:9929: checking for default terminfo directory" >&5
++echo "$as_me:9932: 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.
+@@ -9960,7 +9963,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:9966: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9969,7 +9972,7 @@
+ fi
+ eval TERMINFO="$withval"
+
+-echo "$as_me:9972: result: $TERMINFO" >&5
++echo "$as_me:9975: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -9980,7 +9983,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:9983: checking if big-core option selected" >&5
++echo "$as_me:9986: 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.
+@@ -9992,7 +9995,7 @@
+ with_big_core=no
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9995 "configure"
++#line 9998 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10006,15 +10009,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10012: \$? = $ac_status" >&5
++ echo "$as_me:10015: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10014: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10017: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10017: \$? = $ac_status" >&5
++ echo "$as_me:10020: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_big_core=yes
+ else
+@@ -10026,7 +10029,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10029: result: $with_big_core" >&5
++echo "$as_me:10032: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10036,7 +10039,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:10039: checking if big-strings option selected" >&5
++echo "$as_me:10042: 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.
+@@ -10060,14 +10063,14 @@
+ esac
+
+ fi;
+-echo "$as_me:10063: result: $with_big_strings" >&5
++echo "$as_me:10066: 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:10070: checking if you want termcap-fallback support" >&5
++echo "$as_me:10073: 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.
+@@ -10077,14 +10080,14 @@
+ else
+ with_termcap=no
+ fi;
+-echo "$as_me:10080: result: $with_termcap" >&5
++echo "$as_me:10083: 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:10087: error: You have disabled the database w/o specifying fallbacks" >&5
++ { { echo "$as_me:10090: 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
+@@ -10097,13 +10100,13 @@
+ else
+
+ if test "$with_ticlib" != no ; then
+- { { echo "$as_me:10100: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++ { { echo "$as_me:10103: 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:10106: checking for list of termcap files" >&5
++ echo "$as_me:10109: 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.
+@@ -10141,7 +10144,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:10144: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:10147: 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; }; }
+ ;;
+@@ -10164,7 +10167,7 @@
+ ;;
+ esac
+
+- echo "$as_me:10167: result: $TERMPATH" >&5
++ echo "$as_me:10170: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -10172,7 +10175,7 @@
+ EOF
+
+ ### use option --enable-getcap to use a hacked getcap for reading termcaps
+- echo "$as_me:10175: checking if fast termcap-loader is needed" >&5
++ echo "$as_me:10178: 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.
+@@ -10182,14 +10185,14 @@
+ else
+ with_getcap=no
+ fi;
+- echo "$as_me:10185: result: $with_getcap" >&5
++ echo "$as_me:10188: 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:10192: checking if translated termcaps will be cached in ~/.terminfo" >&5
++ echo "$as_me:10195: 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.
+@@ -10199,7 +10202,7 @@
+ else
+ with_getcap_cache=no
+ fi;
+- echo "$as_me:10202: result: $with_getcap_cache" >&5
++ echo "$as_me:10205: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10209,7 +10212,7 @@
+ fi
+
+ ### Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10212: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10215: 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.
+@@ -10219,14 +10222,14 @@
+ else
+ with_home_terminfo=yes
+ fi;
+-echo "$as_me:10222: result: $with_home_terminfo" >&5
++echo "$as_me:10225: 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:10229: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10232: 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.
+@@ -10236,14 +10239,14 @@
+ else
+ with_root_environ=yes
+ fi;
+-echo "$as_me:10239: result: $with_root_environ" >&5
++echo "$as_me:10242: 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:10246: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10249: 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-access or --disable-root-access was given.
+@@ -10253,14 +10256,14 @@
+ else
+ with_root_access=yes
+ fi;
+-echo "$as_me:10256: result: $with_root_access" >&5
++echo "$as_me:10259: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+
+-echo "$as_me:10263: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10266: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10270,7 +10273,7 @@
+ else
+ with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10273: result: $with_setuid_environ" >&5
++echo "$as_me:10276: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10285,23 +10288,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10288: checking for $ac_header" >&5
++echo "$as_me:10291: 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 10294 "configure"
++#line 10297 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10301: \"$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:10304: \$? = $ac_status" >&5
++ echo "$as_me:10307: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10320,7 +10323,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10326: 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
+@@ -10335,13 +10338,13 @@
+ unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10338: checking for $ac_func" >&5
++echo "$as_me:10341: 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 10344 "configure"
++#line 10347 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10372,16 +10375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10378: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10378: \$? = $ac_status" >&5
++ echo "$as_me:10381: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10381: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10384: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10384: \$? = $ac_status" >&5
++ echo "$as_me:10387: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10391,7 +10394,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10394: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10397: 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
+@@ -10408,13 +10411,13 @@
+ symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10411: checking for $ac_func" >&5
++echo "$as_me:10414: 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 10417 "configure"
++#line 10420 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10445,16 +10448,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10451: \$? = $ac_status" >&5
++ echo "$as_me:10454: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10454: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10457: \$? = $ac_status" >&5
++ echo "$as_me:10460: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10464,7 +10467,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10467: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10470: 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
+@@ -10475,7 +10478,7 @@
+ done
+
+ else
+- echo "$as_me:10478: checking if link/symlink functions work" >&5
++ echo "$as_me:10481: 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
+@@ -10488,7 +10491,7 @@
+ eval 'ac_cv_func_'$cf_func'=error'
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10491 "configure"
++#line 10494 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10522,15 +10525,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10528: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10528: \$? = $ac_status" >&5
++ echo "$as_me:10531: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10530: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10533: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10533: \$? = $ac_status" >&5
++ echo "$as_me:10536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10548,7 +10551,7 @@
+ test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+
+ fi
+-echo "$as_me:10551: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10554: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ test "$ac_cv_func_link" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10568,7 +10571,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:10571: checking if tic should use symbolic links" >&5
++ echo "$as_me:10574: 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.
+@@ -10578,21 +10581,21 @@
+ else
+ with_symlinks=no
+ fi;
+- echo "$as_me:10581: result: $with_symlinks" >&5
++ echo "$as_me:10584: 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:10588: checking if tic should use hard links" >&5
++ echo "$as_me:10591: 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:10595: result: $with_links" >&5
++ echo "$as_me:10598: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+
+@@ -10608,7 +10611,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:10611: checking if you want broken-linker support code" >&5
++echo "$as_me:10614: 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.
+@@ -10618,7 +10621,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:10621: result: $with_broken_linker" >&5
++echo "$as_me:10624: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -10632,7 +10635,7 @@
+ fi
+
+ ### use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10635: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10638: 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.
+@@ -10642,7 +10645,7 @@
+ else
+ with_bsdpad=no
+ fi;
+-echo "$as_me:10645: result: $with_bsdpad" >&5
++echo "$as_me:10648: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10661,14 +10664,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+
+-echo "$as_me:10664: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10667: 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 10671 "configure"
++#line 10674 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10687,16 +10690,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10693: \$? = $ac_status" >&5
++ echo "$as_me:10696: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10696: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10699: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10699: \$? = $ac_status" >&5
++ echo "$as_me:10702: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -10707,7 +10710,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10710: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10713: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10749,14 +10752,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:10752: checking if this is the GNU C library" >&5
++echo "$as_me:10755: 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 10759 "configure"
++#line 10762 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10775,16 +10778,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10781: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10781: \$? = $ac_status" >&5
++ echo "$as_me:10784: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10784: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10787: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10787: \$? = $ac_status" >&5
++ echo "$as_me:10790: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -10795,7 +10798,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10798: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10801: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10803,7 +10806,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:10806: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:10809: 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
+@@ -10815,7 +10818,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10818 "configure"
++#line 10821 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10834,16 +10837,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10840: \$? = $ac_status" >&5
++ echo "$as_me:10843: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10843: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10846: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10846: \$? = $ac_status" >&5
++ echo "$as_me:10849: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -10855,12 +10858,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:10858: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10861: 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:10863: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:10866: 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
+@@ -10965,7 +10968,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10968 "configure"
++#line 10971 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -10985,16 +10988,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10991: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10991: \$? = $ac_status" >&5
++ echo "$as_me:10994: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10994: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10997: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10997: \$? = $ac_status" >&5
++ echo "$as_me:11000: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11005,7 +11008,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11008: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11011: 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
+@@ -11014,14 +11017,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:11017: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:11020: 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 11024 "configure"
++#line 11027 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11036,16 +11039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11042: \$? = $ac_status" >&5
++ echo "$as_me:11045: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11045: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11048: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11048: \$? = $ac_status" >&5
++ echo "$as_me:11051: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11152,7 +11155,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11155 "configure"
++#line 11158 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11167,16 +11170,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11173: \$? = $ac_status" >&5
++ echo "$as_me:11176: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11176: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11179: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11179: \$? = $ac_status" >&5
++ echo "$as_me:11182: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11191,12 +11194,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11194: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11197: 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:11199: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:11202: 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
+@@ -11206,7 +11209,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11209 "configure"
++#line 11212 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11221,16 +11224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11227: \$? = $ac_status" >&5
++ echo "$as_me:11230: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11230: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11233: \$? = $ac_status" >&5
++ echo "$as_me:11236: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -11241,7 +11244,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11244: result: $cf_cv_default_source" >&5
++echo "$as_me:11247: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -11281,16 +11284,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11284: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11287: 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}:11290: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11293: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11293 "configure"
++#line 11296 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11305,16 +11308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11311: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11311: \$? = $ac_status" >&5
++ echo "$as_me:11314: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11314: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11317: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11317: \$? = $ac_status" >&5
++ echo "$as_me:11320: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11335,7 +11338,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11338 "configure"
++#line 11341 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11350,16 +11353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11356: \$? = $ac_status" >&5
++ echo "$as_me:11359: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11359: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11362: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11362: \$? = $ac_status" >&5
++ echo "$as_me:11365: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11370,7 +11373,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11373: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11376: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11378,10 +11381,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11381: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11384: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11384 "configure"
++#line 11387 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11396,16 +11399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11402: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11402: \$? = $ac_status" >&5
++ echo "$as_me:11405: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11405: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11408: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11408: \$? = $ac_status" >&5
++ echo "$as_me:11411: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11421,7 +11424,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11424: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11427: 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
+@@ -11538,7 +11541,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:11541: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:11544: 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
+@@ -11570,14 +11573,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:11573: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11576: 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 11580 "configure"
++#line 11583 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11595,16 +11598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11601: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11601: \$? = $ac_status" >&5
++ echo "$as_me:11604: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11604: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11607: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11607: \$? = $ac_status" >&5
++ echo "$as_me:11610: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11616,7 +11619,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11619 "configure"
++#line 11622 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11634,16 +11637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11640: \$? = $ac_status" >&5
++ echo "$as_me:11643: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11643: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11646: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11646: \$? = $ac_status" >&5
++ echo "$as_me:11649: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11658,7 +11661,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11661: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11664: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11818,16 +11821,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11821: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11824: 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}:11827: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11830: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11830 "configure"
++#line 11833 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11842,16 +11845,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11845: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11848: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11848: \$? = $ac_status" >&5
++ echo "$as_me:11851: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11851: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11854: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11854: \$? = $ac_status" >&5
++ echo "$as_me:11857: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11872,7 +11875,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11875 "configure"
++#line 11878 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11887,16 +11890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11890: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11893: \$? = $ac_status" >&5
++ echo "$as_me:11896: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11896: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11899: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11899: \$? = $ac_status" >&5
++ echo "$as_me:11902: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11907,7 +11910,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11910: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11913: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11915,10 +11918,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11918: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11921: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11921 "configure"
++#line 11924 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11933,16 +11936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11939: \$? = $ac_status" >&5
++ echo "$as_me:11942: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11942: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11945: \$? = $ac_status" >&5
++ echo "$as_me:11948: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11958,7 +11961,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11961: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11964: 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
+@@ -12071,10 +12074,10 @@
+ if test "$cf_cv_xopen_source" = no ; then
+ test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+
+-echo "${as_me:-configure}:12074: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12077: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12077 "configure"
++#line 12080 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12092,23 +12095,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12095: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12098: \$? = $ac_status" >&5
++ echo "$as_me:12101: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12101: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12104: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12104: \$? = $ac_status" >&5
++ echo "$as_me:12107: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:12111: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:12114: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12131,7 +12134,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}:12134: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12137: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -12143,7 +12146,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}:12146: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12149: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12231,7 +12234,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:12234: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12237: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12241,7 +12244,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:12244: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12247: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12251,7 +12254,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}:12254: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12257: 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"
+@@ -12263,10 +12266,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:12266: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:12269: 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 12269 "configure"
++#line 12272 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12281,16 +12284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12287: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12287: \$? = $ac_status" >&5
++ echo "$as_me:12290: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12290: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12293: \$? = $ac_status" >&5
++ echo "$as_me:12296: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12299,12 +12302,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12302: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:12305: 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 12307 "configure"
++#line 12310 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12319,16 +12322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12322: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12325: \$? = $ac_status" >&5
++ echo "$as_me:12328: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12328: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12331: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12331: \$? = $ac_status" >&5
++ echo "$as_me:12334: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12339,19 +12342,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:12342: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:12345: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:12347: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12350: 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 12354 "configure"
++#line 12357 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12369,16 +12372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12375: \$? = $ac_status" >&5
++ echo "$as_me:12378: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12378: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12381: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12381: \$? = $ac_status" >&5
++ echo "$as_me:12384: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12390,7 +12393,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12393 "configure"
++#line 12396 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12408,16 +12411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12414: \$? = $ac_status" >&5
++ echo "$as_me:12417: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12417: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12420: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12420: \$? = $ac_status" >&5
++ echo "$as_me:12423: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12432,7 +12435,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12435: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12438: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12583,14 +12586,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:12586: checking if SIGWINCH is defined" >&5
++echo "$as_me:12589: 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 12593 "configure"
++#line 12596 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -12605,23 +12608,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12611: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12611: \$? = $ac_status" >&5
++ echo "$as_me:12614: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12614: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12617: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12617: \$? = $ac_status" >&5
++ echo "$as_me:12620: \$? = $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 12624 "configure"
++#line 12627 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12639,16 +12642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12645: \$? = $ac_status" >&5
++ echo "$as_me:12648: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12648: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12651: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12651: \$? = $ac_status" >&5
++ echo "$as_me:12654: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -12662,11 +12665,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12665: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12668: 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:12669: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12672: 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
+@@ -12677,7 +12680,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12680 "configure"
++#line 12683 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12699,16 +12702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12705: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12705: \$? = $ac_status" >&5
++ echo "$as_me:12708: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12708: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12711: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12711: \$? = $ac_status" >&5
++ echo "$as_me:12714: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -12722,7 +12725,7 @@
+ done
+
+ fi
+-echo "$as_me:12725: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12728: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12732,13 +12735,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:12735: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12738: 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 12741 "configure"
++#line 12744 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12752,16 +12755,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12758: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12758: \$? = $ac_status" >&5
++ echo "$as_me:12761: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12761: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12764: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12764: \$? = $ac_status" >&5
++ echo "$as_me:12767: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -12772,7 +12775,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12775: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12778: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -12786,7 +12789,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+
+-echo "$as_me:12789: checking if you want wide-character code" >&5
++echo "$as_me:12792: 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.
+@@ -12796,7 +12799,7 @@
+ else
+ with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12799: result: $with_widec" >&5
++echo "$as_me:12802: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12818,7 +12821,7 @@
+ (*_XOPEN_SOURCE=*)
+ ;;
+ (*)
+- { echo "$as_me:12821: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++ { echo "$as_me:12824: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ # CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12831,23 +12834,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12834: checking for $ac_header" >&5
++echo "$as_me:12837: 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 12840 "configure"
++#line 12843 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12844: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12847: \"$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:12850: \$? = $ac_status" >&5
++ echo "$as_me:12853: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12866,7 +12869,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12869: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12872: 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
+@@ -12876,14 +12879,14 @@
+ fi
+ done
+
+-echo "$as_me:12879: checking if wchar.h can be used as is" >&5
++echo "$as_me:12882: 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 12886 "configure"
++#line 12889 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12905,16 +12908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12911: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12911: \$? = $ac_status" >&5
++ echo "$as_me:12914: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12914: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12917: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12917: \$? = $ac_status" >&5
++ echo "$as_me:12920: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_h_okay=yes
+ else
+@@ -12924,16 +12927,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12927: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12930: 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:12933: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12936: 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 12936 "configure"
++#line 12939 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12949,16 +12952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12952: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12955: \$? = $ac_status" >&5
++ echo "$as_me:12958: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12958: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12961: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12961: \$? = $ac_status" >&5
++ echo "$as_me:12964: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -12967,16 +12970,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12970: result: $cf_result" >&5
++echo "$as_me:12973: 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:12976: checking checking for compatible value versus " >&5
++ echo "$as_me:12979: 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 12979 "configure"
++#line 12982 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12992,16 +12995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12998: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12998: \$? = $ac_status" >&5
++ echo "$as_me:13001: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13001: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13004: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13004: \$? = $ac_status" >&5
++ echo "$as_me:13007: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -13010,7 +13013,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:13013: result: $cf_result" >&5
++ echo "$as_me:13016: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = no ; then
+ # perhaps we can override it - try...
+@@ -13020,7 +13023,7 @@
+
+ fi
+
+-echo "$as_me:13023: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13026: 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
+@@ -13091,7 +13094,7 @@
+ cf_cv_wcwidth_graphics=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13094 "configure"
++#line 13097 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13136,15 +13139,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13139: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13142: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13142: \$? = $ac_status" >&5
++ echo "$as_me:13145: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:13144: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13147: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13147: \$? = $ac_status" >&5
++ echo "$as_me:13150: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wcwidth_graphics=yes
+ else
+@@ -13157,7 +13160,7 @@
+ fi
+
+ fi
+-echo "$as_me:13160: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13163: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+
+ test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13168,13 +13171,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13171: checking for $ac_func" >&5
++echo "$as_me:13174: 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 13177 "configure"
++#line 13180 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13205,16 +13208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13211: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13211: \$? = $ac_status" >&5
++ echo "$as_me:13214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13214: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13217: \$? = $ac_status" >&5
++ echo "$as_me:13220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13224,7 +13227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13227: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13230: 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
+@@ -13239,23 +13242,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13242: checking for $ac_header" >&5
++echo "$as_me:13245: 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 13248 "configure"
++#line 13251 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13252: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13255: \"$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:13258: \$? = $ac_status" >&5
++ echo "$as_me:13261: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13274,7 +13277,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13277: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13280: 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
+@@ -13284,7 +13287,7 @@
+ fi
+ done
+
+-echo "$as_me:13287: checking for multibyte character support" >&5
++echo "$as_me:13290: 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
+@@ -13292,7 +13295,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13295 "configure"
++#line 13298 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13309,16 +13312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13315: \$? = $ac_status" >&5
++ echo "$as_me:13318: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13318: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13321: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13321: \$? = $ac_status" >&5
++ echo "$as_me:13324: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -13330,12 +13333,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:13333: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13336: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13338 "configure"
++#line 13341 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13348,16 +13351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13354: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13354: \$? = $ac_status" >&5
++ echo "$as_me:13357: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13357: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13360: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13360: \$? = $ac_status" >&5
++ echo "$as_me:13363: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13371,7 +13374,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13374 "configure"
++#line 13377 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13384,16 +13387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13390: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13390: \$? = $ac_status" >&5
++ echo "$as_me:13393: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13393: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13396: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13396: \$? = $ac_status" >&5
++ echo "$as_me:13399: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13410,9 +13413,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:13413: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13416: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:13415: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13418: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13503,7 +13506,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}:13506: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13509: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -13511,7 +13514,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13514 "configure"
++#line 13517 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13524,21 +13527,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13530: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13530: \$? = $ac_status" >&5
++ echo "$as_me:13533: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13533: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13536: \$? = $ac_status" >&5
++ echo "$as_me:13539: \$? = $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}:13541: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13544: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13556,7 +13559,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:13559: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13562: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -13631,13 +13634,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}:13634: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13637: 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 13640 "configure"
++#line 13643 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13650,21 +13653,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13656: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13656: \$? = $ac_status" >&5
++ echo "$as_me:13659: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13659: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13662: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13662: \$? = $ac_status" >&5
++ echo "$as_me:13665: \$? = $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}:13667: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13670: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -13706,7 +13709,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13709: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13712: 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
+@@ -13744,7 +13747,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13747 "configure"
++#line 13750 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13756,16 +13759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13759: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13762: \$? = $ac_status" >&5
++ echo "$as_me:13765: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13765: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13768: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13768: \$? = $ac_status" >&5
++ echo "$as_me:13771: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13782,7 +13785,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}:13785: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13788: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -13818,7 +13821,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}:13821: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13824: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -13850,14 +13853,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13853: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13856: 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 13860 "configure"
++#line 13863 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13875,23 +13878,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13881: \$? = $ac_status" >&5
++ echo "$as_me:13884: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13884: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13887: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13887: \$? = $ac_status" >&5
++ echo "$as_me:13890: \$? = $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 13894 "configure"
++#line 13897 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13910,16 +13913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13916: \$? = $ac_status" >&5
++ echo "$as_me:13919: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13919: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13922: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13922: \$? = $ac_status" >&5
++ echo "$as_me:13925: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -13931,7 +13934,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13934: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13937: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13949,14 +13952,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13952: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13955: 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 13959 "configure"
++#line 13962 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13974,23 +13977,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13977: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13980: \$? = $ac_status" >&5
++ echo "$as_me:13983: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13983: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13986: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13986: \$? = $ac_status" >&5
++ echo "$as_me:13989: \$? = $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 13993 "configure"
++#line 13996 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14009,16 +14012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14015: \$? = $ac_status" >&5
++ echo "$as_me:14018: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14018: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14021: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14021: \$? = $ac_status" >&5
++ echo "$as_me:14024: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -14030,7 +14033,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14033: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14036: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14053,14 +14056,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14056: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14059: 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 14063 "configure"
++#line 14066 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14078,23 +14081,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14081: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14084: \$? = $ac_status" >&5
++ echo "$as_me:14087: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14087: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14090: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14090: \$? = $ac_status" >&5
++ echo "$as_me:14093: \$? = $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 14097 "configure"
++#line 14100 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14113,16 +14116,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14119: \$? = $ac_status" >&5
++ echo "$as_me:14122: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14122: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14125: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14125: \$? = $ac_status" >&5
++ echo "$as_me:14128: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -14134,7 +14137,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14137: result: $cf_cv_wint_t" >&5
++echo "$as_me:14140: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14166,7 +14169,7 @@
+ fi
+
+ ### use option --disable-lp64 to allow long chtype
+-echo "$as_me:14169: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14172: 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.
+@@ -14176,7 +14179,7 @@
+ else
+ with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14179: result: $with_lp64" >&5
++echo "$as_me:14182: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+
+ if test "x$with_lp64" = xyes ; then
+@@ -14192,7 +14195,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14195: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:14198: 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
+@@ -14204,7 +14207,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 14207 "configure"
++#line 14210 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14224,16 +14227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14230: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14230: \$? = $ac_status" >&5
++ echo "$as_me:14233: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14233: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14236: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14236: \$? = $ac_status" >&5
++ echo "$as_me:14239: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14243,16 +14246,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14249: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14249: \$? = $ac_status" >&5
++ echo "$as_me:14252: \$? = $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:14255: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14255: \$? = $ac_status" >&5
++ echo "$as_me:14258: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14266,13 +14269,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:14269: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14272: 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:14275: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:14278: 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
+@@ -14280,7 +14283,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14283 "configure"
++#line 14286 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14300,16 +14303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14303: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14306: \$? = $ac_status" >&5
++ echo "$as_me:14309: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14309: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14312: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14312: \$? = $ac_status" >&5
++ echo "$as_me:14315: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14318,7 +14321,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14321 "configure"
++#line 14324 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -14339,16 +14342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14345: \$? = $ac_status" >&5
++ echo "$as_me:14348: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14348: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14351: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14351: \$? = $ac_status" >&5
++ echo "$as_me:14354: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14359,7 +14362,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14362: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14365: 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
+
+@@ -14369,7 +14372,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:14372: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:14375: 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
+@@ -14377,7 +14380,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14380 "configure"
++#line 14383 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14397,16 +14400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14403: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14403: \$? = $ac_status" >&5
++ echo "$as_me:14406: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14406: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14409: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14409: \$? = $ac_status" >&5
++ echo "$as_me:14412: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14415,7 +14418,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14418 "configure"
++#line 14421 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -14436,16 +14439,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14442: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14442: \$? = $ac_status" >&5
++ echo "$as_me:14445: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14445: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14448: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14448: \$? = $ac_status" >&5
++ echo "$as_me:14451: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -14456,7 +14459,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14459: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14462: 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
+
+@@ -14469,7 +14472,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:14472: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:14475: 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
+@@ -14477,7 +14480,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14480 "configure"
++#line 14483 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14492,16 +14495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14498: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14498: \$? = $ac_status" >&5
++ echo "$as_me:14501: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14501: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14504: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14504: \$? = $ac_status" >&5
++ echo "$as_me:14507: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14510,7 +14513,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14513 "configure"
++#line 14516 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -14526,16 +14529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14532: \$? = $ac_status" >&5
++ echo "$as_me:14535: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14535: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14538: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14538: \$? = $ac_status" >&5
++ echo "$as_me:14541: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -14546,7 +14549,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14549: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14552: 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
+
+@@ -14560,13 +14563,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:14563: checking for fseeko" >&5
++echo "$as_me:14566: 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 14569 "configure"
++#line 14572 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14580,16 +14583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14586: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14586: \$? = $ac_status" >&5
++ echo "$as_me:14589: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14589: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14592: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14592: \$? = $ac_status" >&5
++ echo "$as_me:14595: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -14599,7 +14602,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14602: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14605: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -14638,14 +14641,14 @@
+
+ fi
+
+- echo "$as_me:14641: checking whether to use struct dirent64" >&5
++ echo "$as_me:14644: 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 14648 "configure"
++#line 14651 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14672,16 +14675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14678: \$? = $ac_status" >&5
++ echo "$as_me:14681: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14681: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14684: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14684: \$? = $ac_status" >&5
++ echo "$as_me:14687: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -14692,7 +14695,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14695: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14698: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14702,7 +14705,7 @@
+ fi
+
+ ### use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14705: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14708: 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.
+@@ -14712,14 +14715,14 @@
+ else
+ with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14715: result: $with_tparm_varargs" >&5
++echo "$as_me:14718: 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:14722: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14725: 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.
+@@ -14729,14 +14732,14 @@
+ else
+ with_tic_depends=yes
+ fi;
+-echo "$as_me:14732: result: $with_tic_depends" >&5
++echo "$as_me:14735: 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:14739: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14742: 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.
+@@ -14748,15 +14751,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ NCURSES_WATTR_MACROS=0
+- echo "$as_me:14751: result: no" >&5
++ echo "$as_me:14754: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ NCURSES_WATTR_MACROS=1
+- echo "$as_me:14755: result: yes" >&5
++ echo "$as_me:14758: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+
+-echo "$as_me:14759: checking for X11 rgb file" >&5
++echo "$as_me:14762: 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.
+@@ -14818,7 +14821,7 @@
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:14821: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:14824: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14826,7 +14829,7 @@
+
+ fi
+
+-echo "$as_me:14829: result: $RGB_PATH" >&5
++echo "$as_me:14832: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -14841,7 +14844,7 @@
+
+ ### use option --with-bool to override bool's type
+
+-echo "$as_me:14844: checking for type of bool" >&5
++echo "$as_me:14847: 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.
+@@ -14851,17 +14854,17 @@
+ else
+ NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14854: result: $NCURSES_BOOL" >&5
++echo "$as_me:14857: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+- { { echo "$as_me:14858: error: expected a type name for bool" >&5
++ { { echo "$as_me:14861: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+-echo "$as_me:14864: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14867: 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.
+@@ -14873,16 +14876,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+- { echo "$as_me:14876: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++ { echo "$as_me:14879: 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:14880: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14883: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+
+ ### use option --with-chtype to override chtype's type
+
+-echo "$as_me:14885: checking for type of chtype" >&5
++echo "$as_me:14888: 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.
+@@ -14892,11 +14895,11 @@
+ else
+ NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14895: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14898: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+- { { echo "$as_me:14899: error: expected a type name for chtype" >&5
++ { { echo "$as_me:14902: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14904,7 +14907,7 @@
+
+ ### use option --with-ospeed to override ospeed's type
+
+-echo "$as_me:14907: checking for type of ospeed" >&5
++echo "$as_me:14910: 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.
+@@ -14914,11 +14917,11 @@
+ else
+ NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14917: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14920: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+- { { echo "$as_me:14921: error: expected a type name for ospeed" >&5
++ { { echo "$as_me:14924: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14926,7 +14929,7 @@
+
+ ### use option --with-mmask-t to override mmask_t's type
+
+-echo "$as_me:14929: checking for type of mmask-t" >&5
++echo "$as_me:14932: 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.
+@@ -14936,18 +14939,18 @@
+ else
+ NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14939: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14942: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+- { { echo "$as_me:14943: error: expected a type name for mmask-t" >&5
++ { { echo "$as_me:14946: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ ### use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14950: checking for size CCHARW_MAX" >&5
++echo "$as_me:14953: 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.
+@@ -14957,16 +14960,16 @@
+ else
+ NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14960: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14963: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+
+-echo "$as_me:14963: checking for signed char" >&5
++echo "$as_me:14966: 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 14969 "configure"
++#line 14972 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14981,16 +14984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14984: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14987: \$? = $ac_status" >&5
++ echo "$as_me:14990: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14990: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14993: \$? = $ac_status" >&5
++ echo "$as_me:14996: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -15000,10 +15003,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15003: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15006: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:15006: checking size of signed char" >&5
++echo "$as_me:15009: 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
+@@ -15012,7 +15015,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15015 "configure"
++#line 15018 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15024,21 +15027,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15027: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15030: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15030: \$? = $ac_status" >&5
++ echo "$as_me:15033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15033: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15036: \$? = $ac_status" >&5
++ echo "$as_me:15039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15041 "configure"
++#line 15044 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15050,16 +15053,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15056: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15056: \$? = $ac_status" >&5
++ echo "$as_me:15059: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15059: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15062: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15062: \$? = $ac_status" >&5
++ echo "$as_me:15065: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -15075,7 +15078,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15078 "configure"
++#line 15081 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15087,16 +15090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15093: \$? = $ac_status" >&5
++ echo "$as_me:15096: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15096: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15099: \$? = $ac_status" >&5
++ echo "$as_me:15102: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -15112,7 +15115,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 15115 "configure"
++#line 15118 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15124,16 +15127,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15130: \$? = $ac_status" >&5
++ echo "$as_me:15133: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15133: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15136: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15136: \$? = $ac_status" >&5
++ echo "$as_me:15139: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -15146,12 +15149,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:15149: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:15152: 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 15154 "configure"
++#line 15157 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15167,15 +15170,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15170: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15173: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15173: \$? = $ac_status" >&5
++ echo "$as_me:15176: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:15175: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15178: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15178: \$? = $ac_status" >&5
++ echo "$as_me:15181: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15191,7 +15194,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15194: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15197: 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
+@@ -15202,7 +15205,7 @@
+ else
+ NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:15205: checking whether to use signed chars for Boolean array in term.h" >&5
++echo "$as_me:15208: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15212,13 +15215,13 @@
+ else
+ with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15215: result: $with_signed_char" >&5
++echo "$as_me:15218: 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:15221: checking for type of tparm-arg" >&5
++echo "$as_me:15224: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15228,18 +15231,18 @@
+ else
+ NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15231: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15234: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+- { { echo "$as_me:15235: error: expected a type name for tparm-arg" >&5
++ { { echo "$as_me:15238: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15242: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15245: 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.
+@@ -15249,7 +15252,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15252: result: $with_rcs_ids" >&5
++echo "$as_me:15255: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15258,7 +15261,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:15261: checking format of man-pages" >&5
++echo "$as_me:15264: 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.
+@@ -15349,10 +15352,10 @@
+ ;;
+ esac
+
+-echo "$as_me:15352: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15355: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+- { echo "$as_me:15355: WARNING: Unexpected manpage-format $cf_unknown" >&5
++ { echo "$as_me:15358: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+
+@@ -15393,7 +15396,7 @@
+ esac
+ done
+
+-echo "$as_me:15396: checking for manpage renaming" >&5
++echo "$as_me:15399: 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.
+@@ -15422,15 +15425,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ :
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+- { { echo "$as_me:15425: error: not a filename: $MANPAGE_RENAMES" >&5
++ { { echo "$as_me:15428: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+-echo "$as_me:15430: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15433: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+
+-echo "$as_me:15433: checking if manpage aliases will be installed" >&5
++echo "$as_me:15436: 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.
+@@ -15441,7 +15444,7 @@
+ MANPAGE_ALIASES=yes
+ fi;
+
+-echo "$as_me:15444: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15447: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+
+ case "x$LN_S" in
+@@ -15455,7 +15458,7 @@
+
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15458: checking if manpage symlinks should be used" >&5
++echo "$as_me:15461: 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.
+@@ -15468,17 +15471,17 @@
+
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+- { echo "$as_me:15471: WARNING: cannot make symlinks" >&5
++ { echo "$as_me:15474: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ MANPAGE_SYMLINKS=no
+ fi
+ fi
+
+-echo "$as_me:15477: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15480: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+
+-echo "$as_me:15481: checking for manpage tbl" >&5
++echo "$as_me:15484: 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.
+@@ -15489,7 +15492,7 @@
+ MANPAGE_TBL=no
+ fi;
+
+-echo "$as_me:15492: result: $MANPAGE_TBL" >&5
++echo "$as_me:15495: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+
+ if test "$prefix" = "NONE" ; then
+@@ -15807,7 +15810,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15810: checking if you want to build with function extensions" >&5
++echo "$as_me:15813: 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.
+@@ -15817,7 +15820,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15820: result: $with_ext_funcs" >&5
++echo "$as_me:15823: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15874,7 +15877,7 @@
+ GENERATED_EXT_FUNCS=
+ fi
+
+-echo "$as_me:15877: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15880: 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.
+@@ -15884,7 +15887,7 @@
+ else
+ with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15887: result: $with_sp_funcs" >&5
++echo "$as_me:15890: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ NCURSES_SP_FUNCS=1
+@@ -15903,7 +15906,7 @@
+ GENERATED_SP_FUNCS=
+ fi
+
+-echo "$as_me:15906: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15909: 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.
+@@ -15913,7 +15916,7 @@
+ else
+ with_term_driver=no
+ fi;
+-echo "$as_me:15916: result: $with_term_driver" >&5
++echo "$as_me:15919: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+
+@@ -15922,19 +15925,19 @@
+ EOF
+
+ if test "x$with_termlib" != xno ; then
+- { { echo "$as_me:15925: error: The term-driver option conflicts with the termlib option" >&5
++ { { echo "$as_me:15928: 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:15930: error: The term-driver option relies upon sp-funcs" >&5
++ { { echo "$as_me:15933: 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:15937: checking for extended use of const keyword" >&5
++echo "$as_me:15940: 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.
+@@ -15944,7 +15947,7 @@
+ else
+ with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15947: result: $with_ext_const" >&5
++echo "$as_me:15950: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15952,7 +15955,7 @@
+ fi
+
+ ### use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15955: checking if you want to use extended colors" >&5
++echo "$as_me:15958: 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.
+@@ -15962,12 +15965,12 @@
+ else
+ with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15965: result: $with_ext_colors" >&5
++echo "$as_me:15968: 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:15970: WARNING: This option applies only to wide-character library" >&5
++ { echo "$as_me:15973: 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)
+@@ -15978,7 +15981,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:15981: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:15984: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16006,7 +16009,7 @@
+ fi
+
+ ### use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16009: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16012: 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.
+@@ -16016,7 +16019,7 @@
+ else
+ with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16019: result: $with_ext_mouse" >&5
++echo "$as_me:16022: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+
+@@ -16026,7 +16029,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:16029: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:16032: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16043,7 +16046,7 @@
+ fi
+
+ ### use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16046: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16049: 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.
+@@ -16053,7 +16056,7 @@
+ else
+ with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16056: result: $with_ext_putwin" >&5
++echo "$as_me:16059: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+
+@@ -16063,7 +16066,7 @@
+
+ fi
+
+-echo "$as_me:16066: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16069: 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.
+@@ -16073,7 +16076,7 @@
+ else
+ with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16076: result: $with_no_padding" >&5
++echo "$as_me:16079: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16081,7 +16084,7 @@
+ EOF
+
+ ### use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16084: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16087: 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.
+@@ -16091,7 +16094,7 @@
+ else
+ with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16094: result: $with_sigwinch" >&5
++echo "$as_me:16097: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16106,7 +16109,7 @@
+ fi
+
+ ### use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16109: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16112: 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.
+@@ -16116,7 +16119,7 @@
+ else
+ with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16119: result: $with_tcap_names" >&5
++echo "$as_me:16122: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16130,7 +16133,7 @@
+
+ ##############################################################################
+
+-echo "$as_me:16133: checking if you want to link with the pthread library" >&5
++echo "$as_me:16136: 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.
+@@ -16140,27 +16143,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:16143: result: $with_pthread" >&5
++echo "$as_me:16146: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:16147: checking for pthread.h" >&5
++ echo "$as_me:16150: 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 16153 "configure"
++#line 16156 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:16157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16160: \"$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:16163: \$? = $ac_status" >&5
++ echo "$as_me:16166: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16179,7 +16182,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16182: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16185: 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
+
+@@ -16189,7 +16192,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:16192: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:16195: 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"
+
+@@ -16210,7 +16213,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16213 "configure"
++#line 16216 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -16227,16 +16230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16233: \$? = $ac_status" >&5
++ echo "$as_me:16236: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16236: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16239: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16239: \$? = $ac_status" >&5
++ echo "$as_me:16242: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -16246,7 +16249,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:16249: result: $with_pthread" >&5
++ echo "$as_me:16252: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -16274,7 +16277,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:16277: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:16280: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -16284,13 +16287,13 @@
+ fi
+
+ if test "x$with_pthread" != xno; then
+- echo "$as_me:16287: checking for pthread_kill" >&5
++ echo "$as_me:16290: 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 16293 "configure"
++#line 16296 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16321,16 +16324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16324: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16327: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16327: \$? = $ac_status" >&5
++ echo "$as_me:16330: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16330: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16333: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16333: \$? = $ac_status" >&5
++ echo "$as_me:16336: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_pthread_kill=yes
+ else
+@@ -16340,11 +16343,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16343: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16346: 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:16347: checking if you want to allow EINTR in wgetch with pthreads" >&5
++ echo "$as_me:16350: 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.
+@@ -16354,7 +16357,7 @@
+ else
+ use_pthreads_eintr=no
+ fi;
+- echo "$as_me:16357: result: $use_pthreads_eintr" >&5
++ echo "$as_me:16360: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ if test "x$use_pthreads_eintr" = xyes ; then
+
+@@ -16365,7 +16368,7 @@
+ fi
+ fi
+
+- echo "$as_me:16368: checking if you want to use weak-symbols for pthreads" >&5
++ echo "$as_me:16371: 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.
+@@ -16375,18 +16378,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+- echo "$as_me:16378: result: $use_weak_symbols" >&5
++ echo "$as_me:16381: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "x$use_weak_symbols" = xyes ; then
+
+-echo "$as_me:16382: checking if $CC supports weak symbols" >&5
++echo "$as_me:16385: 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 16389 "configure"
++#line 16392 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16412,16 +16415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16418: \$? = $ac_status" >&5
++ echo "$as_me:16421: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16421: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16424: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16424: \$? = $ac_status" >&5
++ echo "$as_me:16427: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -16432,7 +16435,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16435: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16438: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -16482,7 +16485,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:16485: checking if you want reentrant code" >&5
++echo "$as_me:16488: 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.
+@@ -16492,7 +16495,7 @@
+ else
+ with_reentrant=no
+ fi;
+-echo "$as_me:16495: result: $with_reentrant" >&5
++echo "$as_me:16498: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ cf_cv_enable_reentrant=1
+@@ -16581,7 +16584,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:16584: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:16587: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16593,7 +16596,7 @@
+ NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+
+-echo "$as_me:16596: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16599: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16615,16 +16618,16 @@
+ test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16618: result: $enable_opaque_curses" >&5
++echo "$as_me:16621: 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:16623: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16626: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:16627: checking whether form library structures should be opaque" >&5
++echo "$as_me:16630: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16641,10 +16644,10 @@
+ enable_opaque_form=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16644: result: $enable_opaque_form" >&5
++echo "$as_me:16647: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+
+-echo "$as_me:16647: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16650: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16661,10 +16664,10 @@
+ enable_opaque_menu=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16664: result: $enable_opaque_menu" >&5
++echo "$as_me:16667: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+
+-echo "$as_me:16667: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16670: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16681,7 +16684,7 @@
+ enable_opaque_panel=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16684: result: $enable_opaque_panel" >&5
++echo "$as_me:16687: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+
+ NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16691,7 +16694,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:16694: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:16697: 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.
+@@ -16701,7 +16704,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:16704: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:16707: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -16714,7 +16717,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:16717: checking if you want all development code" >&5
++echo "$as_me:16720: 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.
+@@ -16724,11 +16727,11 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:16727: result: $with_develop" >&5
++echo "$as_me:16730: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ### use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16731: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16734: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16738,7 +16741,7 @@
+ else
+ enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16741: result: $enable_check_size" >&5
++echo "$as_me:16744: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16746,7 +16749,7 @@
+ EOF
+
+ ### use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16749: checking if you want hard-tabs code" >&5
++echo "$as_me:16752: 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.
+@@ -16756,7 +16759,7 @@
+ else
+ enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16759: result: $enable_hard_tabs" >&5
++echo "$as_me:16762: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16764,7 +16767,7 @@
+ EOF
+
+ ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16767: checking if you want limited support for xmc" >&5
++echo "$as_me:16770: 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.
+@@ -16774,7 +16777,7 @@
+ else
+ enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16777: result: $enable_xmc_glitch" >&5
++echo "$as_me:16780: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16784,7 +16787,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+
+-echo "$as_me:16787: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16790: 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.
+@@ -16794,7 +16797,7 @@
+ else
+ with_assumed_color=yes
+ fi;
+-echo "$as_me:16797: result: $with_assumed_color" >&5
++echo "$as_me:16800: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16802,7 +16805,7 @@
+ EOF
+
+ ### use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16805: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16808: 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.
+@@ -16812,7 +16815,7 @@
+ else
+ with_hashmap=yes
+ fi;
+-echo "$as_me:16815: result: $with_hashmap" >&5
++echo "$as_me:16818: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16820,7 +16823,7 @@
+ EOF
+
+ ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16823: checking if you want colorfgbg code" >&5
++echo "$as_me:16826: 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.
+@@ -16830,7 +16833,7 @@
+ else
+ with_colorfgbg=no
+ fi;
+-echo "$as_me:16833: result: $with_colorfgbg" >&5
++echo "$as_me:16836: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16838,7 +16841,7 @@
+ EOF
+
+ ### use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16841: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16844: 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.
+@@ -16848,14 +16851,14 @@
+ else
+ cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16851: result: $cf_with_fvisibility" >&5
++echo "$as_me:16854: 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:16858: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16861: 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
+@@ -16864,7 +16867,7 @@
+ cf_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16867 "configure"
++#line 16870 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16880,16 +16883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16886: \$? = $ac_status" >&5
++ echo "$as_me:16889: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16889: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16892: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16892: \$? = $ac_status" >&5
++ echo "$as_me:16895: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden=yes
+ else
+@@ -16901,7 +16904,7 @@
+ CFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:16904: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16907: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+
+ if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17016,7 +17019,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:17019: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17022: 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
+@@ -17025,7 +17028,7 @@
+ cf_save_cflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17028 "configure"
++#line 17031 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17041,16 +17044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17047: \$? = $ac_status" >&5
++ echo "$as_me:17050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17050: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17053: \$? = $ac_status" >&5
++ echo "$as_me:17056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17062,7 +17065,7 @@
+ CXXFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:17065: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17068: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+
+ if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17185,7 +17188,7 @@
+ fi
+
+ ### use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17188: checking if you want interop bindings" >&5
++echo "$as_me:17191: 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.
+@@ -17195,13 +17198,13 @@
+ else
+ with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17198: result: $with_exp_interop" >&5
++echo "$as_me:17201: 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:17204: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17207: 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.
+@@ -17211,13 +17214,13 @@
+ else
+ with_safe_sprintf=no
+ fi;
+-echo "$as_me:17214: result: $with_safe_sprintf" >&5
++echo "$as_me:17217: 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:17220: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17223: 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.
+@@ -17227,7 +17230,7 @@
+ else
+ with_scroll_hints=yes
+ fi;
+-echo "$as_me:17230: result: $with_scroll_hints" >&5
++echo "$as_me:17233: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17236,7 +17239,7 @@
+
+ fi
+
+-echo "$as_me:17239: checking if you want wgetch-events code" >&5
++echo "$as_me:17242: 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.
+@@ -17246,7 +17249,7 @@
+ else
+ with_wgetch_events=no
+ fi;
+-echo "$as_me:17249: result: $with_wgetch_events" >&5
++echo "$as_me:17252: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+
+@@ -17261,7 +17264,7 @@
+
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+- echo "$as_me:17264: checking if you want experimental-Windows driver" >&5
++ echo "$as_me:17267: 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.
+@@ -17271,7 +17274,7 @@
+ else
+ with_exp_win32=no
+ fi;
+- echo "$as_me:17274: result: $with_exp_win32" >&5
++ echo "$as_me:17277: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ if test "x$with_exp_win32" = xyes
+ then
+@@ -17297,7 +17300,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:17300: checking if you want to see long compiling messages" >&5
++echo "$as_me:17303: 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.
+@@ -17331,7 +17334,7 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:17334: result: $enableval" >&5
++echo "$as_me:17337: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ if test "x$enable_echo" = xyes; then
+@@ -17344,7 +17347,7 @@
+
+ # --disable-stripping is used for debugging
+
+-echo "$as_me:17347: checking if you want to install stripped executables" >&5
++echo "$as_me:17350: 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.
+@@ -17361,7 +17364,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:17364: result: $enable_stripping" >&5
++echo "$as_me:17367: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -17372,7 +17375,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:17375: checking if install accepts -p option" >&5
++echo "$as_me:17378: 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
+@@ -17403,10 +17406,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:17406: result: $cf_cv_install_p" >&5
++echo "$as_me:17409: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:17409: checking if install needs to be told about ownership" >&5
++echo "$as_me:17412: 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)
+@@ -17417,7 +17420,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17420: result: $with_install_o" >&5
++echo "$as_me:17423: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17428,7 +17431,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:17431: checking if you want to specify strip-program" >&5
++ echo "$as_me:17434: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17438,11 +17441,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:17441: result: $with_strip_program" >&5
++ echo "$as_me:17444: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:17445: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:17448: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ check_install_strip=no
+@@ -17463,11 +17466,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:17466: result: $check_install_strip" >&5
++ echo "$as_me:17469: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:17470: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:17473: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ with_strip_program=no
+ ;;
+@@ -17482,7 +17485,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:17485: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17488: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -17508,7 +17511,7 @@
+
+ ### use option --enable-warnings to turn on all gcc warnings
+
+-echo "$as_me:17511: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17514: 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.
+@@ -17525,17 +17528,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:17528: result: $enable_stdnoreturn" >&5
++echo "$as_me:17531: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17532: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17535: 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 17538 "configure"
++#line 17541 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17551,16 +17554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17557: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17557: \$? = $ac_status" >&5
++ echo "$as_me:17560: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17560: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17563: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17563: \$? = $ac_status" >&5
++ echo "$as_me:17566: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -17571,7 +17574,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17574: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17577: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -17627,16 +17630,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17630: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17633: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17635: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17638: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17639: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17642: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17675,16 +17678,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17678: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17681: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17683: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17686: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17687: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17690: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17723,23 +17726,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17726: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17729: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17731: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17734: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17738: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:17742: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17745: 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.
+@@ -17756,7 +17759,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:17759: result: $enable_warnings" >&5
++echo "$as_me:17762: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17780,7 +17783,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17783 "configure"
++#line 17786 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17795,26 +17798,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17798: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17801: \$? = $ac_status" >&5
++ echo "$as_me:17804: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17804: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17807: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17807: \$? = $ac_status" >&5
++ echo "$as_me:17810: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:17810: checking for X11/Xt const-feature" >&5
++echo "$as_me:17813: 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 17817 "configure"
++#line 17820 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -17832,16 +17835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17838: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17838: \$? = $ac_status" >&5
++ echo "$as_me:17841: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17841: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17844: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17844: \$? = $ac_status" >&5
++ echo "$as_me:17847: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -17856,7 +17859,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17859: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17862: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17885,7 +17888,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17888 "${as_me:-configure}"
++#line 17891 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -17901,7 +17904,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:17904: checking for $CC warning options..." >&5
++ { echo "$as_me:17907: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17917,12 +17920,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:17920: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17923: \$? = $ac_status" >&5
++ echo "$as_me:17926: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17925: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -17930,7 +17933,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:17933: checking for $CC warning options..." >&5
++ { echo "$as_me:17936: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -17953,12 +17956,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:17956: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17959: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17959: \$? = $ac_status" >&5
++ echo "$as_me:17962: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17961: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17964: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -17966,7 +17969,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17969: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17972: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17976,7 +17979,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17979: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17982: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -18009,10 +18012,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:18012: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:18015: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 18015 "${as_me:-configure}"
++#line 18018 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18062,12 +18065,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:18065: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18068: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18068: \$? = $ac_status" >&5
++ echo "$as_me:18071: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18070: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:18073: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -18139,12 +18142,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:18142: checking if this is really Intel C++ compiler" >&5
++ echo "$as_me:18145: 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 18147 "configure"
++#line 18150 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18161,16 +18164,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18164: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18167: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18167: \$? = $ac_status" >&5
++ echo "$as_me:18170: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18170: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18173: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18173: \$? = $ac_status" >&5
++ echo "$as_me:18176: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18181,7 +18184,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:18184: result: $INTEL_CPLUSPLUS" >&5
++ echo "$as_me:18187: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ ;;
+ esac
+@@ -18190,11 +18193,11 @@
+ CLANG_CPLUSPLUS=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:18193: checking if this is really Clang C++ compiler" >&5
++ echo "$as_me:18196: 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 18197 "configure"
++#line 18200 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18211,16 +18214,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18217: \$? = $ac_status" >&5
++ echo "$as_me:18220: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18220: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18223: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18223: \$? = $ac_status" >&5
++ echo "$as_me:18226: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_CPLUSPLUS=yes
+
+@@ -18230,7 +18233,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:18233: result: $CLANG_CPLUSPLUS" >&5
++ echo "$as_me:18236: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+
+@@ -18239,30 +18242,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:18242: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:18245: 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:18249: checking version of $CC" >&5
++ echo "$as_me:18252: 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:18253: result: $CLANG_VERSION" >&5
++ echo "$as_me:18256: 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:18260: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:18263: 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 18265 "configure"
++#line 18268 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -18276,16 +18279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18282: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18282: \$? = $ac_status" >&5
++ echo "$as_me:18285: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18285: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18288: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18288: \$? = $ac_status" >&5
++ echo "$as_me:18291: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -18296,13 +18299,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18299: result: $cf_clang_optok" >&5
++ echo "$as_me:18302: 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}:18305: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18308: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18319,7 +18322,7 @@
+ ac_main_return="return"
+
+ cat > conftest.$ac_ext <<EOF
+-#line 18322 "configure"
++#line 18325 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -18337,7 +18340,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+
+- { echo "$as_me:18340: checking for $CC warning options..." >&5
++ { echo "$as_me:18343: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-Wall"
+@@ -18354,12 +18357,12 @@
+ wd981
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+- if { (eval echo "$as_me:18357: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18360: \$? = $ac_status" >&5
++ echo "$as_me:18363: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18362: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18365: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ fi
+@@ -18368,7 +18371,7 @@
+
+ elif test "$GXX" = yes
+ then
+- { echo "$as_me:18371: checking for $CXX warning options..." >&5
++ { echo "$as_me:18374: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-W -Wall"
+@@ -18398,16 +18401,16 @@
+ Wundef $cf_gxx_extra_warnings Wno-unused
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+- if { (eval echo "$as_me:18401: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18404: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18404: \$? = $ac_status" >&5
++ echo "$as_me:18407: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18406: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18409: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ else
+- test -n "$verbose" && echo "$as_me:18410: result: ... no -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18413: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ fi
+ done
+@@ -18425,7 +18428,7 @@
+ fi
+ fi
+
+-echo "$as_me:18428: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18431: 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.
+@@ -18435,7 +18438,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:18438: result: $enable_string_hacks" >&5
++echo "$as_me:18441: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18444,15 +18447,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:18447: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:18450: 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:18449: checking for strlcat" >&5
++ echo "$as_me:18452: 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 18455 "configure"
++#line 18458 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18483,16 +18486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18489: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18489: \$? = $ac_status" >&5
++ echo "$as_me:18492: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18492: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18495: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18495: \$? = $ac_status" >&5
++ echo "$as_me:18498: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -18502,7 +18505,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18505: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18508: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -18512,7 +18515,7 @@
+
+ else
+
+- echo "$as_me:18515: checking for strlcat in -lbsd" >&5
++ echo "$as_me:18518: 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
+@@ -18520,7 +18523,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18523 "configure"
++#line 18526 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18539,16 +18542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18542: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18545: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18545: \$? = $ac_status" >&5
++ echo "$as_me:18548: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18548: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18551: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18551: \$? = $ac_status" >&5
++ echo "$as_me:18554: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18559,7 +18562,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18562: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18565: 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
+
+@@ -18582,23 +18585,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18585: checking for $ac_header" >&5
++echo "$as_me:18588: 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 18591 "configure"
++#line 18594 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18598: \"$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:18601: \$? = $ac_status" >&5
++ echo "$as_me:18604: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18617,7 +18620,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18623: 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
+@@ -18638,13 +18641,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18641: checking for $ac_func" >&5
++echo "$as_me:18644: 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 18647 "configure"
++#line 18650 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18675,16 +18678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18678: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18681: \$? = $ac_status" >&5
++ echo "$as_me:18684: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18684: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18687: \$? = $ac_status" >&5
++ echo "$as_me:18690: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -18694,7 +18697,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18697: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18700: 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
+@@ -18707,7 +18710,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:18710: checking if you want to enable runtime assertions" >&5
++echo "$as_me:18713: 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.
+@@ -18717,7 +18720,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:18720: result: $with_assertions" >&5
++echo "$as_me:18723: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18733,7 +18736,7 @@
+
+ ### use option --disable-leaks to suppress "permanent" leaks, for testing
+
+-echo "$as_me:18736: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18739: 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.
+@@ -18755,7 +18758,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:18758: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18761: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -18869,23 +18872,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:18872: checking for dmalloc.h" >&5
++ echo "$as_me:18875: 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 18878 "configure"
++#line 18881 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18882: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18885: \"$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:18888: \$? = $ac_status" >&5
++ echo "$as_me:18891: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18904,11 +18907,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18907: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18910: 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:18911: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18914: 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
+@@ -18916,7 +18919,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18919 "configure"
++#line 18922 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18935,16 +18938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18938: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18941: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18941: \$? = $ac_status" >&5
++ echo "$as_me:18944: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18944: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18947: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18947: \$? = $ac_status" >&5
++ echo "$as_me:18950: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18955,7 +18958,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18958: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18961: 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
+@@ -18970,7 +18973,7 @@
+
+ fi
+
+-echo "$as_me:18973: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18976: 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.
+@@ -18992,7 +18995,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:18995: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18998: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19106,23 +19109,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:19109: checking for dbmalloc.h" >&5
++ echo "$as_me:19112: 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 19115 "configure"
++#line 19118 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:19119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19122: \"$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:19125: \$? = $ac_status" >&5
++ echo "$as_me:19128: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19141,11 +19144,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19144: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19147: 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:19148: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19151: 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
+@@ -19153,7 +19156,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19156 "configure"
++#line 19159 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19172,16 +19175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19178: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19178: \$? = $ac_status" >&5
++ echo "$as_me:19181: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19181: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19184: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19184: \$? = $ac_status" >&5
++ echo "$as_me:19187: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19192,7 +19195,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19195: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19198: 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
+@@ -19207,7 +19210,7 @@
+
+ fi
+
+-echo "$as_me:19210: checking if you want to use valgrind for testing" >&5
++echo "$as_me:19213: 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.
+@@ -19229,7 +19232,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:19232: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19235: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19342,7 +19345,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19345: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19348: 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.
+@@ -19353,7 +19356,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:19356: result: $with_no_leaks" >&5
++echo "$as_me:19359: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -19405,7 +19408,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19408: checking whether to add trace feature to all models" >&5
++echo "$as_me:19411: 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.
+@@ -19415,7 +19418,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19418: result: $cf_with_trace" >&5
++echo "$as_me:19421: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19435,7 +19438,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:19438: checking if we want to use GNAT projects" >&5
++echo "$as_me:19441: 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.
+@@ -19452,7 +19455,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:19455: result: $enable_gnat_projects" >&5
++echo "$as_me:19458: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -19465,14 +19468,14 @@
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ fi
+
+-echo "$as_me:19468: checking if ssp library is needed" >&5
++echo "$as_me:19471: 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 19475 "configure"
++#line 19478 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19489,16 +19492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19495: \$? = $ac_status" >&5
++ echo "$as_me:19498: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19498: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19501: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19501: \$? = $ac_status" >&5
++ echo "$as_me:19504: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -19508,7 +19511,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19511 "configure"
++#line 19514 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19525,16 +19528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19531: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19531: \$? = $ac_status" >&5
++ echo "$as_me:19534: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19534: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19537: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19537: \$? = $ac_status" >&5
++ echo "$as_me:19540: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -19548,7 +19551,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19551: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19554: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19577,14 +19580,14 @@
+ ;;
+ esac
+
+-echo "$as_me:19580: checking if -lm needed for math functions" >&5
++echo "$as_me:19583: 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 19587 "configure"
++#line 19590 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19600,16 +19603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19606: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19606: \$? = $ac_status" >&5
++ echo "$as_me:19609: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19609: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19612: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19612: \$? = $ac_status" >&5
++ echo "$as_me:19615: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -19619,7 +19622,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19622: result: $cf_cv_need_libm" >&5
++echo "$as_me:19625: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -19627,14 +19630,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:19630: checking if -lm is available for math functions" >&5
++ echo "$as_me:19633: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19637 "configure"
++#line 19640 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19650,16 +19653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19656: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19656: \$? = $ac_status" >&5
++ echo "$as_me:19659: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19659: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19662: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19662: \$? = $ac_status" >&5
++ echo "$as_me:19665: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -19669,7 +19672,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19672: result: $cf_cv_have_libm" >&5
++echo "$as_me:19675: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -19691,13 +19694,13 @@
+ fi
+
+ ### Checks for header files.
+-echo "$as_me:19694: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19697: 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 19700 "configure"
++#line 19703 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19713,16 +19716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19719: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19719: \$? = $ac_status" >&5
++ echo "$as_me:19722: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19722: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19725: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19725: \$? = $ac_status" >&5
++ echo "$as_me:19728: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -19732,7 +19735,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19735: result: $ac_cv_header_time" >&5
++echo "$as_me:19738: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -19747,7 +19750,7 @@
+ case "$host_os" in
+ (mingw*)
+ # -lsystre -ltre -lintl -liconv
+- echo "$as_me:19750: checking for regcomp in -lsystre" >&5
++ echo "$as_me:19753: 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
+@@ -19755,7 +19758,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19758 "configure"
++#line 19761 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19774,16 +19777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19780: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19780: \$? = $ac_status" >&5
++ echo "$as_me:19783: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19783: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19786: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19786: \$? = $ac_status" >&5
++ echo "$as_me:19789: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19794,11 +19797,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19797: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19800: 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:19801: checking for libiconv_open in -liconv" >&5
++ echo "$as_me:19804: 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
+@@ -19806,7 +19809,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19809 "configure"
++#line 19812 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19825,16 +19828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19831: \$? = $ac_status" >&5
++ echo "$as_me:19834: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19834: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19837: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19837: \$? = $ac_status" >&5
++ echo "$as_me:19840: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19845,7 +19848,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19848: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19851: 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
+
+@@ -19867,7 +19870,7 @@
+
+ fi
+
+- echo "$as_me:19870: checking for libintl_gettext in -lintl" >&5
++ echo "$as_me:19873: 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
+@@ -19875,7 +19878,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19878 "configure"
++#line 19881 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19894,16 +19897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19900: \$? = $ac_status" >&5
++ echo "$as_me:19903: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19903: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19906: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19906: \$? = $ac_status" >&5
++ echo "$as_me:19909: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19914,7 +19917,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19917: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19920: 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
+
+@@ -19936,7 +19939,7 @@
+
+ fi
+
+- echo "$as_me:19939: checking for tre_regcomp in -ltre" >&5
++ echo "$as_me:19942: 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
+@@ -19944,7 +19947,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19947 "configure"
++#line 19950 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19963,16 +19966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19969: \$? = $ac_status" >&5
++ echo "$as_me:19972: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19972: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19975: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19975: \$? = $ac_status" >&5
++ echo "$as_me:19978: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19983,7 +19986,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19986: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19989: 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
+
+@@ -20025,7 +20028,7 @@
+
+ else
+
+- echo "$as_me:20028: checking for regcomp in -lgnurx" >&5
++ echo "$as_me:20031: 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
+@@ -20033,7 +20036,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20036 "configure"
++#line 20039 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20052,16 +20055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20058: \$? = $ac_status" >&5
++ echo "$as_me:20061: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20061: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20064: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20064: \$? = $ac_status" >&5
++ echo "$as_me:20067: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20072,7 +20075,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20075: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20078: 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
+
+@@ -20100,13 +20103,13 @@
+ ;;
+ (*)
+ cf_regex_libs="regex re"
+- echo "$as_me:20103: checking for regcomp" >&5
++ echo "$as_me:20106: 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 20109 "configure"
++#line 20112 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20137,16 +20140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20143: \$? = $ac_status" >&5
++ echo "$as_me:20146: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20149: \$? = $ac_status" >&5
++ echo "$as_me:20152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_regcomp=yes
+ else
+@@ -20156,7 +20159,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20159: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20162: 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
+@@ -20165,7 +20168,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:20168: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20171: 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
+@@ -20173,7 +20176,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20176 "configure"
++#line 20179 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20192,16 +20195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20198: \$? = $ac_status" >&5
++ echo "$as_me:20201: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20201: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20204: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20204: \$? = $ac_status" >&5
++ echo "$as_me:20207: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -20212,7 +20215,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20215: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20218: 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
+
+@@ -20244,13 +20247,13 @@
+ esac
+
+ if test "$cf_regex_func" = no ; then
+- echo "$as_me:20247: checking for compile" >&5
++ echo "$as_me:20250: 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 20253 "configure"
++#line 20256 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20281,16 +20284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20287: \$? = $ac_status" >&5
++ echo "$as_me:20290: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20290: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20293: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20293: \$? = $ac_status" >&5
++ echo "$as_me:20296: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_compile=yes
+ else
+@@ -20300,13 +20303,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20303: result: $ac_cv_func_compile" >&5
++echo "$as_me:20306: 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:20309: checking for compile in -lgen" >&5
++ echo "$as_me:20312: 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
+@@ -20314,7 +20317,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20317 "configure"
++#line 20320 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20333,16 +20336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20339: \$? = $ac_status" >&5
++ echo "$as_me:20342: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20342: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20345: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20345: \$? = $ac_status" >&5
++ echo "$as_me:20348: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gen_compile=yes
+ else
+@@ -20353,7 +20356,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20356: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20359: 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
+
+@@ -20381,11 +20384,11 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- { echo "$as_me:20384: WARNING: cannot find regular expression library" >&5
++ { echo "$as_me:20387: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+
+-echo "$as_me:20388: checking for regular-expression headers" >&5
++echo "$as_me:20391: 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
+@@ -20397,7 +20400,7 @@
+ for cf_regex_hdr in regexp.h regexpr.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20400 "configure"
++#line 20403 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20414,16 +20417,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20420: \$? = $ac_status" >&5
++ echo "$as_me:20423: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20423: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20426: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20426: \$? = $ac_status" >&5
++ echo "$as_me:20429: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20440,7 +20443,7 @@
+ for cf_regex_hdr in regex.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20443 "configure"
++#line 20446 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -20460,16 +20463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20466: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20466: \$? = $ac_status" >&5
++ echo "$as_me:20469: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20472: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20472: \$? = $ac_status" >&5
++ echo "$as_me:20475: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20485,11 +20488,11 @@
+ esac
+
+ fi
+-echo "$as_me:20488: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20491: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+
+ case "$cf_cv_regex_hdrs" in
+- (no) { echo "$as_me:20492: WARNING: no regular expression header found" >&5
++ (no) { echo "$as_me:20495: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ (regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20527,23 +20530,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20530: checking for $ac_header" >&5
++echo "$as_me:20533: 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 20536 "configure"
++#line 20539 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20540: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20543: \"$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:20546: \$? = $ac_status" >&5
++ echo "$as_me:20549: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20562,7 +20565,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20565: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20568: 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
+@@ -20575,23 +20578,23 @@
+ for ac_header in getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20578: checking for $ac_header" >&5
++echo "$as_me:20581: 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 20584 "configure"
++#line 20587 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20588: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20591: \"$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:20594: \$? = $ac_status" >&5
++ echo "$as_me:20597: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20610,7 +20613,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20613: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20616: 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
+@@ -20620,7 +20623,7 @@
+ fi
+ done
+
+-echo "$as_me:20623: checking for header declaring getopt variables" >&5
++echo "$as_me:20626: 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
+@@ -20630,7 +20633,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20633 "configure"
++#line 20636 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20643,16 +20646,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20649: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20649: \$? = $ac_status" >&5
++ echo "$as_me:20652: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20655: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20655: \$? = $ac_status" >&5
++ echo "$as_me:20658: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -20664,7 +20667,7 @@
+ done
+
+ fi
+-echo "$as_me:20667: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20670: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -20681,14 +20684,14 @@
+
+ fi
+
+-echo "$as_me:20684: checking if external environ is declared" >&5
++echo "$as_me:20687: 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 20691 "configure"
++#line 20694 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20701,16 +20704,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20707: \$? = $ac_status" >&5
++ echo "$as_me:20710: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20710: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20713: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20713: \$? = $ac_status" >&5
++ echo "$as_me:20716: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_environ=yes
+ else
+@@ -20721,7 +20724,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20724: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20727: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20736,14 +20739,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:20739: checking if external environ exists" >&5
++echo "$as_me:20742: 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 20746 "configure"
++#line 20749 "configure"
+ #include "confdefs.h"
+
+ #undef environ
+@@ -20758,16 +20761,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20764: \$? = $ac_status" >&5
++ echo "$as_me:20767: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20767: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20770: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20770: \$? = $ac_status" >&5
++ echo "$as_me:20773: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_environ=yes
+ else
+@@ -20778,7 +20781,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20781: result: $cf_cv_have_environ" >&5
++echo "$as_me:20784: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20791,13 +20794,13 @@
+
+ fi
+
+-echo "$as_me:20794: checking for getenv" >&5
++echo "$as_me:20797: 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 20800 "configure"
++#line 20803 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20828,16 +20831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20834: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20834: \$? = $ac_status" >&5
++ echo "$as_me:20837: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20837: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20840: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20840: \$? = $ac_status" >&5
++ echo "$as_me:20843: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_getenv=yes
+ else
+@@ -20847,19 +20850,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20850: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20853: 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:20856: checking for $ac_func" >&5
++echo "$as_me:20859: 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 20862 "configure"
++#line 20865 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20890,16 +20893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20896: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20896: \$? = $ac_status" >&5
++ echo "$as_me:20899: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20899: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20902: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20902: \$? = $ac_status" >&5
++ echo "$as_me:20905: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -20909,7 +20912,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20912: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20915: 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
+@@ -20919,7 +20922,7 @@
+ fi
+ done
+
+-echo "$as_me:20922: checking if getenv returns consistent values" >&5
++echo "$as_me:20925: 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
+@@ -20929,7 +20932,7 @@
+ cf_cv_consistent_getenv=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20932 "configure"
++#line 20935 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21034,15 +21037,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21040: \$? = $ac_status" >&5
++ echo "$as_me:21043: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21042: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21045: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21045: \$? = $ac_status" >&5
++ echo "$as_me:21048: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_consistent_getenv=yes
+ else
+@@ -21055,7 +21058,7 @@
+ fi
+
+ fi
+-echo "$as_me:21058: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21061: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21070,18 +21073,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ test "x$cf_with_trace" = xyes
+ then
+- { echo "$as_me:21073: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++ { echo "$as_me:21076: 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:21077: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21080: 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 21084 "configure"
++#line 21087 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21101,16 +21104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21107: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21107: \$? = $ac_status" >&5
++ echo "$as_me:21110: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21110: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21113: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21113: \$? = $ac_status" >&5
++ echo "$as_me:21116: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -21122,7 +21125,7 @@
+
+ fi
+
+-echo "$as_me:21125: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21128: 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
+@@ -21137,13 +21140,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:21140: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21143: 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 21146 "configure"
++#line 21149 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21205,16 +21208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21211: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21211: \$? = $ac_status" >&5
++ echo "$as_me:21214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21214: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21217: \$? = $ac_status" >&5
++ echo "$as_me:21220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -21224,7 +21227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21227: result: $ac_cv_c_const" >&5
++echo "$as_me:21230: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -21234,7 +21237,7 @@
+
+ fi
+
+-echo "$as_me:21237: checking for inline" >&5
++echo "$as_me:21240: 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
+@@ -21242,7 +21245,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21245 "configure"
++#line 21248 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21251,16 +21254,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21257: \$? = $ac_status" >&5
++ echo "$as_me:21260: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21260: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21263: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21263: \$? = $ac_status" >&5
++ echo "$as_me:21266: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21271,7 +21274,7 @@
+ done
+
+ fi
+-echo "$as_me:21274: result: $ac_cv_c_inline" >&5
++echo "$as_me:21277: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -21297,7 +21300,7 @@
+ :
+ elif test "$GCC" = yes
+ then
+- echo "$as_me:21300: checking if $CC supports options to tune inlining" >&5
++ echo "$as_me:21303: 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
+@@ -21306,7 +21309,7 @@
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21309 "configure"
++#line 21312 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21318,16 +21321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21324: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21324: \$? = $ac_status" >&5
++ echo "$as_me:21327: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21330: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21330: \$? = $ac_status" >&5
++ echo "$as_me:21333: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gcc_inline=yes
+ else
+@@ -21339,7 +21342,7 @@
+ CFLAGS=$cf_save_CFLAGS
+
+ fi
+-echo "$as_me:21342: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21345: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+@@ -21445,7 +21448,7 @@
+ fi
+ fi
+
+-echo "$as_me:21448: checking for signal global datatype" >&5
++echo "$as_me:21451: 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
+@@ -21457,7 +21460,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21460 "configure"
++#line 21463 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21481,16 +21484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21487: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21487: \$? = $ac_status" >&5
++ echo "$as_me:21490: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21490: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21493: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21493: \$? = $ac_status" >&5
++ echo "$as_me:21496: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21504,7 +21507,7 @@
+
+ fi
+
+-echo "$as_me:21507: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21510: 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
+@@ -21513,7 +21516,7 @@
+
+ if test "$NCURSES_CHTYPE" = auto ; then
+
+-echo "$as_me:21516: checking for type of chtype" >&5
++echo "$as_me:21519: 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
+@@ -21523,7 +21526,7 @@
+ cf_cv_typeof_chtype=long
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21526 "configure"
++#line 21529 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21558,15 +21561,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21564: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21564: \$? = $ac_status" >&5
++ echo "$as_me:21567: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21566: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21569: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21569: \$? = $ac_status" >&5
++ echo "$as_me:21572: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21581,7 +21584,7 @@
+
+ fi
+
+-echo "$as_me:21584: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21587: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -21593,14 +21596,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+
+-echo "$as_me:21596: checking if unsigned literals are legal" >&5
++echo "$as_me:21599: 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 21603 "configure"
++#line 21606 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21612,16 +21615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21618: \$? = $ac_status" >&5
++ echo "$as_me:21621: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21621: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21624: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21624: \$? = $ac_status" >&5
++ echo "$as_me:21627: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unsigned_literals=yes
+ else
+@@ -21633,7 +21636,7 @@
+
+ fi
+
+-echo "$as_me:21636: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21639: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+
+ cf_cv_1UL="1"
+@@ -21649,14 +21652,14 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:21652: checking if external errno is declared" >&5
++echo "$as_me:21655: 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 21659 "configure"
++#line 21662 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21670,16 +21673,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21676: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21676: \$? = $ac_status" >&5
++ echo "$as_me:21679: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21679: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21682: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21682: \$? = $ac_status" >&5
++ echo "$as_me:21685: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_errno=yes
+ else
+@@ -21690,7 +21693,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21693: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21696: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21705,14 +21708,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:21708: checking if external errno exists" >&5
++echo "$as_me:21711: 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 21715 "configure"
++#line 21718 "configure"
+ #include "confdefs.h"
+
+ #undef errno
+@@ -21727,16 +21730,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21733: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21733: \$? = $ac_status" >&5
++ echo "$as_me:21736: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21736: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21739: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21739: \$? = $ac_status" >&5
++ echo "$as_me:21742: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_errno=yes
+ else
+@@ -21747,7 +21750,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21750: result: $cf_cv_have_errno" >&5
++echo "$as_me:21753: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21760,7 +21763,7 @@
+
+ fi
+
+-echo "$as_me:21763: checking if data-only library module links" >&5
++echo "$as_me:21766: 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
+@@ -21768,20 +21771,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 21771 "configure"
++#line 21774 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21777: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21777: \$? = $ac_status" >&5
++ echo "$as_me:21780: \$? = $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 21784 "configure"
++#line 21787 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -21798,10 +21801,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:21801: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21804: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21804: \$? = $ac_status" >&5
++ echo "$as_me:21807: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21814,7 +21817,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21817 "configure"
++#line 21820 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -21825,15 +21828,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21831: \$? = $ac_status" >&5
++ echo "$as_me:21834: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21833: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21836: \$? = $ac_status" >&5
++ echo "$as_me:21839: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -21848,7 +21851,7 @@
+
+ fi
+
+-echo "$as_me:21851: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21854: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21863,13 +21866,13 @@
+ ### Checks for library functions.
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:21866: checking for clock_gettime" >&5
++echo "$as_me:21869: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21872 "configure"
++#line 21875 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21900,16 +21903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21906: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21906: \$? = $ac_status" >&5
++ echo "$as_me:21909: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21909: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21912: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21912: \$? = $ac_status" >&5
++ echo "$as_me:21915: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -21919,12 +21922,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21922: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21925: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+ cf_cv_test_clock_gettime=yes
+ else
+- echo "$as_me:21927: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:21930: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21932,7 +21935,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21935 "configure"
++#line 21938 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21951,16 +21954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21957: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21957: \$? = $ac_status" >&5
++ echo "$as_me:21960: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21963: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21963: \$? = $ac_status" >&5
++ echo "$as_me:21966: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21971,7 +21974,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21974: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21977: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+ LIBS="-lrt $LIBS"
+@@ -21983,14 +21986,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21986: checking if clock_gettime links" >&5
++echo "$as_me:21989: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21993 "configure"
++#line 21996 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22008,16 +22011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22014: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22014: \$? = $ac_status" >&5
++ echo "$as_me:22017: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22017: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22020: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22020: \$? = $ac_status" >&5
++ echo "$as_me:22023: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -22028,7 +22031,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22031: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22034: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -22042,13 +22045,13 @@
+ EOF
+
+ else
+-echo "$as_me:22045: checking for gettimeofday" >&5
++echo "$as_me:22048: 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 22051 "configure"
++#line 22054 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22079,16 +22082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22085: \$? = $ac_status" >&5
++ echo "$as_me:22088: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22088: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22091: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22091: \$? = $ac_status" >&5
++ echo "$as_me:22094: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -22098,7 +22101,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22101: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22104: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -22108,7 +22111,7 @@
+
+ else
+
+-echo "$as_me:22111: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22114: 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
+@@ -22116,7 +22119,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22119 "configure"
++#line 22122 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22135,16 +22138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22138: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22141: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22141: \$? = $ac_status" >&5
++ echo "$as_me:22144: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22144: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22147: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22147: \$? = $ac_status" >&5
++ echo "$as_me:22150: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22155,7 +22158,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22158: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22161: 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
+
+@@ -22214,13 +22217,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22217: checking for $ac_func" >&5
++echo "$as_me:22220: 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 22223 "configure"
++#line 22226 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22251,16 +22254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22257: \$? = $ac_status" >&5
++ echo "$as_me:22260: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22260: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22263: \$? = $ac_status" >&5
++ echo "$as_me:22266: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -22270,7 +22273,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22273: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22276: 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
+@@ -22280,14 +22283,14 @@
+ fi
+ done
+
+-echo "$as_me:22283: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:22286: 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 22290 "configure"
++#line 22293 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -22302,16 +22305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22308: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22308: \$? = $ac_status" >&5
++ echo "$as_me:22311: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22311: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22314: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22314: \$? = $ac_status" >&5
++ echo "$as_me:22317: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_PATH_TTYS=yes
+ else
+@@ -22321,7 +22324,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22324: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22327: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+
+ if test $cf_cv_PATH_TTYS = no
+@@ -22343,7 +22346,7 @@
+
+ if test $cf_cv_PATH_TTYS != no
+ then
+- echo "$as_me:22346: checking if _PATH_TTYS file exists" >&5
++ echo "$as_me:22349: 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
+@@ -22353,7 +22356,7 @@
+ cf_cv_have_PATH_TTYS=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22356 "configure"
++#line 22359 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22366,15 +22369,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22372: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22372: \$? = $ac_status" >&5
++ echo "$as_me:22375: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22374: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22377: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22377: \$? = $ac_status" >&5
++ echo "$as_me:22380: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22386,7 +22389,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22389: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22392: 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
+@@ -22398,14 +22401,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+
+- echo "$as_me:22401: checking for getttynam" >&5
++ echo "$as_me:22404: 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 22408 "configure"
++#line 22411 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -22417,16 +22420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22423: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22423: \$? = $ac_status" >&5
++ echo "$as_me:22426: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22426: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22429: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22429: \$? = $ac_status" >&5
++ echo "$as_me:22432: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_getttynam=yes
+ else
+@@ -22436,7 +22439,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22439: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22442: 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
+@@ -22446,7 +22449,7 @@
+
+ if test "x$ac_cv_func_getopt" = xno && \
+ test "x$cf_with_progs$cf_with_tests" != xnono; then
+- { { echo "$as_me:22449: error: getopt is required for building programs" >&5
++ { { echo "$as_me:22452: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -22455,7 +22458,7 @@
+ then
+ if test "x$ac_cv_func_vsnprintf" = xyes
+ then
+- { echo "$as_me:22458: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++ { echo "$as_me:22461: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ else
+
+@@ -22468,14 +22471,14 @@
+
+ if test "x$with_getcap" = "xyes" ; then
+
+-echo "$as_me:22471: checking for terminal-capability database functions" >&5
++echo "$as_me:22474: 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 22478 "configure"
++#line 22481 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22495,16 +22498,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22501: \$? = $ac_status" >&5
++ echo "$as_me:22504: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22507: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22507: \$? = $ac_status" >&5
++ echo "$as_me:22510: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent=yes
+ else
+@@ -22515,7 +22518,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22518: result: $cf_cv_cgetent" >&5
++echo "$as_me:22521: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+
+ if test "$cf_cv_cgetent" = yes
+@@ -22525,14 +22528,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+
+-echo "$as_me:22528: checking if cgetent uses const parameter" >&5
++echo "$as_me:22531: 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 22535 "configure"
++#line 22538 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22555,16 +22558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22561: \$? = $ac_status" >&5
++ echo "$as_me:22564: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22564: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22567: \$? = $ac_status" >&5
++ echo "$as_me:22570: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent_const=yes
+ else
+@@ -22575,7 +22578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22578: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22581: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ if test "$cf_cv_cgetent_const" = yes
+ then
+@@ -22589,14 +22592,14 @@
+
+ fi
+
+-echo "$as_me:22592: checking for isascii" >&5
++echo "$as_me:22595: 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 22599 "configure"
++#line 22602 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -22608,16 +22611,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22611: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22614: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22614: \$? = $ac_status" >&5
++ echo "$as_me:22617: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22617: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22620: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22620: \$? = $ac_status" >&5
++ echo "$as_me:22623: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_isascii=yes
+ else
+@@ -22628,7 +22631,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22631: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22634: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22636,10 +22639,10 @@
+ EOF
+
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22639: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22642: 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 22642 "configure"
++#line 22645 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22653,16 +22656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22659: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22659: \$? = $ac_status" >&5
++ echo "$as_me:22662: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22662: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22665: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22665: \$? = $ac_status" >&5
++ echo "$as_me:22668: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=no
+ else
+@@ -22670,7 +22673,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22673 "configure"
++#line 22676 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22685,16 +22688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22691: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22691: \$? = $ac_status" >&5
++ echo "$as_me:22694: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22694: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22697: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22697: \$? = $ac_status" >&5
++ echo "$as_me:22700: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=yes
+
+@@ -22710,11 +22713,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22713: result: $sigact_bad" >&5
++echo "$as_me:22716: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+
+-echo "$as_me:22717: checking if nanosleep really works" >&5
++echo "$as_me:22720: 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
+@@ -22724,7 +22727,7 @@
+ cf_cv_func_nanosleep=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22727 "configure"
++#line 22730 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22750,15 +22753,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22756: \$? = $ac_status" >&5
++ echo "$as_me:22759: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22758: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22761: \$? = $ac_status" >&5
++ echo "$as_me:22764: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_nanosleep=yes
+ else
+@@ -22770,7 +22773,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22773: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22776: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22787,23 +22790,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22790: checking for $ac_header" >&5
++echo "$as_me:22793: 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 22796 "configure"
++#line 22799 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22803: \"$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:22806: \$? = $ac_status" >&5
++ echo "$as_me:22809: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22822,7 +22825,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22828: 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
+@@ -22839,10 +22842,10 @@
+ (*) termios_bad=maybe ;;
+ esac
+ if test "$termios_bad" = maybe ; then
+- echo "$as_me:22842: checking whether termios.h needs _POSIX_SOURCE" >&5
++ echo "$as_me:22845: 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 22845 "configure"
++#line 22848 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22854,16 +22857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22860: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22860: \$? = $ac_status" >&5
++ echo "$as_me:22863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22863: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22866: \$? = $ac_status" >&5
++ echo "$as_me:22869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=no
+ else
+@@ -22871,7 +22874,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22874 "configure"
++#line 22877 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22885,16 +22888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22888: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22891: \$? = $ac_status" >&5
++ echo "$as_me:22894: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22894: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22897: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22897: \$? = $ac_status" >&5
++ echo "$as_me:22900: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=unknown
+ else
+@@ -22910,19 +22913,19 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:22913: result: $termios_bad" >&5
++ echo "$as_me:22916: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ fi
+ fi
+
+-echo "$as_me:22918: checking for tcgetattr" >&5
++echo "$as_me:22921: 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 22925 "configure"
++#line 22928 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22950,16 +22953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22956: \$? = $ac_status" >&5
++ echo "$as_me:22959: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22959: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22962: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22962: \$? = $ac_status" >&5
++ echo "$as_me:22965: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_tcgetattr=yes
+ else
+@@ -22969,21 +22972,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22972: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22975: 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:22979: checking for vsscanf function or workaround" >&5
++echo "$as_me:22982: 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 22986 "configure"
++#line 22989 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23009,16 +23012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23015: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23015: \$? = $ac_status" >&5
++ echo "$as_me:23018: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23018: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23021: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23021: \$? = $ac_status" >&5
++ echo "$as_me:23024: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23026,7 +23029,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23029 "configure"
++#line 23032 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23048,16 +23051,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23054: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23054: \$? = $ac_status" >&5
++ echo "$as_me:23057: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23057: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23060: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23060: \$? = $ac_status" >&5
++ echo "$as_me:23063: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23065,7 +23068,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23068 "configure"
++#line 23071 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23087,16 +23090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23093: \$? = $ac_status" >&5
++ echo "$as_me:23096: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23096: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23099: \$? = $ac_status" >&5
++ echo "$as_me:23102: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=_doscan
+ else
+@@ -23111,7 +23114,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23114: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23117: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+
+ case "$cf_cv_func_vsscanf" in
+@@ -23137,23 +23140,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23140: checking for $ac_header" >&5
++echo "$as_me:23143: 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 23146 "configure"
++#line 23149 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23150: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23153: \"$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:23156: \$? = $ac_status" >&5
++ echo "$as_me:23159: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23172,7 +23175,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23175: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23178: 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
+@@ -23182,7 +23185,7 @@
+ fi
+ done
+
+-echo "$as_me:23185: checking for working mkstemp" >&5
++echo "$as_me:23188: 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
+@@ -23193,7 +23196,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23196 "configure"
++#line 23199 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23228,15 +23231,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23231: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23234: \$? = $ac_status" >&5
++ echo "$as_me:23237: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23236: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23239: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23239: \$? = $ac_status" >&5
++ echo "$as_me:23242: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -23251,16 +23254,16 @@
+ fi
+
+ fi
+-echo "$as_me:23254: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23257: 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:23257: checking for mkstemp" >&5
++ echo "$as_me:23260: 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 23263 "configure"
++#line 23266 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23291,16 +23294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23297: \$? = $ac_status" >&5
++ echo "$as_me:23300: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23300: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23303: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23303: \$? = $ac_status" >&5
++ echo "$as_me:23306: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -23310,7 +23313,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23313: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23316: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -23331,21 +23334,21 @@
+ fi
+
+ if test "x$cross_compiling" = xyes ; then
+- { echo "$as_me:23334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++ { echo "$as_me:23337: 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:23337: checking whether setvbuf arguments are reversed" >&5
++ echo "$as_me:23340: 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:23343: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:23346: 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 23348 "configure"
++#line 23351 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23362,15 +23365,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23368: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23368: \$? = $ac_status" >&5
++ echo "$as_me:23371: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23370: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23373: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23373: \$? = $ac_status" >&5
++ echo "$as_me:23376: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23383,7 +23386,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23386: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23389: 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
+
+@@ -23394,13 +23397,13 @@
+ fi
+
+ fi
+-echo "$as_me:23397: checking for intptr_t" >&5
++echo "$as_me:23400: 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 23403 "configure"
++#line 23406 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23415,16 +23418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23421: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23421: \$? = $ac_status" >&5
++ echo "$as_me:23424: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23424: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23427: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23427: \$? = $ac_status" >&5
++ echo "$as_me:23430: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_intptr_t=yes
+ else
+@@ -23434,7 +23437,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23437: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23440: 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
+ :
+@@ -23446,13 +23449,13 @@
+
+ fi
+
+-echo "$as_me:23449: checking for ssize_t" >&5
++echo "$as_me:23452: 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 23455 "configure"
++#line 23458 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23467,16 +23470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23473: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23473: \$? = $ac_status" >&5
++ echo "$as_me:23476: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23476: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23479: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23479: \$? = $ac_status" >&5
++ echo "$as_me:23482: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_ssize_t=yes
+ else
+@@ -23486,7 +23489,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23489: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23492: 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
+ :
+@@ -23498,14 +23501,14 @@
+
+ fi
+
+-echo "$as_me:23501: checking for type sigaction_t" >&5
++echo "$as_me:23504: 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 23508 "configure"
++#line 23511 "configure"
+ #include "confdefs.h"
+
+ #include <signal.h>
+@@ -23518,16 +23521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23524: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23524: \$? = $ac_status" >&5
++ echo "$as_me:23527: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23527: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23530: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23530: \$? = $ac_status" >&5
++ echo "$as_me:23533: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_type_sigaction=yes
+ else
+@@ -23538,14 +23541,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:23541: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23544: 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:23548: checking declaration of size-change" >&5
++echo "$as_me:23551: 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
+@@ -23566,7 +23569,7 @@
+
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23569 "configure"
++#line 23572 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -23616,16 +23619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23622: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23622: \$? = $ac_status" >&5
++ echo "$as_me:23625: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23625: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23628: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23628: \$? = $ac_status" >&5
++ echo "$as_me:23631: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sizechange=yes
+ else
+@@ -23644,7 +23647,7 @@
+ done
+
+ fi
+-echo "$as_me:23647: result: $cf_cv_sizechange" >&5
++echo "$as_me:23650: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+
+@@ -23662,13 +23665,13 @@
+ esac
+ fi
+
+-echo "$as_me:23665: checking for memmove" >&5
++echo "$as_me:23668: 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 23671 "configure"
++#line 23674 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23699,16 +23702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23705: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23705: \$? = $ac_status" >&5
++ echo "$as_me:23708: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23708: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23711: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23711: \$? = $ac_status" >&5
++ echo "$as_me:23714: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_memmove=yes
+ else
+@@ -23718,19 +23721,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23721: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23724: 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:23727: checking for bcopy" >&5
++echo "$as_me:23730: 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 23733 "configure"
++#line 23736 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23761,16 +23764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23767: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23767: \$? = $ac_status" >&5
++ echo "$as_me:23770: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23770: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23773: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23773: \$? = $ac_status" >&5
++ echo "$as_me:23776: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_bcopy=yes
+ else
+@@ -23780,11 +23783,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23783: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23786: 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:23787: checking if bcopy does overlapping moves" >&5
++ echo "$as_me:23790: 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
+@@ -23794,7 +23797,7 @@
+ cf_cv_good_bcopy=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23797 "configure"
++#line 23800 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23810,15 +23813,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23816: \$? = $ac_status" >&5
++ echo "$as_me:23819: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23818: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23821: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23821: \$? = $ac_status" >&5
++ echo "$as_me:23824: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_good_bcopy=yes
+ else
+@@ -23831,7 +23834,7 @@
+ fi
+
+ fi
+-echo "$as_me:23834: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23837: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+
+ else
+@@ -23858,13 +23861,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23861: checking for $ac_func" >&5
++echo "$as_me:23864: 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 23867 "configure"
++#line 23870 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23895,16 +23898,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23901: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23901: \$? = $ac_status" >&5
++ echo "$as_me:23904: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23904: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23907: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23907: \$? = $ac_status" >&5
++ echo "$as_me:23910: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -23914,7 +23917,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23917: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23920: 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
+@@ -23924,7 +23927,7 @@
+ fi
+ done
+ }
+-echo "$as_me:23927: checking if poll really works" >&5
++echo "$as_me:23930: 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
+@@ -23934,7 +23937,7 @@
+ cf_cv_working_poll=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23937 "configure"
++#line 23940 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23987,15 +23990,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23993: \$? = $ac_status" >&5
++ echo "$as_me:23996: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23995: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23998: \$? = $ac_status" >&5
++ echo "$as_me:24001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -24007,21 +24010,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24010: result: $cf_cv_working_poll" >&5
++echo "$as_me:24013: 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:24017: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24020: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24024 "configure"
++#line 24027 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24041,16 +24044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24047: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24047: \$? = $ac_status" >&5
++ echo "$as_me:24050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24050: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24053: \$? = $ac_status" >&5
++ echo "$as_me:24056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mb_len_max=yes
+ else
+@@ -24060,7 +24063,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24063: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24066: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24070,18 +24073,18 @@
+ EOF
+
+ else
+- { echo "$as_me:24073: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++ { echo "$as_me:24076: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+
+-echo "$as_me:24077: checking for va_copy" >&5
++echo "$as_me:24080: 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 24084 "configure"
++#line 24087 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24098,16 +24101,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24104: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24104: \$? = $ac_status" >&5
++ echo "$as_me:24107: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24107: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24110: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24110: \$? = $ac_status" >&5
++ echo "$as_me:24113: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -24117,7 +24120,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24120: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24123: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24129,14 +24132,14 @@
+
+ else # !cf_cv_have_va_copy
+
+-echo "$as_me:24132: checking for __va_copy" >&5
++echo "$as_me:24135: 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 24139 "configure"
++#line 24142 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24153,16 +24156,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24159: \$? = $ac_status" >&5
++ echo "$as_me:24162: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24162: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24165: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24165: \$? = $ac_status" >&5
++ echo "$as_me:24168: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -24172,7 +24175,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24175: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24178: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24184,14 +24187,14 @@
+
+ else # !cf_cv_have___va_copy
+
+-echo "$as_me:24187: checking for __builtin_va_copy" >&5
++echo "$as_me:24190: 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 24194 "configure"
++#line 24197 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24208,16 +24211,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24214: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24214: \$? = $ac_status" >&5
++ echo "$as_me:24217: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24217: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24220: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24220: \$? = $ac_status" >&5
++ echo "$as_me:24223: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24227,7 +24230,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24230: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24233: 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 &&
+@@ -24245,14 +24248,14 @@
+ ;;
+
+ (*)
+- echo "$as_me:24248: checking if we can simply copy va_list" >&5
++ echo "$as_me:24251: 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 24255 "configure"
++#line 24258 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24269,16 +24272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24275: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24275: \$? = $ac_status" >&5
++ echo "$as_me:24278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24278: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24281: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24281: \$? = $ac_status" >&5
++ echo "$as_me:24284: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_pointer_va_list=yes
+ else
+@@ -24288,19 +24291,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24291: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24294: 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:24296: checking if we can copy va_list indirectly" >&5
++ echo "$as_me:24299: 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 24303 "configure"
++#line 24306 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24317,16 +24320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24323: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24323: \$? = $ac_status" >&5
++ echo "$as_me:24326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24329: \$? = $ac_status" >&5
++ echo "$as_me:24332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_array_va_list=yes
+ else
+@@ -24336,7 +24339,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24339: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24342: 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
+@@ -24347,13 +24350,13 @@
+ ;;
+ esac
+
+-echo "$as_me:24350: checking for pid_t" >&5
++echo "$as_me:24353: 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 24356 "configure"
++#line 24359 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24368,16 +24371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24374: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24374: \$? = $ac_status" >&5
++ echo "$as_me:24377: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24377: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24380: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24380: \$? = $ac_status" >&5
++ echo "$as_me:24383: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -24387,7 +24390,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24390: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24393: 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
+ :
+@@ -24402,23 +24405,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:24405: checking for $ac_header" >&5
++echo "$as_me:24408: 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 24411 "configure"
++#line 24414 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24418: \"$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:24421: \$? = $ac_status" >&5
++ echo "$as_me:24424: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24437,7 +24440,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24443: 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
+@@ -24450,13 +24453,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:24453: checking for $ac_func" >&5
++echo "$as_me:24456: 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 24459 "configure"
++#line 24462 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24487,16 +24490,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24490: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24493: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24493: \$? = $ac_status" >&5
++ echo "$as_me:24496: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24496: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24499: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24499: \$? = $ac_status" >&5
++ echo "$as_me:24502: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -24506,7 +24509,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24509: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24512: 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
+@@ -24518,7 +24521,7 @@
+
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:24521: checking for working fork" >&5
++ echo "$as_me:24524: 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
+@@ -24541,15 +24544,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24544: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24547: \$? = $ac_status" >&5
++ echo "$as_me:24550: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24549: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24552: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24552: \$? = $ac_status" >&5
++ echo "$as_me:24555: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -24561,7 +24564,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24564: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24567: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -24575,12 +24578,12 @@
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+- { echo "$as_me:24578: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:24581: 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:24583: checking for working vfork" >&5
++ echo "$as_me:24586: 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
+@@ -24589,7 +24592,7 @@
+ ac_cv_func_vfork_works=cross
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24592 "configure"
++#line 24595 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -24682,15 +24685,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24688: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24688: \$? = $ac_status" >&5
++ echo "$as_me:24691: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24690: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24693: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24693: \$? = $ac_status" >&5
++ echo "$as_me:24696: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -24702,13 +24705,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24705: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24708: 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:24711: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:24714: 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
+
+@@ -24733,7 +24736,7 @@
+
+ fi
+
+-echo "$as_me:24736: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24739: 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
+@@ -24743,7 +24746,7 @@
+ cf_cv_fopen_bin_r=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24746 "configure"
++#line 24749 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24778,15 +24781,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24784: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24784: \$? = $ac_status" >&5
++ echo "$as_me:24787: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24786: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24789: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24789: \$? = $ac_status" >&5
++ echo "$as_me:24792: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fopen_bin_r=yes
+ else
+@@ -24799,7 +24802,7 @@
+ fi
+
+ fi
+-echo "$as_me:24802: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24805: 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
+@@ -24808,7 +24811,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:24811: checking for openpty in -lutil" >&5
++echo "$as_me:24814: 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
+@@ -24816,7 +24819,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24819 "configure"
++#line 24822 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -24835,16 +24838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24841: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24841: \$? = $ac_status" >&5
++ echo "$as_me:24844: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24844: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24847: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24847: \$? = $ac_status" >&5
++ echo "$as_me:24850: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -24855,7 +24858,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24858: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24861: 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
+@@ -24863,7 +24866,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:24866: checking for openpty header" >&5
++echo "$as_me:24869: 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
+@@ -24890,7 +24893,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24893 "configure"
++#line 24896 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -24908,16 +24911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24914: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24914: \$? = $ac_status" >&5
++ echo "$as_me:24917: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24917: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24920: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24920: \$? = $ac_status" >&5
++ echo "$as_me:24923: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -24935,7 +24938,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:24938: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24941: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25008,7 +25011,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25011 "configure"
++#line 25014 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -25020,16 +25023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25026: \$? = $ac_status" >&5
++ echo "$as_me:25029: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25029: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25032: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25032: \$? = $ac_status" >&5
++ echo "$as_me:25035: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25046,7 +25049,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}:25049: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25052: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25082,7 +25085,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}:25085: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25088: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25093,7 +25096,7 @@
+ else
+ case "$with_hashed_db" in
+ (./*|../*|/*)
+- { echo "$as_me:25096: WARNING: no such directory $with_hashed_db" >&5
++ { echo "$as_me:25099: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ ;;
+ (*)
+@@ -25165,7 +25168,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25168 "configure"
++#line 25171 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -25177,16 +25180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25183: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25183: \$? = $ac_status" >&5
++ echo "$as_me:25186: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25186: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25189: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25189: \$? = $ac_status" >&5
++ echo "$as_me:25192: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25203,7 +25206,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}:25206: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25209: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25283,7 +25286,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}:25286: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25289: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25300,23 +25303,23 @@
+ fi
+ esac
+
+-echo "$as_me:25303: checking for db.h" >&5
++echo "$as_me:25306: 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 25309 "configure"
++#line 25312 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:25313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25316: \"$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:25319: \$? = $ac_status" >&5
++ echo "$as_me:25322: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25335,11 +25338,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25338: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25341: 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:25342: checking for version of db" >&5
++echo "$as_me:25345: 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
+@@ -25350,10 +25353,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+
+-echo "${as_me:-configure}:25353: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25356: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25356 "configure"
++#line 25359 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25383,16 +25386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25389: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25389: \$? = $ac_status" >&5
++ echo "$as_me:25392: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25392: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25395: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25395: \$? = $ac_status" >&5
++ echo "$as_me:25398: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -25406,16 +25409,16 @@
+ done
+
+ fi
+-echo "$as_me:25409: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25412: 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:25413: error: Cannot determine version of db" >&5
++ { { echo "$as_me:25416: 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:25418: checking for db libraries" >&5
++echo "$as_me:25421: 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
+@@ -25445,10 +25448,10 @@
+
+ fi
+
+-echo "${as_me:-configure}:25448: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25451: testing checking for library $cf_db_libs ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25451 "configure"
++#line 25454 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25503,16 +25506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25506: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25509: \$? = $ac_status" >&5
++ echo "$as_me:25512: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25512: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25515: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25515: \$? = $ac_status" >&5
++ echo "$as_me:25518: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -25532,11 +25535,11 @@
+ done
+
+ fi
+-echo "$as_me:25535: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25538: 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:25539: error: Cannot determine library for db" >&5
++ { { echo "$as_me:25542: 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
+@@ -25562,7 +25565,7 @@
+
+ else
+
+- { { echo "$as_me:25565: error: Cannot find db.h" >&5
++ { { echo "$as_me:25568: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -25577,7 +25580,7 @@
+
+ # Just in case, check if the C compiler has a bool type.
+
+-echo "$as_me:25580: checking if we should include stdbool.h" >&5
++echo "$as_me:25583: 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
+@@ -25585,7 +25588,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25588 "configure"
++#line 25591 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -25597,23 +25600,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25600: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25603: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25603: \$? = $ac_status" >&5
++ echo "$as_me:25606: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25606: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25609: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25609: \$? = $ac_status" >&5
++ echo "$as_me:25612: \$? = $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 25616 "configure"
++#line 25619 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -25629,16 +25632,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25635: \$? = $ac_status" >&5
++ echo "$as_me:25638: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25638: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25641: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25641: \$? = $ac_status" >&5
++ echo "$as_me:25644: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -25652,13 +25655,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:25655: result: yes" >&5
++then echo "$as_me:25658: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25657: result: no" >&5
++else echo "$as_me:25660: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:25661: checking for builtin bool type" >&5
++echo "$as_me:25664: 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
+@@ -25666,7 +25669,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25669 "configure"
++#line 25672 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -25681,16 +25684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25684: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25687: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25687: \$? = $ac_status" >&5
++ echo "$as_me:25690: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25690: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25693: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25693: \$? = $ac_status" >&5
++ echo "$as_me:25696: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -25703,9 +25706,9 @@
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:25706: result: yes" >&5
++then echo "$as_me:25709: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25708: result: no" >&5
++else echo "$as_me:25711: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25722,10 +25725,10 @@
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+- echo "$as_me:25725: checking if we already have C++ library" >&5
++ echo "$as_me:25728: 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 25728 "configure"
++#line 25731 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25739,16 +25742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25745: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25745: \$? = $ac_status" >&5
++ echo "$as_me:25748: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25748: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25751: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25751: \$? = $ac_status" >&5
++ echo "$as_me:25754: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_libstdcpp=yes
+ else
+@@ -25757,7 +25760,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:25760: result: $cf_have_libstdcpp" >&5
++ echo "$as_me:25763: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+@@ -25776,7 +25779,7 @@
+ ;;
+ esac
+
+- echo "$as_me:25779: checking for library $cf_stdcpp_libname" >&5
++ echo "$as_me:25782: 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
+@@ -25802,7 +25805,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25805 "configure"
++#line 25808 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25816,16 +25819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25819: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25822: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25822: \$? = $ac_status" >&5
++ echo "$as_me:25825: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25825: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25828: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25828: \$? = $ac_status" >&5
++ echo "$as_me:25831: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -25837,7 +25840,7 @@
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:25840: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25843: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25859,7 +25862,7 @@
+ fi
+ fi
+
+- echo "$as_me:25862: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:25865: 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
+@@ -25874,15 +25877,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:25877: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25880: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25880: \$? = $ac_status" >&5
++ echo "$as_me:25883: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:25882: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:25885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25885: \$? = $ac_status" >&5
++ echo "$as_me:25888: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -25893,10 +25896,10 @@
+
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+- echo "$as_me:25896: result: yes" >&5
++ echo "$as_me:25899: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:25899: result: no" >&5
++ echo "$as_me:25902: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25916,7 +25919,7 @@
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:25919: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:25922: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+
+@@ -25937,7 +25940,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25940 "configure"
++#line 25943 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25951,16 +25954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25957: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25957: \$? = $ac_status" >&5
++ echo "$as_me:25960: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25963: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25963: \$? = $ac_status" >&5
++ echo "$as_me:25966: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -25997,7 +26000,7 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26000 "configure"
++#line 26003 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -26011,16 +26014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26017: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26017: \$? = $ac_status" >&5
++ echo "$as_me:26020: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:26020: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26023: \$? = $ac_status" >&5
++ echo "$as_me:26026: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -26053,7 +26056,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save"
+- echo "$as_me:26056: result: $cf_cxx_library" >&5
++ echo "$as_me:26059: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -26069,7 +26072,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:26072: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26075: 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
+@@ -26086,18 +26089,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 26089 "configure"
++#line 26092 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26094: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26097: \"$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:26100: \$? = $ac_status" >&5
++ echo "$as_me:26103: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26120,17 +26123,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26123 "configure"
++#line 26126 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:26127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26130: \"$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:26133: \$? = $ac_status" >&5
++ echo "$as_me:26136: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26167,7 +26170,7 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26170: result: $CXXCPP" >&5
++echo "$as_me:26173: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26177,18 +26180,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 26180 "configure"
++#line 26183 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26185: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26188: \"$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:26191: \$? = $ac_status" >&5
++ echo "$as_me:26194: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26211,17 +26214,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26214 "configure"
++#line 26217 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:26218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26221: \"$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:26224: \$? = $ac_status" >&5
++ echo "$as_me:26227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26249,7 +26252,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:26252: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:26255: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -26264,23 +26267,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26267: checking for $ac_header" >&5
++echo "$as_me:26270: 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 26273 "configure"
++#line 26276 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26277: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26280: \"$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:26283: \$? = $ac_status" >&5
++ echo "$as_me:26286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26299,7 +26302,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26302: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26305: 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
+@@ -26312,23 +26315,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26315: checking for $ac_header" >&5
++echo "$as_me:26318: 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 26321 "configure"
++#line 26324 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26328: \"$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:26331: \$? = $ac_status" >&5
++ echo "$as_me:26334: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26347,7 +26350,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26350: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26353: 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
+@@ -26358,10 +26361,10 @@
+ done
+
+ if test x"$ac_cv_header_iostream" = xyes ; then
+- echo "$as_me:26361: checking if iostream uses std-namespace" >&5
++ echo "$as_me:26364: 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 26364 "configure"
++#line 26367 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -26378,16 +26381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26384: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26384: \$? = $ac_status" >&5
++ echo "$as_me:26387: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26387: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26390: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26390: \$? = $ac_status" >&5
++ echo "$as_me:26393: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -26396,7 +26399,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:26399: result: $cf_iostream_namespace" >&5
++ echo "$as_me:26402: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+
+@@ -26407,7 +26410,7 @@
+ fi
+ fi
+
+-echo "$as_me:26410: checking if we should include stdbool.h" >&5
++echo "$as_me:26413: 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
+@@ -26415,7 +26418,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26418 "configure"
++#line 26421 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -26427,23 +26430,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26430: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26433: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26433: \$? = $ac_status" >&5
++ echo "$as_me:26436: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26436: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26439: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26439: \$? = $ac_status" >&5
++ echo "$as_me:26442: \$? = $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 26446 "configure"
++#line 26449 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -26459,16 +26462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26465: \$? = $ac_status" >&5
++ echo "$as_me:26468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26468: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26471: \$? = $ac_status" >&5
++ echo "$as_me:26474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -26482,13 +26485,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:26485: result: yes" >&5
++then echo "$as_me:26488: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26487: result: no" >&5
++else echo "$as_me:26490: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26491: checking for builtin bool type" >&5
++echo "$as_me:26494: 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
+@@ -26496,7 +26499,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26499 "configure"
++#line 26502 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -26511,16 +26514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26517: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26517: \$? = $ac_status" >&5
++ echo "$as_me:26520: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26520: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26523: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26523: \$? = $ac_status" >&5
++ echo "$as_me:26526: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -26533,19 +26536,19 @@
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:26536: result: yes" >&5
++then echo "$as_me:26539: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26538: result: no" >&5
++else echo "$as_me:26541: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26542: checking for bool" >&5
++echo "$as_me:26545: 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 26548 "configure"
++#line 26551 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26580,16 +26583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26586: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26586: \$? = $ac_status" >&5
++ echo "$as_me:26589: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26589: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26592: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26592: \$? = $ac_status" >&5
++ echo "$as_me:26595: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -26599,10 +26602,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26602: result: $ac_cv_type_bool" >&5
++echo "$as_me:26605: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:26605: checking size of bool" >&5
++echo "$as_me:26608: 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
+@@ -26611,7 +26614,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26614 "configure"
++#line 26617 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26643,21 +26646,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26649: \$? = $ac_status" >&5
++ echo "$as_me:26652: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26655: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26655: \$? = $ac_status" >&5
++ echo "$as_me:26658: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26660 "configure"
++#line 26663 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26689,16 +26692,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26692: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26695: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26695: \$? = $ac_status" >&5
++ echo "$as_me:26698: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26698: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26701: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26701: \$? = $ac_status" >&5
++ echo "$as_me:26704: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -26714,7 +26717,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26717 "configure"
++#line 26720 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26746,16 +26749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26749: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26752: \$? = $ac_status" >&5
++ echo "$as_me:26755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26755: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26758: \$? = $ac_status" >&5
++ echo "$as_me:26761: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -26771,7 +26774,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 26774 "configure"
++#line 26777 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26803,16 +26806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26809: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26809: \$? = $ac_status" >&5
++ echo "$as_me:26812: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26812: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26815: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26815: \$? = $ac_status" >&5
++ echo "$as_me:26818: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -26825,12 +26828,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:26828: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:26831: 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 26833 "configure"
++#line 26836 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26866,15 +26869,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26872: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26872: \$? = $ac_status" >&5
++ echo "$as_me:26875: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26874: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26877: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26877: \$? = $ac_status" >&5
++ echo "$as_me:26880: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26890,13 +26893,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26893: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26896: 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:26899: checking for type of bool" >&5
++echo "$as_me:26902: 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
+@@ -26915,7 +26918,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26918 "configure"
++#line 26921 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26956,15 +26959,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26962: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26962: \$? = $ac_status" >&5
++ echo "$as_me:26965: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26964: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26967: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26967: \$? = $ac_status" >&5
++ echo "$as_me:26970: \$? = $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
+@@ -26981,19 +26984,19 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:26984: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26987: 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:26991: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:26994: 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:26996: checking for special defines needed for etip.h" >&5
++echo "$as_me:26999: 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"
+@@ -27011,7 +27014,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 27014 "configure"
++#line 27017 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -27025,16 +27028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27031: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27031: \$? = $ac_status" >&5
++ echo "$as_me:27034: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27034: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27037: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27037: \$? = $ac_status" >&5
++ echo "$as_me:27040: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -27055,12 +27058,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:27058: result: ${cf_result:-(none)}" >&5
++echo "$as_me:27061: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+
+ if test -n "$CXX"; then
+-echo "$as_me:27063: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27066: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27077,7 +27080,7 @@
+ cf_cv_cpp_override=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27080 "configure"
++#line 27083 "configure"
+ #include "confdefs.h"
+
+ class base
+@@ -27096,15 +27099,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27102: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27102: \$? = $ac_status" >&5
++ echo "$as_me:27105: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27104: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27107: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27107: \$? = $ac_status" >&5
++ echo "$as_me:27110: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_override=yes
+ else
+@@ -27123,7 +27126,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27126: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27129: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27132,7 +27135,7 @@
+ EOF
+
+ if test -n "$CXX"; then
+-echo "$as_me:27135: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27138: 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
+@@ -27149,7 +27152,7 @@
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27152 "configure"
++#line 27155 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -27168,15 +27171,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27174: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27174: \$? = $ac_status" >&5
++ echo "$as_me:27177: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27176: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27179: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27179: \$? = $ac_status" >&5
++ echo "$as_me:27182: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -27195,7 +27198,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27198: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27201: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27205,7 +27208,7 @@
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:27208: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27211: 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
+@@ -27219,7 +27222,7 @@
+ ac_main_return="return"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27222 "configure"
++#line 27225 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -27263,16 +27266,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27269: \$? = $ac_status" >&5
++ echo "$as_me:27272: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27272: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27275: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27275: \$? = $ac_status" >&5
++ echo "$as_me:27278: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -27290,7 +27293,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27293: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27296: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -27338,13 +27341,13 @@
+ cf_cv_header_stdbool_h=0
+ else
+
+-echo "$as_me:27341: checking for bool" >&5
++echo "$as_me:27344: 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 27347 "configure"
++#line 27350 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27379,16 +27382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27385: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27385: \$? = $ac_status" >&5
++ echo "$as_me:27388: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27388: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27391: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27391: \$? = $ac_status" >&5
++ echo "$as_me:27394: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -27398,10 +27401,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27401: result: $ac_cv_type_bool" >&5
++echo "$as_me:27404: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:27404: checking size of bool" >&5
++echo "$as_me:27407: 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
+@@ -27410,7 +27413,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27413 "configure"
++#line 27416 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27442,21 +27445,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27445: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27448: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27448: \$? = $ac_status" >&5
++ echo "$as_me:27451: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27451: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27454: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27454: \$? = $ac_status" >&5
++ echo "$as_me:27457: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27459 "configure"
++#line 27462 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27488,16 +27491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27494: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27494: \$? = $ac_status" >&5
++ echo "$as_me:27497: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27497: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27500: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27500: \$? = $ac_status" >&5
++ echo "$as_me:27503: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -27513,7 +27516,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27516 "configure"
++#line 27519 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27545,16 +27548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27551: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27551: \$? = $ac_status" >&5
++ echo "$as_me:27554: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27554: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27557: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27557: \$? = $ac_status" >&5
++ echo "$as_me:27560: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -27570,7 +27573,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 27573 "configure"
++#line 27576 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27602,16 +27605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27608: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27608: \$? = $ac_status" >&5
++ echo "$as_me:27611: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27614: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27614: \$? = $ac_status" >&5
++ echo "$as_me:27617: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -27624,12 +27627,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:27627: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:27630: 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 27632 "configure"
++#line 27635 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27665,15 +27668,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27668: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27671: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27671: \$? = $ac_status" >&5
++ echo "$as_me:27674: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27673: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27676: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27676: \$? = $ac_status" >&5
++ echo "$as_me:27679: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27689,13 +27692,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27692: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27695: 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:27698: checking for type of bool" >&5
++echo "$as_me:27701: 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
+@@ -27714,7 +27717,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27717 "configure"
++#line 27720 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27755,15 +27758,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27761: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27761: \$? = $ac_status" >&5
++ echo "$as_me:27764: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27763: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27766: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27766: \$? = $ac_status" >&5
++ echo "$as_me:27769: \$? = $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
+@@ -27780,14 +27783,14 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:27783: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27786: 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:27790: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:27793: 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
+@@ -27818,7 +27821,7 @@
+
+ if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+- { echo "$as_me:27821: WARNING: libtool does not support Ada - disabling feature" >&5
++ { echo "$as_me:27824: 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
+@@ -27829,7 +27832,7 @@
+
+ ADAFLAGS="$ADAFLAGS -gnatpn"
+
+- echo "$as_me:27832: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:27835: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -27846,10 +27849,10 @@
+
+ ;;
+ esac
+- echo "$as_me:27849: result: $ADAFLAGS" >&5
++ echo "$as_me:27852: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:27852: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27855: 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
+@@ -27859,11 +27862,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:27862: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27865: 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:27866: checking if GNAT supports generics" >&5
++echo "$as_me:27869: 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])
+@@ -27873,7 +27876,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:27876: result: $cf_gnat_generics" >&5
++echo "$as_me:27879: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -27885,7 +27888,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:27888: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27891: 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
+@@ -27933,7 +27936,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:27936: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27939: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27946,7 +27949,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27949: checking if GNAT supports project files" >&5
++echo "$as_me:27952: 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]*)
+@@ -28009,15 +28012,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:28012: result: $cf_gnat_projects" >&5
++echo "$as_me:28015: 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:28018: checking if GNAT supports libraries" >&5
++ echo "$as_me:28021: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:28020: result: $cf_gnat_libraries" >&5
++ echo "$as_me:28023: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -28037,7 +28040,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:28040: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:28043: 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
+@@ -28049,7 +28052,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:28052: checking for Ada95 compiler" >&5
++echo "$as_me:28055: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28060,12 +28063,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:28063: result: $cf_ada_compiler" >&5
++echo "$as_me:28066: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:28068: checking for Ada95 include directory" >&5
++echo "$as_me:28071: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28099,7 +28102,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28102: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28105: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28108,10 +28111,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:28111: result: $ADA_INCLUDE" >&5
++echo "$as_me:28114: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:28114: checking for Ada95 object directory" >&5
++echo "$as_me:28117: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28145,7 +28148,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28148: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28151: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28154,10 +28157,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:28157: result: $ADA_OBJECTS" >&5
++echo "$as_me:28160: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:28160: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28163: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28178,11 +28181,11 @@
+ fi
+ fi
+
+-echo "$as_me:28181: result: $with_ada_sharedlib" >&5
++echo "$as_me:28184: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:28185: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:28188: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+
+@@ -28200,7 +28203,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:28203: checking for Ada95 curses library name" >&5
++echo "$as_me:28206: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28216,7 +28219,7 @@
+ ;;
+ esac
+
+-echo "$as_me:28219: result: $ADA_LIBNAME" >&5
++echo "$as_me:28222: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ fi
+@@ -28227,13 +28230,13 @@
+
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+- echo "$as_me:28230: checking for wchar_t" >&5
++ echo "$as_me:28233: 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 28236 "configure"
++#line 28239 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28248,16 +28251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28254: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28254: \$? = $ac_status" >&5
++ echo "$as_me:28257: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28257: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28260: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28260: \$? = $ac_status" >&5
++ echo "$as_me:28263: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_wchar_t=yes
+ else
+@@ -28267,10 +28270,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28270: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28273: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+
+-echo "$as_me:28273: checking size of wchar_t" >&5
++echo "$as_me:28276: 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
+@@ -28279,7 +28282,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28282 "configure"
++#line 28285 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28291,21 +28294,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28297: \$? = $ac_status" >&5
++ echo "$as_me:28300: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28300: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28303: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28303: \$? = $ac_status" >&5
++ echo "$as_me:28306: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28308 "configure"
++#line 28311 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28317,16 +28320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28323: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28323: \$? = $ac_status" >&5
++ echo "$as_me:28326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28329: \$? = $ac_status" >&5
++ echo "$as_me:28332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -28342,7 +28345,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28345 "configure"
++#line 28348 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28354,16 +28357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28360: \$? = $ac_status" >&5
++ echo "$as_me:28363: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28363: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28366: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28366: \$? = $ac_status" >&5
++ echo "$as_me:28369: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -28379,7 +28382,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 28382 "configure"
++#line 28385 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28391,16 +28394,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28397: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28397: \$? = $ac_status" >&5
++ echo "$as_me:28400: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28400: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28403: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28403: \$? = $ac_status" >&5
++ echo "$as_me:28406: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -28413,12 +28416,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:28416: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:28419: 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 28421 "configure"
++#line 28424 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28434,15 +28437,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28437: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28440: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28440: \$? = $ac_status" >&5
++ echo "$as_me:28443: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:28442: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28445: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28445: \$? = $ac_status" >&5
++ echo "$as_me:28448: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28458,7 +28461,7 @@
+ ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28461: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28464: 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
+@@ -28471,7 +28474,7 @@
+ then
+ test -n "$verbose" && echo " test failed (assume 2)" 1>&6
+
+-echo "${as_me:-configure}:28474: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28477: testing test failed (assume 2) ..." 1>&5
+
+ sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ mv confdefs.tmp confdefs.h
+@@ -28489,7 +28492,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28492: checking for library subsets" >&5
++echo "$as_me:28495: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -28543,7 +28546,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:28546: result: $LIB_SUBSETS" >&5
++echo "$as_me:28549: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -28574,7 +28577,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:28577: checking default library suffix" >&5
++echo "$as_me:28580: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28585,10 +28588,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28588: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28591: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:28591: checking default library-dependency suffix" >&5
++echo "$as_me:28594: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -28671,10 +28674,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:28674: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28677: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:28677: checking default object directory" >&5
++echo "$as_me:28680: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28690,11 +28693,11 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:28693: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28696: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28697: checking c++ library-dependency suffix" >&5
++echo "$as_me:28700: 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++)
+@@ -28787,7 +28790,7 @@
+ fi
+
+ fi
+-echo "$as_me:28790: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28793: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -28963,19 +28966,19 @@
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:28966: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:28969: 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 28971 "configure"
++#line 28974 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:28978: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28978: \$? = $ac_status" >&5
++ echo "$as_me:28981: \$? = $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
+@@ -28986,10 +28989,10 @@
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28989 "configure"
++#line 28992 "configure"
+ #include "confdefs.h"
+
+-#line 28992 "configure"
++#line 28995 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -29004,16 +29007,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29010: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:29010: \$? = $ac_status" >&5
++ echo "$as_me:29013: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:29013: \"$ac_try\"") >&5
++ { (eval echo "$as_me:29016: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:29016: \$? = $ac_status" >&5
++ echo "$as_me:29019: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ # some linkers simply ignore the -dynamic
+@@ -29036,7 +29039,7 @@
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:29039: result: $cf_ldflags_static" >&5
++ echo "$as_me:29042: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test "$cf_ldflags_static" != yes
+@@ -29052,7 +29055,7 @@
+ ;;
+ esac
+
+-echo "$as_me:29055: checking where we will install curses.h" >&5
++echo "$as_me:29058: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+
+ includesubdir=
+@@ -29062,7 +29065,7 @@
+ then
+ includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29065: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29068: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29070,7 +29073,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:29073: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:29076: 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
+@@ -29095,7 +29098,7 @@
+
+ # pkgsrc uses these
+
+-echo "$as_me:29098: checking for desired basename for form library" >&5
++echo "$as_me:29101: 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.
+@@ -29115,10 +29118,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29118: result: $FORM_NAME" >&5
++echo "$as_me:29121: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:29121: checking for desired basename for menu library" >&5
++echo "$as_me:29124: 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.
+@@ -29138,10 +29141,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29141: result: $MENU_NAME" >&5
++echo "$as_me:29144: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:29144: checking for desired basename for panel library" >&5
++echo "$as_me:29147: 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.
+@@ -29161,10 +29164,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29164: result: $PANEL_NAME" >&5
++echo "$as_me:29167: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:29167: checking for desired basename for cxx library" >&5
++echo "$as_me:29170: 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.
+@@ -29184,13 +29187,13 @@
+ ;;
+ esac
+
+-echo "$as_me:29187: result: $CXX_NAME" >&5
++echo "$as_me:29190: 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:29193: checking for src modules" >&5
++echo "$as_me:29196: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -29249,7 +29252,7 @@
+ fi
+ fi
+ done
+-echo "$as_me:29252: result: $cf_cv_src_modules" >&5
++echo "$as_me:29255: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29410,7 +29413,7 @@
+ (*-D_XOPEN_SOURCE_EXTENDED*)
+ test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+
+-echo "${as_me:-configure}:29413: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29416: 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//'`
+@@ -29421,7 +29424,7 @@
+
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29424: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29427: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29437,7 +29440,7 @@
+ done
+ test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29440: result: $PKG_CFLAGS" >&5
++echo "$as_me:29443: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+
+ case "$cf_cv_system_name" in
+@@ -29509,7 +29512,7 @@
+ cf_filter_syms=$cf_dft_filter_syms
+ test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_default" 1>&6
+
+-echo "${as_me:-configure}:29512: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29515: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+
+ fi
+
+@@ -29536,7 +29539,7 @@
+
+ # This is used for the *-config script and *.pc data files.
+
+-echo "$as_me:29539: checking for linker search path" >&5
++echo "$as_me:29542: 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
+@@ -29584,7 +29587,7 @@
+ cf_pathlist="$cf_pathlist /lib /usr/lib"
+ ;;
+ (*)
+- { echo "$as_me:29587: WARNING: problem with Solaris architecture" >&5
++ { echo "$as_me:29590: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ ;;
+ esac
+@@ -29625,7 +29628,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+
+ fi
+-echo "$as_me:29628: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29631: 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'`
+@@ -29711,7 +29714,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29714: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29717: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29892,7 +29895,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:29895: error: ambiguous option: $1
++ { { echo "$as_me:29898: 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;}
+@@ -29911,7 +29914,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:29914: error: unrecognized option: $1
++ -*) { { echo "$as_me:29917: 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;}
+@@ -30043,7 +30046,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:30046: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:30049: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -30568,7 +30571,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:30571: creating $ac_file" >&5
++ { echo "$as_me:30574: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -30586,7 +30589,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30589: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30592: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -30599,7 +30602,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30602: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30605: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30615,7 +30618,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:30618: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:30621: 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;}
+@@ -30624,7 +30627,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:30627: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:30630: 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;}
+@@ -30669,7 +30672,7 @@
+ ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"`
+ if test -z "$ac_init"; then
+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+- { echo "$as_me:30672: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:30675: 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;}
+@@ -30680,7 +30683,7 @@
+ $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
+ if test -s "$tmp"/out; then
+ ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
+- { echo "$as_me:30683: WARNING: Some variables may not be substituted:
++ { echo "$as_me:30686: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30729,7 +30732,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:30732: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:30735: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -30740,7 +30743,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30743: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30746: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -30753,7 +30756,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30756: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30759: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30811,7 +30814,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:30814: $ac_file is unchanged" >&5
++ { echo "$as_me:30817: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31198,7 +31201,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}:31201: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31204: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+ with_shared_cxx=yes
+ ;;
+Index: dist.mk
+Prereq: 1.1642
+--- ncurses-6.5-20241123+/dist.mk 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/dist.mk 2024-11-30 10:55:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1642 2024/11/23 10:51:23 tom Exp $
++# $Id: dist.mk,v 1.1643 2024/11/30 10:55:07 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 = 5
+-NCURSES_PATCH = 20241123
++NCURSES_PATCH = 20241130
+
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/fld_def.c
+Prereq: 1.44
+--- ncurses-6.5-20241123+/form/fld_def.c 2021-03-27 23:49:53.000000000 +0000
++++ ncurses-6.5-20241130/form/fld_def.c 2024-11-30 21:41:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey *
++ * Copyright 2020-2021,2024 Thomas E. Dickey *
+ * Copyright 1998-2012,2014 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -33,7 +33,7 @@
+
+ #include "form.priv.h"
+
+-MODULE_ID("$Id: fld_def.c,v 1.44 2021/03/27 23:49:53 tom Exp $")
++MODULE_ID("$Id: fld_def.c,v 1.45 2024/11/30 21:41:08 tom Exp $")
+
+ /* this can't be readonly */
+ static FIELD default_field =
+@@ -313,7 +313,7 @@
+ size_t len;
+
+ len = Total_Buffer_Size(New_Field);
+- if ((New_Field->buf = (FIELD_CELL *)malloc(len)))
++ if ((New_Field->buf = (FIELD_CELL *)malloc(len)) != NULL)
+ {
+ /* Prefill buffers with blanks and insert terminating zeroes
+ between buffers */
+Index: form/fld_dup.c
+Prereq: 1.18
+--- ncurses-6.5-20241123+/form/fld_dup.c 2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20241130/form/fld_dup.c 2024-11-30 21:40:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey *
++ * Copyright 2020,2024 Thomas E. Dickey *
+ * Copyright 1998-2010,2012 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -33,7 +33,7 @@
+
+ #include "form.priv.h"
+
+-MODULE_ID("$Id: fld_dup.c,v 1.18 2020/05/24 01:40:20 anonymous.maarten Exp $")
++MODULE_ID("$Id: fld_dup.c,v 1.19 2024/11/30 21:40:55 tom Exp $")
+
+ /*---------------------------------------------------------------------------
+ | Facility : libnform
+@@ -83,7 +83,7 @@
+ size_t len;
+
+ len = Total_Buffer_Size(New_Field);
+- if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)))
++ if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)) != NULL)
+ {
+ memcpy(New_Field->buf, field->buf, len);
+ returnField(New_Field);
+Index: menu/mf_common.h
+Prereq: 0.25
+--- ncurses-6.5-20241123+/menu/mf_common.h 2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241130/menu/mf_common.h 2024-11-30 21:41:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey *
++ * Copyright 2020,2024 Thomas E. Dickey *
+ * Copyright 1998-2005,2012 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -31,7 +31,7 @@
+ * Author: Juergen Pfeifer, 1995,1997 *
+ ****************************************************************************/
+
+-/* $Id: mf_common.h,v 0.25 2020/02/02 23:34:34 tom Exp $ */
++/* $Id: mf_common.h,v 0.26 2024/11/30 21:41:20 tom Exp $ */
+
+ /* Common internal header for menu and form library */
+
+@@ -64,7 +64,7 @@
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
+-#define MODULE_ID(id) /*nothing */
++#define MODULE_ID(id) /* nothing */
+ #endif
+
+ /* Maximum regular 8-bit character code */
+Index: ncurses/base/lib_addch.c
+Prereq: 1.142
+--- ncurses-6.5-20241123+/ncurses/base/lib_addch.c 2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/base/lib_addch.c 2024-11-30 21:18:07.000000000 +0000
+@@ -37,7 +37,7 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+
+-MODULE_ID("$Id: lib_addch.c,v 1.142 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.143 2024/11/30 21:18:07 tom Exp $")
+
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+
+@@ -456,7 +456,7 @@
+ s[1] == 0
+ )
+ || (
+- (isprint((int) t) && !iscntrl((int) t))
++ (isprint(UChar(t)) && !iscntrl(UChar(t)))
+ #if USE_WIDEC_SUPPORT
+ || ((sp == 0 || !sp->_legacy_coding) &&
+ (WINDOW_EXT(win, addch_used)
+Index: ncurses/curses.priv.h
+Prereq: 1.695
+--- ncurses-6.5-20241123+/ncurses/curses.priv.h 2024-11-23 18:40:45.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/curses.priv.h 2024-11-30 21:32:44.000000000 +0000
+@@ -35,7 +35,7 @@
+ ****************************************************************************/
+
+ /*
+- * $Id: curses.priv.h,v 1.695 2024/11/23 18:40:45 tom Exp $
++ * $Id: curses.priv.h,v 1.696 2024/11/30 21:32:44 tom Exp $
+ *
+ * curses.priv.h
+ *
+@@ -59,7 +59,7 @@
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
+-#define MODULE_ID(id) /*nothing*/
++#define MODULE_ID(id) /* nothing */
+ #endif
+
+ #include <stddef.h> /* for offsetof */
+Index: ncurses/tinfo/comp_expand.c
+Prereq: 1.35
+--- ncurses-6.5-20241123+/ncurses/tinfo/comp_expand.c 2023-04-28 20:59:06.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/tinfo/comp_expand.c 2024-11-30 21:24:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey *
++ * Copyright 2020-2023,2024 Thomas E. Dickey *
+ * Copyright 1998-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -36,7 +36,7 @@
+ #include <ctype.h>
+ #include <tic.h>
+
+-MODULE_ID("$Id: comp_expand.c,v 1.35 2023/04/28 20:59:06 tom Exp $")
++MODULE_ID("$Id: comp_expand.c,v 1.36 2024/11/30 21:24:57 tom Exp $")
+
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -129,7 +129,7 @@
+ if (dst != 0
+ && *dst == R_BRACE
+ && value < 127
+- && isprint((int) value)) {
++ && isprint(UChar(value))) {
+ ch = (int) value;
+ buffer[bufp++] = S_QUOTE;
+ if (ch == '\\'
+Index: ncurses/tinfo/hashed_db.c
+Prereq: 1.20
+--- ncurses-6.5-20241123+/ncurses/tinfo/hashed_db.c 2024-11-09 19:23:11.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/tinfo/hashed_db.c 2024-11-30 21:16:41.000000000 +0000
+@@ -37,7 +37,7 @@
+
+ #if USE_HASHED_DB
+
+-MODULE_ID("$Id: hashed_db.c,v 1.20 2024/11/09 19:23:11 tom Exp $")
++MODULE_ID("$Id: hashed_db.c,v 1.21 2024/11/30 21:16:41 tom Exp $")
+
+ #if HASHED_DB_API >= 2
+ static DBC *cursor;
+@@ -167,6 +167,8 @@
+ DB_HASH,
+ NULL)) == 0) {
+ code = errno;
++ } else {
++ code = 0;
+ }
+ #endif
+ if (result != NULL && make_connection(result, path, modify)) {
+Index: ncurses/trace/visbuf.c
+Prereq: 1.54
+--- ncurses-6.5-20241123+/ncurses/trace/visbuf.c 2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/trace/visbuf.c 2024-11-30 21:24:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2023 Thomas E. Dickey *
++ * Copyright 2019-2023,2024 Thomas E. Dickey *
+ * Copyright 2001-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -43,7 +43,7 @@
+ #include <tic.h>
+ #include <ctype.h>
+
+-MODULE_ID("$Id: visbuf.c,v 1.54 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: visbuf.c,v 1.55 2024/11/30 21:24:09 tom Exp $")
+
+ #define NUM_VISBUFS 4
+
+@@ -72,7 +72,7 @@
+ } else if (c == '"' || c == '\\') {
+ *tp++ = '\\';
+ *tp++ = (char) c;
+- } else if (is7bits((int) c) && (isgraph((int) c) || c == ' ')) {
++ } else if (is7bits(UChar(c)) && (isgraph(UChar(c)) || c == ' ')) {
+ *tp++ = (char) c;
+ } else if (c == '\n') {
+ *tp++ = '\\';
+Index: ncurses/win32con/win_driver.c
+Prereq: 1.75
+--- ncurses-6.5-20241123+/ncurses/win32con/win_driver.c 2024-07-20 17:04:48.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/win32con/win_driver.c 2024-11-28 00:17:49.000000000 +0000
+@@ -57,7 +57,7 @@
+
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+
+-MODULE_ID("$Id: win_driver.c,v 1.75 2024/07/20 17:04:48 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.76 2024/11/28 00:17:49 tom Exp $")
+
+ #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
+
+@@ -96,7 +96,8 @@
+ GenMap(VK_RIGHT, KEY_RIGHT),
+ GenMap(VK_DOWN, KEY_DOWN),
+ GenMap(VK_DELETE, KEY_DC),
+- GenMap(VK_INSERT, KEY_IC)
++ GenMap(VK_INSERT, KEY_IC),
++ GenMap(VK_TAB, KEY_BTAB)
+ };
+ static const LONG ansi_keys[] =
+ {
+@@ -109,7 +110,8 @@
+ GenMap(VK_RIGHT, 'M'),
+ GenMap(VK_DOWN, 'P'),
+ GenMap(VK_DELETE, 'S'),
+- GenMap(VK_INSERT, 'R')
++ GenMap(VK_INSERT, 'R'),
++ GenMap(VK_TAB, 'Z')
+ };
+ /* *INDENT-ON* */
+ #define N_INI ((int)array_length(keylist))
+@@ -2154,6 +2156,11 @@
+ & (SHIFT_PRESSED | CONTROL_PRESSED))) {
+ *buf = KEY_BACKSPACE;
+ }
++ } else if (vk == VK_TAB) {
++ if ((inp_rec.Event.KeyEvent.dwControlKeyState
++ & (SHIFT_PRESSED | CONTROL_PRESSED))) {
++ *buf = KEY_BTAB;
++ }
+ }
+ break;
+ } else if (inp_rec.EventType == MOUSE_EVENT) {
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241123+/package/debian-mingw/changelog 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/debian-mingw/changelog 2024-11-27 21:55:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241123) unstable; urgency=low
++ncurses6td (6.5+20241130) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2024 05:51:23 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 27 Nov 2024 16:55:07 -0500
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241123+/package/debian-mingw64/changelog 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/debian-mingw64/changelog 2024-11-27 21:55:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241123) unstable; urgency=low
++ncurses6td (6.5+20241130) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2024 05:51:23 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 27 Nov 2024 16:55:07 -0500
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.5-20241123+/package/debian/changelog 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/debian/changelog 2024-11-27 21:55:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241123) unstable; urgency=low
++ncurses6td (6.5+20241130) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2024 05:51:23 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 27 Nov 2024 16:55:07 -0500
+
+ ncurses6 (5.9+20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.677
+--- ncurses-6.5-20241123+/package/mingw-ncurses.nsi 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/mingw-ncurses.nsi 2024-11-27 21:55:07.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.677 2024/11/23 10:51:23 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.678 2024/11/27 21:55:07 tom Exp $
+
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY "2024"
+-!define VERSION_MMDD "1123"
++!define VERSION_MMDD "1130"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241123+/package/mingw-ncurses.spec 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/mingw-ncurses.spec 2024-11-27 21:55:07.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241123
++Release: 20241130
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241123+/package/ncurses.spec 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/ncurses.spec 2024-11-27 21:55:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241123
++Release: 20241130
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241123+/package/ncursest.spec 2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/ncursest.spec 2024-11-27 21:55:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241123
++Release: 20241130
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq: 1.168
+--- ncurses-6.5-20241123+/progs/infocmp.c 2024-11-23 19:54:44.000000000 +0000
++++ ncurses-6.5-20241130/progs/infocmp.c 2024-11-30 21:29:41.000000000 +0000
+@@ -43,7 +43,7 @@
+
+ #include <dump_entry.h>
+
+-MODULE_ID("$Id: infocmp.c,v 1.168 2024/11/23 19:54:44 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.169 2024/11/30 21:29:41 tom Exp $")
+
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -835,7 +835,7 @@
+ _nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH);
+ _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH);
+ } while
+- ((ep = strtok((char *) 0, ";")));
++ ((ep = strtok((char *) 0, ";")) != NULL);
+
+ dst[strlen(dst) - 1] = '\0';
+
+Index: progs/tic.c
+Prereq: 1.328
+--- ncurses-6.5-20241123+/progs/tic.c 2024-11-09 23:03:26.000000000 +0000
++++ ncurses-6.5-20241130/progs/tic.c 2024-11-30 21:29:07.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include <parametrized.h>
+ #include <transform.h>
+
+-MODULE_ID("$Id: tic.c,v 1.328 2024/11/09 23:03:26 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.329 2024/11/30 21:29:07 tom Exp $")
+
+ #define STDIN_NAME "<stdin>"
+
+@@ -231,7 +231,7 @@
+ && value > 0
+ && value != '\\' /* FIXME */
+ && value < 127
+- && isprint((int) value)) {
++ && isprint(UChar(value))) {
+ *d++ = S_QUOTE;
+ *d++ = (char) value;
+ *d++ = S_QUOTE;
+@@ -659,8 +659,8 @@
+ tried = outdir;
+ }
+
+- if ((outdir = _nc_home_terminfo())) {
+- if ((result = valid_db_path(outdir)) != 0) {
++ if ((outdir = _nc_home_terminfo()) != NULL) {
++ if ((result = valid_db_path(outdir)) != NULL) {
+ printf("%s\n", result);
+ free(result);
+ } else if (!specific) {
+@@ -2025,7 +2025,7 @@
+ _nc_warning("expected character after %% in %s", name);
+ break;
+ } else if (*s == 'p') {
+- if (*++s == '\0' || !isdigit((int) *s)) {
++ if (*++s == '\0' || !isdigit(UChar(*s))) {
+ _nc_warning("expected digit after %%p in %s", name);
+ return;
+ } else {
+Index: progs/tput.c
+Prereq: 1.105
+--- ncurses-6.5-20241123+/progs/tput.c 2024-11-23 19:38:51.000000000 +0000
++++ ncurses-6.5-20241130/progs/tput.c 2024-11-30 21:47:34.000000000 +0000
+@@ -47,7 +47,7 @@
+ #include <transform.h>
+ #include <tty_settings.h>
+
+-MODULE_ID("$Id: tput.c,v 1.105 2024/11/23 19:38:51 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.106 2024/11/30 21:47:34 tom Exp $")
+
+ #define PUTS(s) fputs(s, stdout)
+
+@@ -120,11 +120,11 @@
+ static char my_clear[] = "clear";
+
+ char *result = name;
+- if ((is_init = same_program(name, program ? PROG_INIT : my_init)))
++ if ((is_init = same_program(name, program ? PROG_INIT : my_init)) == TRUE)
+ result = my_init;
+- if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)))
++ if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)) == TRUE)
+ result = my_reset;
+- if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)))
++ if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)) == TRUE)
+ result = my_clear;
+ return result;
+ }
+Index: progs/tset.c
+Prereq: 1.137
+--- ncurses-6.5-20241123+/progs/tset.c 2024-11-23 19:39:01.000000000 +0000
++++ ncurses-6.5-20241130/progs/tset.c 2024-11-30 21:30:49.000000000 +0000
+@@ -98,7 +98,7 @@
+ char *ttyname(int fd);
+ #endif
+
+-MODULE_ID("$Id: tset.c,v 1.137 2024/11/23 19:39:01 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.138 2024/11/30 21:30:49 tom Exp $")
+
+ #ifndef environ
+ extern char **environ;
+@@ -574,7 +574,7 @@
+ * there's an /etc/ttys to look up device-to-type mappings in.
+ * Try ttyname(3); check for dialup or other mapping.
+ */
+- if ((t = getttynam(p))) {
++ if ((t = getttynam(p)) != NULL) {
+ ttype = t->ty_type;
+ goto map;
+ }
+Index: test/aclocal.m4
+Prereq: 1.229
+--- ncurses-6.5-20241123+/test/aclocal.m4 2024-11-09 23:15:41.000000000 +0000
++++ ncurses-6.5-20241130/test/aclocal.m4 2024-11-30 19:43:11.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization. *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.229 2024/11/09 23:15:41 tom Exp $
++dnl $Id: aclocal.m4,v 1.230 2024/11/30 19:43:11 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -3596,14 +3596,17 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
++dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
+ dnl ------------
+ AC_DEFUN([CF_PROG_LINT],
+ [
+ AC_CHECK_PROGS(LINT, lint cppcheck splint)
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++ test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++ ;;
+ (xcppcheck|x*/cppcheck)
+- test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++ test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ ;;
+ esac
+ AC_SUBST(LINT_OPTS)
+Index: test/back_ground.c
+Prereq: 1.12
+--- ncurses-6.5-20241123+/test/back_ground.c 2024-09-28 16:19:19.000000000 +0000
++++ ncurses-6.5-20241130/test/back_ground.c 2024-11-30 18:36:56.000000000 +0000
+@@ -26,7 +26,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: back_ground.c,v 1.12 2024/09/28 16:19:19 tom Exp $
++ * $Id: back_ground.c,v 1.14 2024/11/30 18:36:56 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -182,12 +182,12 @@
+ ," -a invoke assume_default_colors, repeat to use in init_pair"
+ #endif
+ ," -b XXX specify background color"
+- ," -c XXX specify background character"
++ ," -B XXX specify background character"
+ #if HAVE_USE_DEFAULT_COLORS
+ ," -d invoke use_default_colors, repeat to use in init_pair"
+ #endif
+ ," -f XXX specify foreground color"
+- ," -l FILE log window-dumps to this file"
++ ," -L FILE log window-dumps to this file"
+ ," -w fill background with stipple pattern"
+ ," -W CODE fill background with this Unicode value"
+ };
+@@ -215,7 +215,7 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:wW:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:W:ab:df:w")) != -1) {
+ switch (ch) {
+ #if HAVE_ASSUME_DEFAULT_COLORS
+ case 'a':
+@@ -225,7 +225,7 @@
+ case 'b':
+ default_bg = color_code(optarg);
+ break;
+- case 'c':
++ case 'B':
+ if (strlen(optarg) > 1) {
+ char *check = NULL;
+ long value = strtol(optarg, &check, 0);
+@@ -244,7 +244,7 @@
+ case 'f':
+ default_fg = color_code(optarg);
+ break;
+- case 'l':
++ case 'L':
+ if (!open_dump(optarg))
+ usage(FALSE);
+ break;
+Index: test/background.c
+Prereq: 1.27
+--- ncurses-6.5-20241123+/test/background.c 2024-09-22 22:34:49.000000000 +0000
++++ ncurses-6.5-20241130/test/background.c 2024-11-30 18:37:15.000000000 +0000
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: background.c,v 1.27 2024/09/22 22:34:49 tom Exp $
++ * $Id: background.c,v 1.29 2024/11/30 18:37:15 tom Exp $
+ */
+
+ #define NEED_COLOR_CODE 1
+@@ -143,12 +143,12 @@
+ ," -a invoke assume_default_colors, repeat to use in init_pair"
+ #endif
+ ," -b XXX specify background color"
+- ," -c XXX specify background character"
++ ," -B XXX specify background character"
+ #if HAVE_USE_DEFAULT_COLORS
+ ," -d invoke use_default_colors, repeat to use in init_pair"
+ #endif
+ ," -f XXX specify foreground color"
+- ," -l FILE log window-dumps to this file"
++ ," -L FILE log window-dumps to this file"
+ };
+ size_t n;
+
+@@ -174,7 +174,7 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:ab:df:")) != -1) {
+ switch (ch) {
+ #if HAVE_ASSUME_DEFAULT_COLORS
+ case 'a':
+@@ -184,7 +184,7 @@
+ case 'b':
+ default_bg = color_code(optarg);
+ break;
+- case 'c':
++ case 'B':
+ if (strlen(optarg) > 1) {
+ char *check = NULL;
+ long value = strtol(optarg, &check, 0);
+@@ -203,7 +203,7 @@
+ case 'f':
+ default_fg = color_code(optarg);
+ break;
+- case 'l':
++ case 'L':
+ if (!open_dump(optarg))
+ usage(FALSE);
+ break;
+Index: test/bs.c
+Prereq: 1.80
+--- ncurses-6.5-20241123+/test/bs.c 2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/bs.c 2024-11-30 16:47:02.000000000 +0000
+@@ -35,7 +35,7 @@
+ * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+ * v2.1 with ncurses mouse support, September 1995
+ *
+- * $Id: bs.c,v 1.80 2024/10/05 19:26:24 tom Exp $
++ * $Id: bs.c,v 1.81 2024/11/30 16:47:02 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -1193,7 +1193,7 @@
+ ,USAGE_COMMON
+ ,"Options:"
+ ," -b play a blitz game"
+- ," -c ships may be adjacent"
++ ," -p ships may be packed/adjacent"
+ ," -s play a salvo game"
+ };
+ size_t n;
+@@ -1212,7 +1212,7 @@
+ {
+ int ch;
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "bps")) != -1) {
+ switch (ch) {
+ case 'b':
+ blitz = 1;
+@@ -1230,7 +1230,7 @@
+ ExitProgram(EXIT_FAILURE);
+ }
+ break;
+- case 'c':
++ case 'p':
+ closepack = 1;
+ break;
+ case OPTS_VERSION:
+Index: test/cardfile.c
+Prereq: 1.52
+--- ncurses-6.5-20241123+/test/cardfile.c 2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/cardfile.c 2024-11-30 16:47:59.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+ * Author: Thomas E. Dickey
+ *
+- * $Id: cardfile.c,v 1.52 2024/10/05 19:26:24 tom Exp $
++ * $Id: cardfile.c,v 1.53 2024/11/30 16:47:59 tom Exp $
+ *
+ * File format: text beginning in column 1 is a title; other text is content.
+ */
+@@ -558,7 +558,7 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -c use color if terminal supports it"
++ ," -C use color if terminal supports it"
+ };
+ size_t n;
+ for (n = 0; n < SIZEOF(msg); n++)
+@@ -578,9 +578,9 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "c")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "C")) != -1) {
+ switch (ch) {
+- case 'c':
++ case 'C':
+ try_color = TRUE;
+ break;
+ case OPTS_VERSION:
+Index: test/color_content.c
+Prereq: 1.19
+--- ncurses-6.5-20241123+/test/color_content.c 2023-02-25 16:48:02.000000000 +0000
++++ ncurses-6.5-20241130/test/color_content.c 2024-11-30 18:31:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey *
++ * Copyright 2018-2023,2024 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.19 2023/02/25 16:48:02 tom Exp $
++ * $Id: color_content.c,v 1.21 2024/11/30 18:31:01 tom Exp $
+ */
+
+ #define NEED_TIME_H
+@@ -220,10 +220,10 @@
+ ,"Options:"
+ ," -f COLOR first color value to test (default: 0)"
+ ," -i interactive, showing test-progress"
+- ," -l COLOR last color value to test (default: max_colors-1)"
++ ," -F COLOR last color value to test (default: max_colors-1)"
+ ," -n do not initialize color pairs"
+ ," -p print data for color content instead of testing"
+- ," -r COUNT repeat for given count"
++ ," -r NUM repeat tests NUM times"
+ ," -s initialize pairs sequentially rather than random"
+ #if USE_EXTENDED_COLOR
+ ," -x use extended color pairs/values"
+@@ -243,7 +243,7 @@
+ {
+ int ch;
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) {
+ switch (ch) {
+ case 'f':
+ if ((f_opt = atoi(optarg)) <= 0)
+@@ -252,7 +252,7 @@
+ case 'i':
+ i_opt = 1;
+ break;
+- case 'l':
++ case 'F':
+ if ((l_opt = atoi(optarg)) <= 0)
+ usage(FALSE);
+ break;
+Index: test/combine.c
+Prereq: 1.23
+--- ncurses-6.5-20241123+/test/combine.c 2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241130/test/combine.c 2024-11-30 19:08:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2021,2022 Thomas E. Dickey *
++,* Copyright 2021-2022,2024 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: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $
++ * $Id: combine.c,v 1.25 2024/11/30 19:08:20 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -37,7 +37,7 @@
+ #include <dump_window.h>
+ #include <popup_msg.h>
+
+-static int c_opt;
++static int k_opt;
+ static int r_opt;
+
+ static int
+@@ -68,7 +68,7 @@
+ move(row, col);
+ printw("[U+%04X]", over_ch);
+ do {
+- if (c_opt) {
++ if (k_opt) {
+ wchar_t source[2];
+ cchar_t target;
+ attr_t attr = reverse ? A_REVERSE : A_NORMAL;
+@@ -191,8 +191,8 @@
+ ,"Demonstrate combining-characters."
+ ,""
+ ,"Options:"
+- ," -c use cchar_t data rather than wchar_t string"
+- ," -l FILE log window-dumps to this file"
++ ," -k use cchar_t data rather than wchar_t string"
++ ," -L FILE log window-dumps to this file"
+ ," -r draw even-numbered rows in reverse-video"
+ };
+ unsigned n;
+@@ -215,12 +215,12 @@
+ bool log_option = FALSE;
+ const char *dump_log = "combine.log";
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "cl:r")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "kL:r")) != -1) {
+ switch (ch) {
+- case 'c':
+- c_opt = TRUE;
++ case 'k':
++ k_opt = TRUE;
+ break;
+- case 'l':
++ case 'L':
+ log_option = TRUE;
+ if (!open_dump(optarg))
+ usage(FALSE);
+@@ -273,7 +273,7 @@
+ left_at = next_char(left_at);
+ break;
+ case 'c':
+- c_opt = !c_opt;
++ k_opt = !k_opt;
+ break;
+ case 'r':
+ r_opt = !r_opt;
+Index: test/configure
+--- ncurses-6.5-20241123+/test/configure 2024-11-09 23:17:16.000000000 +0000
++++ ncurses-6.5-20241130/test/configure 2024-11-30 19:43:38.000000000 +0000
+@@ -3131,12 +3131,15 @@
+ done
+
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++ test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++ ;;
+ (xcppcheck|x*/cppcheck)
+- test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++ test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ ;;
+ esac
+
+-echo "$as_me:3139: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3142: checking for \".PHONY\" make-support" >&5
+ echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
+ if test "${cf_cv_make_PHONY+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3191,14 +3194,14 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3194: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3197: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+ test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+ test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+
+-echo "$as_me:3201: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3204: checking if filesystem supports mixed-case filenames" >&5
+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
+ if test "${cf_cv_mixedcase+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3225,7 +3228,7 @@
+ fi
+
+ fi
+-echo "$as_me:3228: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3231: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3236,7 +3239,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3239: checking for $ac_word" >&5
++echo "$as_me:3242: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3251,7 +3254,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3254: found $ac_dir/$ac_word" >&5
++echo "$as_me:3257: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3259,10 +3262,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:3262: result: $CTAGS" >&5
++ echo "$as_me:3265: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:3265: result: no" >&5
++ echo "$as_me:3268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3273,7 +3276,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3276: checking for $ac_word" >&5
++echo "$as_me:3279: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3288,7 +3291,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3291: found $ac_dir/$ac_word" >&5
++echo "$as_me:3294: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3296,10 +3299,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:3299: result: $ETAGS" >&5
++ echo "$as_me:3302: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:3302: result: no" >&5
++ echo "$as_me:3305: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3308,7 +3311,7 @@
+
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:3311: checking for $ac_word" >&5
++echo "$as_me:3314: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3323,7 +3326,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:3326: found $ac_dir/$ac_word" >&5
++echo "$as_me:3329: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3332,17 +3335,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:3335: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:3338: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:3338: result: no" >&5
++ echo "$as_me:3341: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$cf_cv_mixedcase" = yes ; then
+ # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:3345: checking for $ac_word" >&5
++echo "$as_me:3348: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3357,7 +3360,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:3360: found $ac_dir/$ac_word" >&5
++echo "$as_me:3363: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3366,10 +3369,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:3369: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:3372: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:3372: result: no" >&5
++ echo "$as_me:3375: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3389,14 +3392,14 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:3392: checking if -lm needed for math functions" >&5
++echo "$as_me:3395: 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 3399 "configure"
++#line 3402 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3412,16 +3415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3418: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3418: \$? = $ac_status" >&5
++ echo "$as_me:3421: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3421: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3424: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3424: \$? = $ac_status" >&5
++ echo "$as_me:3427: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -3431,7 +3434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3434: result: $cf_cv_need_libm" >&5
++echo "$as_me:3437: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -3439,14 +3442,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:3442: checking if -lm is available for math functions" >&5
++ echo "$as_me:3445: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3449 "configure"
++#line 3452 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3462,16 +3465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3468: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3468: \$? = $ac_status" >&5
++ echo "$as_me:3471: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3474: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3474: \$? = $ac_status" >&5
++ echo "$as_me:3477: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -3481,7 +3484,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3484: result: $cf_cv_have_libm" >&5
++echo "$as_me:3487: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -3536,7 +3539,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+
+-echo "$as_me:3539: checking for fgrep" >&5
++echo "$as_me:3542: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3548,7 +3551,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3551: checking for $ac_word" >&5
++echo "$as_me:3554: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3565,7 +3568,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_FGREP="$ac_dir/$ac_word"
+- echo "$as_me:3568: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3571: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3576,10 +3579,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:3579: result: $FGREP" >&5
++ echo "$as_me:3582: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:3582: result: no" >&5
++ echo "$as_me:3585: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3587,16 +3590,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3590: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3593: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:3595: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3598: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:3599: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3602: 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.
+@@ -3613,17 +3616,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:3616: result: $enable_stdnoreturn" >&5
++echo "$as_me:3619: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3620: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3623: 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 3626 "configure"
++#line 3629 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -3639,16 +3642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3645: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3645: \$? = $ac_status" >&5
++ echo "$as_me:3648: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3648: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3651: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3651: \$? = $ac_status" >&5
++ echo "$as_me:3654: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -3659,7 +3662,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:3662: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3665: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -3698,10 +3701,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:3701: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:3704: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 3704 "${as_me:-configure}"
++#line 3707 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3751,12 +3754,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:3757: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3757: \$? = $ac_status" >&5
++ echo "$as_me:3760: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:3759: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:3762: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -3815,7 +3818,7 @@
+ rm -rf ./conftest*
+ fi
+
+-echo "$as_me:3818: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3821: 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.
+@@ -3825,7 +3828,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:3828: result: $enable_string_hacks" >&5
++echo "$as_me:3831: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3834,15 +3837,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:3837: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:3840: 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:3839: checking for strlcat" >&5
++ echo "$as_me:3842: 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 3845 "configure"
++#line 3848 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3873,16 +3876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3879: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3879: \$? = $ac_status" >&5
++ echo "$as_me:3882: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3882: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3885: \$? = $ac_status" >&5
++ echo "$as_me:3888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -3892,7 +3895,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3895: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3898: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -3902,7 +3905,7 @@
+
+ else
+
+- echo "$as_me:3905: checking for strlcat in -lbsd" >&5
++ echo "$as_me:3908: 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
+@@ -3910,7 +3913,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3913 "configure"
++#line 3916 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -3929,16 +3932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3935: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3935: \$? = $ac_status" >&5
++ echo "$as_me:3938: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3938: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3941: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3941: \$? = $ac_status" >&5
++ echo "$as_me:3944: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3949,7 +3952,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3952: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3955: 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
+
+@@ -3972,23 +3975,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3975: checking for $ac_header" >&5
++echo "$as_me:3978: 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 3981 "configure"
++#line 3984 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3985: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3988: \"$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:3991: \$? = $ac_status" >&5
++ echo "$as_me:3994: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4007,7 +4010,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:4010: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:4013: 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
+@@ -4028,13 +4031,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:4031: checking for $ac_func" >&5
++echo "$as_me:4034: 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 4037 "configure"
++#line 4040 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4065,16 +4068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4071: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4071: \$? = $ac_status" >&5
++ echo "$as_me:4074: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:4074: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4077: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4077: \$? = $ac_status" >&5
++ echo "$as_me:4080: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -4084,7 +4087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4087: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4090: 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
+@@ -4096,14 +4099,14 @@
+
+ fi
+
+-echo "$as_me:4099: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:4102: 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 4106 "configure"
++#line 4109 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4122,16 +4125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4128: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4128: \$? = $ac_status" >&5
++ echo "$as_me:4131: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4131: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4134: \$? = $ac_status" >&5
++ echo "$as_me:4137: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -4142,7 +4145,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4145: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4148: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4184,14 +4187,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:4187: checking if this is the GNU C library" >&5
++echo "$as_me:4190: 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 4194 "configure"
++#line 4197 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4210,16 +4213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4216: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4216: \$? = $ac_status" >&5
++ echo "$as_me:4219: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4219: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4222: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4222: \$? = $ac_status" >&5
++ echo "$as_me:4225: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -4230,7 +4233,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4233: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4236: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4238,7 +4241,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:4241: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:4244: 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
+@@ -4250,7 +4253,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4253 "configure"
++#line 4256 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4269,16 +4272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4275: \$? = $ac_status" >&5
++ echo "$as_me:4278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4278: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4281: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4281: \$? = $ac_status" >&5
++ echo "$as_me:4284: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -4290,12 +4293,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:4293: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4296: 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:4298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:4301: 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
+@@ -4400,7 +4403,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4403 "configure"
++#line 4406 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -4420,16 +4423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4426: \$? = $ac_status" >&5
++ echo "$as_me:4429: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4429: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4432: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4432: \$? = $ac_status" >&5
++ echo "$as_me:4435: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4440,7 +4443,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4443: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4446: 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
+@@ -4449,14 +4452,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:4452: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:4455: 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 4459 "configure"
++#line 4462 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4471,16 +4474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4477: \$? = $ac_status" >&5
++ echo "$as_me:4480: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4480: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4483: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4483: \$? = $ac_status" >&5
++ echo "$as_me:4486: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4587,7 +4590,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4590 "configure"
++#line 4593 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4602,16 +4605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4608: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4608: \$? = $ac_status" >&5
++ echo "$as_me:4611: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4614: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4614: \$? = $ac_status" >&5
++ echo "$as_me:4617: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4626,12 +4629,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4629: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4632: 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:4634: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:4637: 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
+@@ -4641,7 +4644,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4644 "configure"
++#line 4647 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4656,16 +4659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4662: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4662: \$? = $ac_status" >&5
++ echo "$as_me:4665: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4665: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4668: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4668: \$? = $ac_status" >&5
++ echo "$as_me:4671: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -4676,7 +4679,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4679: result: $cf_cv_default_source" >&5
++echo "$as_me:4682: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -4716,16 +4719,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:4719: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4722: 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}:4725: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4728: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4728 "configure"
++#line 4731 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4740,16 +4743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4746: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4746: \$? = $ac_status" >&5
++ echo "$as_me:4749: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4749: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4752: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4752: \$? = $ac_status" >&5
++ echo "$as_me:4755: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -4770,7 +4773,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4773 "configure"
++#line 4776 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4785,16 +4788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4791: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4791: \$? = $ac_status" >&5
++ echo "$as_me:4794: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4794: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4797: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4797: \$? = $ac_status" >&5
++ echo "$as_me:4800: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4805,7 +4808,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:4808: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4811: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4813,10 +4816,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:4816: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4819: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4819 "configure"
++#line 4822 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4831,16 +4834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4837: \$? = $ac_status" >&5
++ echo "$as_me:4840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4840: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4843: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4843: \$? = $ac_status" >&5
++ echo "$as_me:4846: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4856,7 +4859,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4859: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4862: 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
+@@ -4973,7 +4976,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:4976: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:4979: 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
+@@ -5005,14 +5008,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:5008: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5011: 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 5015 "configure"
++#line 5018 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5030,16 +5033,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5033: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5036: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5036: \$? = $ac_status" >&5
++ echo "$as_me:5039: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5039: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5042: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5042: \$? = $ac_status" >&5
++ echo "$as_me:5045: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5051,7 +5054,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5054 "configure"
++#line 5057 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5069,16 +5072,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5075: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5075: \$? = $ac_status" >&5
++ echo "$as_me:5078: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5078: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5081: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5081: \$? = $ac_status" >&5
++ echo "$as_me:5084: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5093,7 +5096,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5096: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5099: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5253,16 +5256,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:5256: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5259: 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}:5262: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5265: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5265 "configure"
++#line 5268 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5277,16 +5280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5283: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5283: \$? = $ac_status" >&5
++ echo "$as_me:5286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5286: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5289: \$? = $ac_status" >&5
++ echo "$as_me:5292: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -5307,7 +5310,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5310 "configure"
++#line 5313 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5322,16 +5325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5328: \$? = $ac_status" >&5
++ echo "$as_me:5331: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5331: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5334: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5334: \$? = $ac_status" >&5
++ echo "$as_me:5337: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5342,7 +5345,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:5345: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5348: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5350,10 +5353,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:5353: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5356: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5356 "configure"
++#line 5359 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5368,16 +5371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5374: \$? = $ac_status" >&5
++ echo "$as_me:5377: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5377: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5380: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5380: \$? = $ac_status" >&5
++ echo "$as_me:5383: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5393,7 +5396,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5396: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5399: 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
+@@ -5506,10 +5509,10 @@
+ if test "$cf_cv_xopen_source" = no ; then
+ test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+
+-echo "${as_me:-configure}:5509: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5512: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5512 "configure"
++#line 5515 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5527,23 +5530,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5533: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5533: \$? = $ac_status" >&5
++ echo "$as_me:5536: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5539: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5539: \$? = $ac_status" >&5
++ echo "$as_me:5542: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:5546: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:5549: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -5566,7 +5569,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}:5569: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5572: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -5578,7 +5581,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}:5581: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5584: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5666,7 +5669,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:5669: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5672: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5676,7 +5679,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:5679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5682: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5686,7 +5689,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}:5689: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5692: 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"
+@@ -5698,10 +5701,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:5701: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:5704: 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 5704 "configure"
++#line 5707 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5716,16 +5719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5722: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5722: \$? = $ac_status" >&5
++ echo "$as_me:5725: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5725: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5728: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5728: \$? = $ac_status" >&5
++ echo "$as_me:5731: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5734,12 +5737,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:5737: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:5740: 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 5742 "configure"
++#line 5745 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5754,16 +5757,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5760: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5760: \$? = $ac_status" >&5
++ echo "$as_me:5763: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5763: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5766: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5766: \$? = $ac_status" >&5
++ echo "$as_me:5769: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5774,19 +5777,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:5777: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:5780: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:5782: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5785: 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 5789 "configure"
++#line 5792 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5804,16 +5807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5807: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5810: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5810: \$? = $ac_status" >&5
++ echo "$as_me:5813: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5813: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5816: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5816: \$? = $ac_status" >&5
++ echo "$as_me:5819: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5825,7 +5828,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5828 "configure"
++#line 5831 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5843,16 +5846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5849: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5849: \$? = $ac_status" >&5
++ echo "$as_me:5852: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5852: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5855: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5855: \$? = $ac_status" >&5
++ echo "$as_me:5858: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5867,7 +5870,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5870: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5873: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -6014,13 +6017,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:6017: checking for ANSI C header files" >&5
++echo "$as_me:6020: 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 6023 "configure"
++#line 6026 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -6028,13 +6031,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:6031: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6034: \"$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:6037: \$? = $ac_status" >&5
++ echo "$as_me:6040: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6056,7 +6059,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 6059 "configure"
++#line 6062 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6074,7 +6077,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 6077 "configure"
++#line 6080 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6095,7 +6098,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6098 "configure"
++#line 6101 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6121,15 +6124,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6124: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6127: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6127: \$? = $ac_status" >&5
++ echo "$as_me:6130: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6129: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6132: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6132: \$? = $ac_status" >&5
++ echo "$as_me:6135: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6142,7 +6145,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6145: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6148: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6158,28 +6161,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6161: checking for $ac_header" >&5
++echo "$as_me:6164: 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 6167 "configure"
++#line 6170 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6176: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6176: \$? = $ac_status" >&5
++ echo "$as_me:6179: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6179: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6182: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6182: \$? = $ac_status" >&5
++ echo "$as_me:6185: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6189,7 +6192,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6195: 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
+@@ -6199,13 +6202,13 @@
+ fi
+ done
+
+-echo "$as_me:6202: checking whether exit is declared" >&5
++echo "$as_me:6205: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6208 "configure"
++#line 6211 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6220,16 +6223,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6226: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6226: \$? = $ac_status" >&5
++ echo "$as_me:6229: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6229: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6232: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6232: \$? = $ac_status" >&5
++ echo "$as_me:6235: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6239,10 +6242,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6242: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6245: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+
+-echo "$as_me:6245: checking for signal global datatype" >&5
++echo "$as_me:6248: 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
+@@ -6254,7 +6257,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6257 "configure"
++#line 6260 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6278,16 +6281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6284: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6284: \$? = $ac_status" >&5
++ echo "$as_me:6287: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6287: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6290: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6290: \$? = $ac_status" >&5
++ echo "$as_me:6293: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6301,7 +6304,7 @@
+
+ fi
+
+-echo "$as_me:6304: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6307: 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
+@@ -6310,14 +6313,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:6313: checking if SIGWINCH is defined" >&5
++echo "$as_me:6316: 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 6320 "configure"
++#line 6323 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6332,23 +6335,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6338: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6338: \$? = $ac_status" >&5
++ echo "$as_me:6341: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6341: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6344: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6344: \$? = $ac_status" >&5
++ echo "$as_me:6347: \$? = $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 6351 "configure"
++#line 6354 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6366,16 +6369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6369: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6372: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6372: \$? = $ac_status" >&5
++ echo "$as_me:6375: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6375: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6378: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6378: \$? = $ac_status" >&5
++ echo "$as_me:6381: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -6389,11 +6392,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6392: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6395: 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:6396: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6399: 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
+@@ -6404,7 +6407,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6407 "configure"
++#line 6410 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6426,16 +6429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6432: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6432: \$? = $ac_status" >&5
++ echo "$as_me:6435: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6435: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6438: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6438: \$? = $ac_status" >&5
++ echo "$as_me:6441: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -6449,7 +6452,7 @@
+ done
+
+ fi
+-echo "$as_me:6452: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6455: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6459,13 +6462,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:6462: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6465: 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 6468 "configure"
++#line 6471 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6479,16 +6482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6482: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6485: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6485: \$? = $ac_status" >&5
++ echo "$as_me:6488: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6488: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6491: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6491: \$? = $ac_status" >&5
++ echo "$as_me:6494: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -6499,7 +6502,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6502: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6505: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -6509,7 +6512,7 @@
+
+ fi
+
+-echo "$as_me:6512: checking if you want to use pkg-config" >&5
++echo "$as_me:6515: checking if you want to use pkg-config" >&5
+ echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
+
+ # Check whether --with-pkg-config or --without-pkg-config was given.
+@@ -6519,7 +6522,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:6522: result: $cf_pkg_config" >&5
++echo "$as_me:6525: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -6531,7 +6534,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:6534: checking for $ac_word" >&5
++echo "$as_me:6537: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6548,7 +6551,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+- echo "$as_me:6551: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6554: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6559,10 +6562,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:6562: result: $PKG_CONFIG" >&5
++ echo "$as_me:6565: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:6565: result: no" >&5
++ echo "$as_me:6568: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6571,7 +6574,7 @@
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:6574: checking for $ac_word" >&5
++echo "$as_me:6577: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6588,7 +6591,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+- echo "$as_me:6591: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6594: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6600,10 +6603,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:6603: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:6606: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:6606: result: no" >&5
++ echo "$as_me:6609: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6644,18 +6647,18 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6647: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:6650: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ elif test "x$cf_pkg_config" != xno ; then
+- { echo "$as_me:6654: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:6657: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+
+-echo "$as_me:6658: checking if you want to see long compiling messages" >&5
++echo "$as_me:6661: 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.
+@@ -6689,10 +6692,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:6692: result: $enableval" >&5
++echo "$as_me:6695: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:6695: checking for an installation directory prefix" >&5
++echo "$as_me:6698: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -6705,10 +6708,10 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:6708: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:6711: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
+-echo "$as_me:6711: checking if installation directory prefix should be merged" >&5
++echo "$as_me:6714: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -6725,7 +6728,7 @@
+ cf_install_prefix=no
+
+ fi;
+-echo "$as_me:6728: result: $cf_install_prefix" >&5
++echo "$as_me:6731: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+
+ if test "$cf_install_prefix" = yes ; then
+@@ -6734,7 +6737,7 @@
+ MERGE_PREFIX=''
+ fi
+
+-echo "$as_me:6737: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6740: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -6744,10 +6747,10 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6747: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6750: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+
+-echo "$as_me:6750: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6753: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6764,10 +6767,10 @@
+ cf_enable_widec=yes
+
+ fi;
+-echo "$as_me:6767: result: $cf_enable_widec" >&5
++echo "$as_me:6770: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+
+-echo "$as_me:6770: checking for specific curses-directory" >&5
++echo "$as_me:6773: checking for specific curses-directory" >&5
+ echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+
+ # Check whether --with-curses-dir or --without-curses-dir was given.
+@@ -6777,7 +6780,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6780: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6783: result: $cf_cv_curses_dir" >&5
+ echo "${ECHO_T}$cf_cv_curses_dir" >&6
+
+ if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
+@@ -6806,7 +6809,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6809: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:6812: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -6842,7 +6845,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6845 "configure"
++#line 6848 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6854,16 +6857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6860: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6860: \$? = $ac_status" >&5
++ echo "$as_me:6863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6863: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6866: \$? = $ac_status" >&5
++ echo "$as_me:6869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6880,7 +6883,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}:6883: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6886: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6916,7 +6919,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}:6919: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6922: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -6929,7 +6932,7 @@
+
+ cf_cv_screen=curses
+
+-echo "$as_me:6932: checking for specified curses library type" >&5
++echo "$as_me:6935: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+
+ # Check whether --with-screen or --without-screen was given.
+@@ -6973,13 +6976,13 @@
+ fi;
+ fi;
+
+-echo "$as_me:6976: result: $cf_cv_screen" >&5
++echo "$as_me:6979: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+
+ case $cf_cv_screen in
+ (curses|curses_*)
+
+-echo "$as_me:6982: checking for extra include directories" >&5
++echo "$as_me:6985: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7005,7 +7008,7 @@
+ esac
+
+ fi
+-echo "$as_me:7008: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7011: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -7015,7 +7018,7 @@
+
+ fi
+
+-echo "$as_me:7018: checking if we have identified curses headers" >&5
++echo "$as_me:7021: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7027,7 +7030,7 @@
+ curses.h ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7030 "configure"
++#line 7033 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7039,16 +7042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7045: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7045: \$? = $ac_status" >&5
++ echo "$as_me:7048: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7048: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7051: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7051: \$? = $ac_status" >&5
++ echo "$as_me:7054: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7059,11 +7062,11 @@
+ done
+
+ fi
+-echo "$as_me:7062: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7065: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+
+ if test "$cf_cv_ncurses_header" = none ; then
+- { { echo "$as_me:7066: error: No curses header-files found" >&5
++ { { echo "$as_me:7069: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7073,23 +7076,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7076: checking for $ac_header" >&5
++echo "$as_me:7079: 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 7082 "configure"
++#line 7085 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7086: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7089: \"$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:7092: \$? = $ac_status" >&5
++ echo "$as_me:7095: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7108,7 +7111,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7111: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7114: 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
+@@ -7118,7 +7121,7 @@
+ fi
+ done
+
+-echo "$as_me:7121: checking for terminfo header" >&5
++echo "$as_me:7124: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7136,7 +7139,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7139 "configure"
++#line 7142 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7151,16 +7154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7154: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7157: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7157: \$? = $ac_status" >&5
++ echo "$as_me:7160: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7160: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7163: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7163: \$? = $ac_status" >&5
++ echo "$as_me:7166: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -7176,7 +7179,7 @@
+ done
+
+ fi
+-echo "$as_me:7179: result: $cf_cv_term_header" >&5
++echo "$as_me:7182: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7208,7 +7211,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7211: checking for ncurses version" >&5
++echo "$as_me:7214: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7234,10 +7237,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:7237: \"$cf_try\"") >&5
++ { (eval echo "$as_me:7240: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7240: \$? = $ac_status" >&5
++ echo "$as_me:7243: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7247,7 +7250,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7250 "configure"
++#line 7253 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7274,15 +7277,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7280: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7280: \$? = $ac_status" >&5
++ echo "$as_me:7283: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7282: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7285: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7285: \$? = $ac_status" >&5
++ echo "$as_me:7288: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7296,17 +7299,17 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:7299: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7302: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:7306: checking if we have identified curses libraries" >&5
++echo "$as_me:7309: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7309 "configure"
++#line 7312 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7318,16 +7321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7324: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7324: \$? = $ac_status" >&5
++ echo "$as_me:7327: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7330: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7330: \$? = $ac_status" >&5
++ echo "$as_me:7333: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7336,13 +7339,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7339: result: $cf_result" >&5
++echo "$as_me:7342: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+- echo "$as_me:7345: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:7348: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7350,7 +7353,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7353 "configure"
++#line 7356 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7369,16 +7372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7375: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7375: \$? = $ac_status" >&5
++ echo "$as_me:7378: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7378: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7381: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7381: \$? = $ac_status" >&5
++ echo "$as_me:7384: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7389,7 +7392,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7392: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7395: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+
+@@ -7419,7 +7422,7 @@
+ # term.h) for cur_colr
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+- echo "$as_me:7422: checking for initscr in -lcur_colr" >&5
++ echo "$as_me:7425: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7427,7 +7430,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7430 "configure"
++#line 7433 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7446,16 +7449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7452: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7452: \$? = $ac_status" >&5
++ echo "$as_me:7455: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7455: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7458: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7458: \$? = $ac_status" >&5
++ echo "$as_me:7461: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7466,7 +7469,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7469: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7472: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+
+@@ -7490,7 +7493,7 @@
+
+ else
+
+- echo "$as_me:7493: checking for initscr in -lHcurses" >&5
++ echo "$as_me:7496: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7498,7 +7501,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7501 "configure"
++#line 7504 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7517,16 +7520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7520: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7523: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7523: \$? = $ac_status" >&5
++ echo "$as_me:7526: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7526: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7529: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7529: \$? = $ac_status" >&5
++ echo "$as_me:7532: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7537,7 +7540,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7540: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7543: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+
+@@ -7595,7 +7598,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}:7598: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7601: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7624,7 +7627,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}:7627: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7630: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7655,7 +7658,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}:7658: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7661: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7690,7 +7693,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}:7693: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7696: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7734,13 +7737,13 @@
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+- echo "$as_me:7737: checking for tgoto" >&5
++ echo "$as_me:7740: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7743 "configure"
++#line 7746 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7771,16 +7774,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7777: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7777: \$? = $ac_status" >&5
++ echo "$as_me:7780: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7780: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7783: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7783: \$? = $ac_status" >&5
++ echo "$as_me:7786: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_tgoto=yes
+ else
+@@ -7790,7 +7793,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7793: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7796: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+ cf_term_lib=predefined
+@@ -7799,7 +7802,7 @@
+ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ do
+ as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7802: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7805: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7807,7 +7810,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7810 "configure"
++#line 7813 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7826,16 +7829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7829: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7832: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7832: \$? = $ac_status" >&5
++ echo "$as_me:7835: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7835: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7838: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7838: \$? = $ac_status" >&5
++ echo "$as_me:7841: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -7846,7 +7849,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7849: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7852: 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
+
+@@ -7869,10 +7872,10 @@
+ do
+ LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+- echo "$as_me:7872: checking if we can link with $cf_curs_lib library" >&5
++ echo "$as_me:7875: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7875 "configure"
++#line 7878 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7884,16 +7887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7887: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7890: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7890: \$? = $ac_status" >&5
++ echo "$as_me:7893: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7893: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7896: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7896: \$? = $ac_status" >&5
++ echo "$as_me:7899: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7902,16 +7905,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7905: result: $cf_result" >&5
++ echo "$as_me:7908: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ test "$cf_result" = yes && break
+ elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ cf_result=no
+ elif test "$cf_term_lib" != predefined ; then
+- echo "$as_me:7911: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++ echo "$as_me:7914: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7914 "configure"
++#line 7917 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7923,16 +7926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7929: \$? = $ac_status" >&5
++ echo "$as_me:7932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7932: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7935: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7935: \$? = $ac_status" >&5
++ echo "$as_me:7938: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -7941,7 +7944,7 @@
+
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7944 "configure"
++#line 7947 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7953,16 +7956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7959: \$? = $ac_status" >&5
++ echo "$as_me:7962: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7962: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7965: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7965: \$? = $ac_status" >&5
++ echo "$as_me:7968: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7974,13 +7977,13 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7977: result: $cf_result" >&5
++ echo "$as_me:7980: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ test "$cf_result" != error && break
+ fi
+ done
+ fi
+- test "$cf_curs_lib" = unknown && { { echo "$as_me:7983: error: no curses library found" >&5
++ test "$cf_curs_lib" = unknown && { { echo "$as_me:7986: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7992,23 +7995,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7995: checking for $ac_header" >&5
++echo "$as_me:7998: 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 8001 "configure"
++#line 8004 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8008: \"$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:8011: \$? = $ac_status" >&5
++ echo "$as_me:8014: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8027,7 +8030,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8033: 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
+@@ -8037,7 +8040,7 @@
+ fi
+ done
+
+-echo "$as_me:8040: checking for multibyte character support" >&5
++echo "$as_me:8043: 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
+@@ -8045,7 +8048,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8048 "configure"
++#line 8051 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -8062,16 +8065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8068: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8068: \$? = $ac_status" >&5
++ echo "$as_me:8071: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8071: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8074: \$? = $ac_status" >&5
++ echo "$as_me:8077: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -8083,12 +8086,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:8086: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8089: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8091 "configure"
++#line 8094 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8101,16 +8104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8104: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8107: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8107: \$? = $ac_status" >&5
++ echo "$as_me:8110: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8110: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8113: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8113: \$? = $ac_status" >&5
++ echo "$as_me:8116: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8124,7 +8127,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8127 "configure"
++#line 8130 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8137,16 +8140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8143: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8143: \$? = $ac_status" >&5
++ echo "$as_me:8146: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8149: \$? = $ac_status" >&5
++ echo "$as_me:8152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8163,9 +8166,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:8166: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8169: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:8168: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8171: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8256,7 +8259,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}:8259: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8262: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -8264,7 +8267,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8267 "configure"
++#line 8270 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8277,21 +8280,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8283: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8283: \$? = $ac_status" >&5
++ echo "$as_me:8286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8286: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8289: \$? = $ac_status" >&5
++ echo "$as_me:8292: \$? = $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}:8294: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8297: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8309,7 +8312,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:8312: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8315: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -8384,13 +8387,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}:8387: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8390: 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 8393 "configure"
++#line 8396 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8403,21 +8406,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8409: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8409: \$? = $ac_status" >&5
++ echo "$as_me:8412: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8412: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8415: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8415: \$? = $ac_status" >&5
++ echo "$as_me:8418: \$? = $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}:8420: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8423: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -8459,7 +8462,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8462: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8465: 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
+@@ -8497,7 +8500,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8500 "configure"
++#line 8503 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8509,16 +8512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8515: \$? = $ac_status" >&5
++ echo "$as_me:8518: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8518: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8521: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8521: \$? = $ac_status" >&5
++ echo "$as_me:8524: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8535,7 +8538,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}:8538: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8541: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8571,7 +8574,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}:8574: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8577: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -8601,13 +8604,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:8604: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:8607: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+- echo "$as_me:8607: result: yes" >&5
++ echo "$as_me:8610: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:8610: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:8613: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ cf_have_ncuconfig=unknown
+
+@@ -8740,7 +8743,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8743 "configure"
++#line 8746 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8752,37 +8755,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8758: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8758: \$? = $ac_status" >&5
++ echo "$as_me:8761: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8761: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8764: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8764: \$? = $ac_status" >&5
++ echo "$as_me:8767: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8770 "configure"
++#line 8773 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int main(void)
+ { const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:8777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8780: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8780: \$? = $ac_status" >&5
++ echo "$as_me:8783: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8782: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8785: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8785: \$? = $ac_status" >&5
++ echo "$as_me:8788: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8956,7 +8959,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8959 "configure"
++#line 8962 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8968,37 +8971,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8974: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8974: \$? = $ac_status" >&5
++ echo "$as_me:8977: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8977: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8980: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8980: \$? = $ac_status" >&5
++ echo "$as_me:8983: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8986 "configure"
++#line 8989 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int main(void)
+ { const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:8993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8996: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8996: \$? = $ac_status" >&5
++ echo "$as_me:8999: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9001: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9001: \$? = $ac_status" >&5
++ echo "$as_me:9004: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -9015,7 +9018,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:9018: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:9021: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ if test "$cf_have_ncuconfig" != "yes"
+@@ -9031,7 +9034,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:9034: checking for terminfo header" >&5
++echo "$as_me:9037: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9049,7 +9052,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9052 "configure"
++#line 9055 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9064,16 +9067,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9070: \$? = $ac_status" >&5
++ echo "$as_me:9073: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9073: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9076: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9076: \$? = $ac_status" >&5
++ echo "$as_me:9079: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9089,7 +9092,7 @@
+ done
+
+ fi
+-echo "$as_me:9092: result: $cf_cv_term_header" >&5
++echo "$as_me:9095: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9124,7 +9127,7 @@
+ fi
+
+ else
+- echo "$as_me:9127: result: no" >&5
++ echo "$as_me:9130: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -9140,7 +9143,7 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:9143: checking for $ac_word" >&5
++echo "$as_me:9146: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9155,7 +9158,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:9158: found $ac_dir/$ac_word" >&5
++echo "$as_me:9161: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9163,10 +9166,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:9166: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:9169: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9169: result: no" >&5
++ echo "$as_me:9172: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9179,7 +9182,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:9182: checking for $ac_word" >&5
++echo "$as_me:9185: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9194,7 +9197,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:9197: found $ac_dir/$ac_word" >&5
++echo "$as_me:9200: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9202,10 +9205,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:9205: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:9208: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9208: result: no" >&5
++ echo "$as_me:9211: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9362,7 +9365,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:9365: checking if we have identified curses headers" >&5
++echo "$as_me:9368: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9374,7 +9377,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9377 "configure"
++#line 9380 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9386,16 +9389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9392: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9392: \$? = $ac_status" >&5
++ echo "$as_me:9395: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9395: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9398: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9398: \$? = $ac_status" >&5
++ echo "$as_me:9401: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9406,11 +9409,11 @@
+ done
+
+ fi
+-echo "$as_me:9409: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9412: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+
+ if test "$cf_cv_ncurses_header" = none ; then
+- { { echo "$as_me:9413: error: No curses header-files found" >&5
++ { { echo "$as_me:9416: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9420,23 +9423,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9423: checking for $ac_header" >&5
++echo "$as_me:9426: 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 9429 "configure"
++#line 9432 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9433: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9436: \"$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:9439: \$? = $ac_status" >&5
++ echo "$as_me:9442: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9455,7 +9458,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9458: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9461: 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
+@@ -9511,7 +9514,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9514 "configure"
++#line 9517 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9523,16 +9526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9529: \$? = $ac_status" >&5
++ echo "$as_me:9532: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9532: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9535: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9535: \$? = $ac_status" >&5
++ echo "$as_me:9538: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9549,7 +9552,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}:9552: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9555: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9568,7 +9571,7 @@
+
+ }
+
+-echo "$as_me:9571: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9574: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9580,7 +9583,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9583 "configure"
++#line 9586 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9604,16 +9607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9610: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9610: \$? = $ac_status" >&5
++ echo "$as_me:9613: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9613: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9616: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9616: \$? = $ac_status" >&5
++ echo "$as_me:9619: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -9628,14 +9631,14 @@
+ done
+
+ fi
+-echo "$as_me:9631: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9634: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+
+ if test "$cf_cv_ncurses_h" != no ; then
+ cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+
+-echo "$as_me:9638: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9641: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9756,7 +9759,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9759 "configure"
++#line 9762 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9768,16 +9771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9774: \$? = $ac_status" >&5
++ echo "$as_me:9777: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9780: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9780: \$? = $ac_status" >&5
++ echo "$as_me:9783: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9794,7 +9797,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}:9797: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9800: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9817,7 +9820,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9820 "configure"
++#line 9823 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9841,16 +9844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9844: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9847: \$? = $ac_status" >&5
++ echo "$as_me:9850: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9850: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9853: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9853: \$? = $ac_status" >&5
++ echo "$as_me:9856: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -9871,12 +9874,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9874: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9877: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:9879: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9882: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+
+ cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -9912,7 +9915,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9915 "configure"
++#line 9918 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9924,16 +9927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9930: \$? = $ac_status" >&5
++ echo "$as_me:9933: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9933: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9936: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9936: \$? = $ac_status" >&5
++ echo "$as_me:9939: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9950,7 +9953,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}:9953: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9956: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9998,7 +10001,7 @@
+ ;;
+ esac
+
+-echo "$as_me:10001: checking for terminfo header" >&5
++echo "$as_me:10004: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10016,7 +10019,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10019 "configure"
++#line 10022 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10031,16 +10034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10034: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10037: \$? = $ac_status" >&5
++ echo "$as_me:10040: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10040: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10043: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10043: \$? = $ac_status" >&5
++ echo "$as_me:10046: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -10056,7 +10059,7 @@
+ done
+
+ fi
+-echo "$as_me:10059: result: $cf_cv_term_header" >&5
++echo "$as_me:10062: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10094,7 +10097,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:10097: checking for ncurses version" >&5
++echo "$as_me:10100: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10120,10 +10123,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:10123: \"$cf_try\"") >&5
++ { (eval echo "$as_me:10126: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10126: \$? = $ac_status" >&5
++ echo "$as_me:10129: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10133,7 +10136,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10136 "configure"
++#line 10139 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10160,15 +10163,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10166: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10166: \$? = $ac_status" >&5
++ echo "$as_me:10169: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10168: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10171: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10171: \$? = $ac_status" >&5
++ echo "$as_me:10174: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10182,7 +10185,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:10185: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10188: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10195,7 +10198,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10198: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10201: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10203,7 +10206,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10206 "configure"
++#line 10209 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10222,16 +10225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10228: \$? = $ac_status" >&5
++ echo "$as_me:10231: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10231: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10234: \$? = $ac_status" >&5
++ echo "$as_me:10237: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10242,10 +10245,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10245: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10248: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+- echo "$as_me:10248: checking for initscr in -lgpm" >&5
++ echo "$as_me:10251: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10253,7 +10256,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10256 "configure"
++#line 10259 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10272,16 +10275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10278: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10278: \$? = $ac_status" >&5
++ echo "$as_me:10281: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10281: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10284: \$? = $ac_status" >&5
++ echo "$as_me:10287: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10292,7 +10295,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10295: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10298: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+ LIBS="$cf_ncurses_SAVE"
+@@ -10307,7 +10310,7 @@
+ # This is only necessary if you are linking against an obsolete
+ # version of ncurses (but it should do no harm, since it is static).
+ if test "$cf_nculib_root" = ncurses ; then
+- echo "$as_me:10310: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:10313: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10315,7 +10318,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10318 "configure"
++#line 10321 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10334,16 +10337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10337: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10340: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10340: \$? = $ac_status" >&5
++ echo "$as_me:10343: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10343: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10346: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10346: \$? = $ac_status" >&5
++ echo "$as_me:10349: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10354,7 +10357,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10357: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10360: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+ cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -10403,13 +10406,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:10406: checking for initscr" >&5
++ echo "$as_me:10409: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10412 "configure"
++#line 10415 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10440,16 +10443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10443: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10446: \$? = $ac_status" >&5
++ echo "$as_me:10449: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10449: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10452: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10452: \$? = $ac_status" >&5
++ echo "$as_me:10455: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -10459,18 +10462,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10462: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10465: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+
+ cf_save_LIBS="$LIBS"
+- echo "$as_me:10469: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:10472: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ LIBS="-l$cf_nculib_root $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10473 "configure"
++#line 10476 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10482,25 +10485,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10488: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10488: \$? = $ac_status" >&5
++ echo "$as_me:10491: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10491: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10494: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10494: \$? = $ac_status" >&5
++ echo "$as_me:10497: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10496: result: yes" >&5
++ echo "$as_me:10499: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10503: result: no" >&5
++echo "$as_me:10506: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -10568,11 +10571,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:10571: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:10574: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10575 "configure"
++#line 10578 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10584,25 +10587,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10590: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10590: \$? = $ac_status" >&5
++ echo "$as_me:10593: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10593: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10596: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10596: \$? = $ac_status" >&5
++ echo "$as_me:10599: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10598: result: yes" >&5
++ echo "$as_me:10601: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ break
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10605: result: no" >&5
++echo "$as_me:10608: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -10617,7 +10620,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:10620: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:10623: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10625,7 +10628,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:10628: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:10631: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ cf_ncurses_SAVE="$LIBS"
+ for p in $cf_ncurses_LIBS ; do
+@@ -10635,7 +10638,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10638 "configure"
++#line 10641 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10647,23 +10650,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10653: \$? = $ac_status" >&5
++ echo "$as_me:10656: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10656: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10659: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10659: \$? = $ac_status" >&5
++ echo "$as_me:10662: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10661: result: yes" >&5
++ echo "$as_me:10664: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10666: result: no" >&5
++echo "$as_me:10669: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10688,13 +10691,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:10691: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:10694: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+- echo "$as_me:10694: result: yes" >&5
++ echo "$as_me:10697: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:10697: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:10700: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ cf_have_ncuconfig=unknown
+
+@@ -10827,7 +10830,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10830 "configure"
++#line 10833 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10839,37 +10842,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10845: \$? = $ac_status" >&5
++ echo "$as_me:10848: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10848: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10851: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10851: \$? = $ac_status" >&5
++ echo "$as_me:10854: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10857 "configure"
++#line 10860 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int main(void)
+ { const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10864: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10867: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10867: \$? = $ac_status" >&5
++ echo "$as_me:10870: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10869: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10872: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10872: \$? = $ac_status" >&5
++ echo "$as_me:10875: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -11043,7 +11046,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11046 "configure"
++#line 11049 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11055,37 +11058,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11061: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11061: \$? = $ac_status" >&5
++ echo "$as_me:11064: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11064: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11067: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11067: \$? = $ac_status" >&5
++ echo "$as_me:11070: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11073 "configure"
++#line 11076 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int main(void)
+ { const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11083: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11083: \$? = $ac_status" >&5
++ echo "$as_me:11086: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11085: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11088: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11088: \$? = $ac_status" >&5
++ echo "$as_me:11091: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -11102,7 +11105,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:11105: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:11108: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ if test "$cf_have_ncuconfig" != "yes"
+@@ -11118,7 +11121,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:11121: checking for terminfo header" >&5
++echo "$as_me:11124: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11136,7 +11139,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11139 "configure"
++#line 11142 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11151,16 +11154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11157: \$? = $ac_status" >&5
++ echo "$as_me:11160: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11160: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11163: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11163: \$? = $ac_status" >&5
++ echo "$as_me:11166: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11176,7 +11179,7 @@
+ done
+
+ fi
+-echo "$as_me:11179: result: $cf_cv_term_header" >&5
++echo "$as_me:11182: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11211,7 +11214,7 @@
+ fi
+
+ else
+- echo "$as_me:11214: result: no" >&5
++ echo "$as_me:11217: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -11227,7 +11230,7 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:11230: checking for $ac_word" >&5
++echo "$as_me:11233: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11242,7 +11245,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:11245: found $ac_dir/$ac_word" >&5
++echo "$as_me:11248: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11250,10 +11253,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:11253: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:11256: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11256: result: no" >&5
++ echo "$as_me:11259: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11266,7 +11269,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:11269: checking for $ac_word" >&5
++echo "$as_me:11272: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11281,7 +11284,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:11284: found $ac_dir/$ac_word" >&5
++echo "$as_me:11287: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11289,10 +11292,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:11292: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:11295: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11295: result: no" >&5
++ echo "$as_me:11298: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11449,7 +11452,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:11452: checking if we have identified curses headers" >&5
++echo "$as_me:11455: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11461,7 +11464,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11464 "configure"
++#line 11467 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11473,16 +11476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11479: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11479: \$? = $ac_status" >&5
++ echo "$as_me:11482: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11482: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11485: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11485: \$? = $ac_status" >&5
++ echo "$as_me:11488: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11493,11 +11496,11 @@
+ done
+
+ fi
+-echo "$as_me:11496: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11499: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+
+ if test "$cf_cv_ncurses_header" = none ; then
+- { { echo "$as_me:11500: error: No curses header-files found" >&5
++ { { echo "$as_me:11503: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11507,23 +11510,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11510: checking for $ac_header" >&5
++echo "$as_me:11513: 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 11516 "configure"
++#line 11519 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11520: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11523: \"$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:11526: \$? = $ac_status" >&5
++ echo "$as_me:11529: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11542,7 +11545,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11545: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11548: 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
+@@ -11598,7 +11601,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11601 "configure"
++#line 11604 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11610,16 +11613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11616: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11616: \$? = $ac_status" >&5
++ echo "$as_me:11619: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11619: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11622: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11622: \$? = $ac_status" >&5
++ echo "$as_me:11625: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11636,7 +11639,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}:11639: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11642: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11655,7 +11658,7 @@
+
+ }
+
+-echo "$as_me:11658: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11661: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11667,7 +11670,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11670 "configure"
++#line 11673 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11691,16 +11694,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11697: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11697: \$? = $ac_status" >&5
++ echo "$as_me:11700: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11700: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11703: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11703: \$? = $ac_status" >&5
++ echo "$as_me:11706: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -11715,14 +11718,14 @@
+ done
+
+ fi
+-echo "$as_me:11718: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11721: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+
+ if test "$cf_cv_ncurses_h" != no ; then
+ cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+
+-echo "$as_me:11725: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11728: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11843,7 +11846,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11846 "configure"
++#line 11849 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11855,16 +11858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11861: \$? = $ac_status" >&5
++ echo "$as_me:11864: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11864: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11867: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11867: \$? = $ac_status" >&5
++ echo "$as_me:11870: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11881,7 +11884,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}:11884: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11887: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11904,7 +11907,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11907 "configure"
++#line 11910 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11928,16 +11931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11934: \$? = $ac_status" >&5
++ echo "$as_me:11937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11937: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11940: \$? = $ac_status" >&5
++ echo "$as_me:11943: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11958,12 +11961,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11961: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11964: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11966: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11969: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+
+ cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -11999,7 +12002,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12002 "configure"
++#line 12005 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12011,16 +12014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12017: \$? = $ac_status" >&5
++ echo "$as_me:12020: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12020: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12023: \$? = $ac_status" >&5
++ echo "$as_me:12026: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -12037,7 +12040,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}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -12085,7 +12088,7 @@
+ ;;
+ esac
+
+-echo "$as_me:12088: checking for terminfo header" >&5
++echo "$as_me:12091: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12103,7 +12106,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12106 "configure"
++#line 12109 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12118,16 +12121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12124: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12124: \$? = $ac_status" >&5
++ echo "$as_me:12127: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12127: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12130: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12130: \$? = $ac_status" >&5
++ echo "$as_me:12133: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -12143,7 +12146,7 @@
+ done
+
+ fi
+-echo "$as_me:12146: result: $cf_cv_term_header" >&5
++echo "$as_me:12149: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12181,7 +12184,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:12184: checking for ncurses version" >&5
++echo "$as_me:12187: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12207,10 +12210,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:12210: \"$cf_try\"") >&5
++ { (eval echo "$as_me:12213: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12213: \$? = $ac_status" >&5
++ echo "$as_me:12216: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12220,7 +12223,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12223 "configure"
++#line 12226 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12247,15 +12250,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12253: \$? = $ac_status" >&5
++ echo "$as_me:12256: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:12255: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12258: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12258: \$? = $ac_status" >&5
++ echo "$as_me:12261: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12269,7 +12272,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:12272: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12275: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12282,7 +12285,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12285: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12288: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12290,7 +12293,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12293 "configure"
++#line 12296 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12309,16 +12312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12315: \$? = $ac_status" >&5
++ echo "$as_me:12318: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12318: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12321: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12321: \$? = $ac_status" >&5
++ echo "$as_me:12324: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12329,10 +12332,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12332: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12335: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+- echo "$as_me:12335: checking for initscr in -lgpm" >&5
++ echo "$as_me:12338: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12340,7 +12343,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12343 "configure"
++#line 12346 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12359,16 +12362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12365: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12365: \$? = $ac_status" >&5
++ echo "$as_me:12368: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12368: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12371: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12371: \$? = $ac_status" >&5
++ echo "$as_me:12374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12379,7 +12382,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12382: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12385: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+ LIBS="$cf_ncurses_SAVE"
+@@ -12394,7 +12397,7 @@
+ # This is only necessary if you are linking against an obsolete
+ # version of ncurses (but it should do no harm, since it is static).
+ if test "$cf_nculib_root" = ncurses ; then
+- echo "$as_me:12397: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:12400: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12402,7 +12405,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12405 "configure"
++#line 12408 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12421,16 +12424,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12427: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12427: \$? = $ac_status" >&5
++ echo "$as_me:12430: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12430: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12433: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12433: \$? = $ac_status" >&5
++ echo "$as_me:12436: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12441,7 +12444,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12444: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12447: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+ cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -12490,13 +12493,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:12493: checking for initscr" >&5
++ echo "$as_me:12496: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12499 "configure"
++#line 12502 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12527,16 +12530,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12533: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12533: \$? = $ac_status" >&5
++ echo "$as_me:12536: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12539: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12539: \$? = $ac_status" >&5
++ echo "$as_me:12542: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -12546,18 +12549,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12549: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12552: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+
+ cf_save_LIBS="$LIBS"
+- echo "$as_me:12556: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:12559: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ LIBS="-l$cf_nculib_root $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12560 "configure"
++#line 12563 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12569,25 +12572,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12575: \$? = $ac_status" >&5
++ echo "$as_me:12578: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12578: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12581: \$? = $ac_status" >&5
++ echo "$as_me:12584: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12583: result: yes" >&5
++ echo "$as_me:12586: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12590: result: no" >&5
++echo "$as_me:12593: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -12655,11 +12658,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:12658: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:12661: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12662 "configure"
++#line 12665 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12671,25 +12674,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12677: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12677: \$? = $ac_status" >&5
++ echo "$as_me:12680: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12680: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12683: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12683: \$? = $ac_status" >&5
++ echo "$as_me:12686: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12685: result: yes" >&5
++ echo "$as_me:12688: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ break
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12692: result: no" >&5
++echo "$as_me:12695: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -12704,7 +12707,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:12707: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:12710: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -12712,7 +12715,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:12715: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:12718: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ cf_ncurses_SAVE="$LIBS"
+ for p in $cf_ncurses_LIBS ; do
+@@ -12722,7 +12725,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12725 "configure"
++#line 12728 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12734,23 +12737,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12740: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12740: \$? = $ac_status" >&5
++ echo "$as_me:12743: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12743: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12746: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12746: \$? = $ac_status" >&5
++ echo "$as_me:12749: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12748: result: yes" >&5
++ echo "$as_me:12751: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12753: result: no" >&5
++echo "$as_me:12756: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12770,7 +12773,7 @@
+
+ ;;
+ (pdcurses)
+- echo "$as_me:12773: checking for X" >&5
++ echo "$as_me:12776: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -12874,17 +12877,17 @@
+ # Guess where to find include files, by looking for Intrinsic.h.
+ # First, try using that file with no special directory specified.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12877 "configure"
++#line 12880 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:12881: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12884: \"$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:12887: \$? = $ac_status" >&5
++ echo "$as_me:12890: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12917,7 +12920,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12920 "configure"
++#line 12923 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -12929,16 +12932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12935: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12935: \$? = $ac_status" >&5
++ echo "$as_me:12938: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12938: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12941: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12941: \$? = $ac_status" >&5
++ echo "$as_me:12944: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12976,7 +12979,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:12979: result: $have_x" >&5
++ echo "$as_me:12982: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -12986,7 +12989,7 @@
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+- echo "$as_me:12989: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:12992: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -13013,11 +13016,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:13016: checking whether -R must be followed by a space" >&5
++ echo "$as_me:13019: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13020 "configure"
++#line 13023 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13029,16 +13032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13035: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13035: \$? = $ac_status" >&5
++ echo "$as_me:13038: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13038: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13041: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13041: \$? = $ac_status" >&5
++ echo "$as_me:13044: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -13048,13 +13051,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:13051: result: no" >&5
++ echo "$as_me:13054: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13057 "configure"
++#line 13060 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13066,16 +13069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13072: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13072: \$? = $ac_status" >&5
++ echo "$as_me:13075: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13075: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13078: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13078: \$? = $ac_status" >&5
++ echo "$as_me:13081: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -13085,11 +13088,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:13088: result: yes" >&5
++ echo "$as_me:13091: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:13092: result: neither works" >&5
++ echo "$as_me:13095: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -13109,7 +13112,7 @@
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13112 "configure"
++#line 13115 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13128,22 +13131,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13134: \$? = $ac_status" >&5
++ echo "$as_me:13137: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13137: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13140: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13140: \$? = $ac_status" >&5
++ echo "$as_me:13143: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13146: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13149: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13151,7 +13154,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13154 "configure"
++#line 13157 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13170,16 +13173,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13173: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13176: \$? = $ac_status" >&5
++ echo "$as_me:13179: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13179: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13182: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13182: \$? = $ac_status" >&5
++ echo "$as_me:13185: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13190,14 +13193,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13193: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- echo "$as_me:13200: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:13203: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13205,7 +13208,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13208 "configure"
++#line 13211 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13224,16 +13227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13230: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13230: \$? = $ac_status" >&5
++ echo "$as_me:13233: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13233: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13236: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13236: \$? = $ac_status" >&5
++ echo "$as_me:13239: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13244,7 +13247,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13247: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13263,13 +13266,13 @@
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+- echo "$as_me:13266: checking for gethostbyname" >&5
++ echo "$as_me:13269: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13272 "configure"
++#line 13275 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13300,16 +13303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13306: \$? = $ac_status" >&5
++ echo "$as_me:13309: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13309: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13312: \$? = $ac_status" >&5
++ echo "$as_me:13315: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -13319,11 +13322,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13322: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13325: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+
+ if test $ac_cv_func_gethostbyname = no; then
+- echo "$as_me:13326: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:13329: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13331,7 +13334,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13334 "configure"
++#line 13337 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13350,16 +13353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13356: \$? = $ac_status" >&5
++ echo "$as_me:13359: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13359: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13362: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13362: \$? = $ac_status" >&5
++ echo "$as_me:13365: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13370,14 +13373,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13373: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13376: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+- echo "$as_me:13380: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:13383: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13385,7 +13388,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13388 "configure"
++#line 13391 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13404,16 +13407,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13410: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13410: \$? = $ac_status" >&5
++ echo "$as_me:13413: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13413: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13416: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13416: \$? = $ac_status" >&5
++ echo "$as_me:13419: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13424,7 +13427,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13427: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13430: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13440,13 +13443,13 @@
+ # variants that don't use the nameserver (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+- echo "$as_me:13443: checking for connect" >&5
++ echo "$as_me:13446: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13449 "configure"
++#line 13452 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13477,16 +13480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13483: \$? = $ac_status" >&5
++ echo "$as_me:13486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13486: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13489: \$? = $ac_status" >&5
++ echo "$as_me:13492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -13496,11 +13499,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13499: result: $ac_cv_func_connect" >&5
++echo "$as_me:13502: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+
+ if test $ac_cv_func_connect = no; then
+- echo "$as_me:13503: checking for connect in -lsocket" >&5
++ echo "$as_me:13506: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13508,7 +13511,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13511 "configure"
++#line 13514 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13527,16 +13530,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13533: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13533: \$? = $ac_status" >&5
++ echo "$as_me:13536: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13539: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13539: \$? = $ac_status" >&5
++ echo "$as_me:13542: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -13547,7 +13550,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13550: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13553: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13556,13 +13559,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:13559: checking for remove" >&5
++ echo "$as_me:13562: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13565 "configure"
++#line 13568 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13593,16 +13596,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13596: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13599: \$? = $ac_status" >&5
++ echo "$as_me:13602: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13602: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13605: \$? = $ac_status" >&5
++ echo "$as_me:13608: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -13612,11 +13615,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13615: result: $ac_cv_func_remove" >&5
++echo "$as_me:13618: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+
+ if test $ac_cv_func_remove = no; then
+- echo "$as_me:13619: checking for remove in -lposix" >&5
++ echo "$as_me:13622: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13624,7 +13627,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13627 "configure"
++#line 13630 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13643,16 +13646,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13649: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13649: \$? = $ac_status" >&5
++ echo "$as_me:13652: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13655: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13655: \$? = $ac_status" >&5
++ echo "$as_me:13658: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -13663,7 +13666,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13666: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13669: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13672,13 +13675,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:13675: checking for shmat" >&5
++ echo "$as_me:13678: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13681 "configure"
++#line 13684 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13709,16 +13712,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13715: \$? = $ac_status" >&5
++ echo "$as_me:13718: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13718: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13721: \$? = $ac_status" >&5
++ echo "$as_me:13724: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -13728,11 +13731,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13731: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13734: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+
+ if test $ac_cv_func_shmat = no; then
+- echo "$as_me:13735: checking for shmat in -lipc" >&5
++ echo "$as_me:13738: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13740,7 +13743,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13743 "configure"
++#line 13746 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13759,16 +13762,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13765: \$? = $ac_status" >&5
++ echo "$as_me:13768: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13768: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13771: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13771: \$? = $ac_status" >&5
++ echo "$as_me:13774: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13779,7 +13782,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13782: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13785: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13797,7 +13800,7 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+- echo "$as_me:13800: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:13803: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13805,7 +13808,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13808 "configure"
++#line 13811 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13824,16 +13827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13827: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13830: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13830: \$? = $ac_status" >&5
++ echo "$as_me:13833: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13833: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13836: \$? = $ac_status" >&5
++ echo "$as_me:13839: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13844,7 +13847,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13847: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13856,7 +13859,7 @@
+
+ cf_x_athena=${cf_x_athena:-Xaw}
+
+-echo "$as_me:13859: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13862: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+
+@@ -13867,14 +13870,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3d
+- echo "$as_me:13870: result: yes" >&5
++ echo "$as_me:13873: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13873: result: no" >&5
++ echo "$as_me:13876: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13877: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13880: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+
+@@ -13885,14 +13888,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3dxft
+- echo "$as_me:13888: result: yes" >&5
++ echo "$as_me:13891: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13891: result: no" >&5
++ echo "$as_me:13894: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13895: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13898: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+
+@@ -13903,14 +13906,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=neXtaw
+- echo "$as_me:13906: result: yes" >&5
++ echo "$as_me:13909: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13909: result: no" >&5
++ echo "$as_me:13912: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13913: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13916: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+
+@@ -13921,10 +13924,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=XawPlus
+- echo "$as_me:13924: result: yes" >&5
++ echo "$as_me:13927: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13927: result: no" >&5
++ echo "$as_me:13930: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -13944,17 +13947,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6
+
+-echo "${as_me:-configure}:13947: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13950: testing found package $cf_athena_pkg ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`"
+ test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:13953: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13956: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:13957: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13960: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14085,20 +14088,20 @@
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14088: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14091: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
+-echo "$as_me:14094: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14097: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14101 "configure"
++#line 14104 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14116,16 +14119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14122: \$? = $ac_status" >&5
++ echo "$as_me:14125: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14125: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14128: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14128: \$? = $ac_status" >&5
++ echo "$as_me:14131: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xaw_compat=yes
+ else
+@@ -14135,7 +14138,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14138: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14141: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+ if test "$cf_cv_xaw_compat" = no
+@@ -14147,7 +14150,7 @@
+ (*)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+-echo "${as_me:-configure}:14150: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14153: testing work around broken package ..." 1>&5
+
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'`
+@@ -14155,17 +14158,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ test -n "$verbose" && echo " found package xmu" 1>&6
+
+-echo "${as_me:-configure}:14158: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14161: testing found package xmu ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`"
+ test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:14164: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14167: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:14168: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14171: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14285,12 +14288,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14288: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14291: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14293: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14296: testing ...after $LIBS ..." 1>&5
+
+ else
+ cf_pkgconfig_incs=
+@@ -14298,12 +14301,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14301: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14304: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14306: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14309: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -14314,7 +14317,7 @@
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14317: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14320: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+@@ -14339,17 +14342,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ test -n "$verbose" && echo " found package Xext" 1>&6
+
+-echo "${as_me:-configure}:14342: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14345: testing found package Xext ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`"
+ test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:14348: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14351: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:14352: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14355: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14470,7 +14473,7 @@
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+
+- echo "$as_me:14473: checking for XextCreateExtension in -lXext" >&5
++ echo "$as_me:14476: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14478,7 +14481,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14481 "configure"
++#line 14484 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14497,16 +14500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14503: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14503: \$? = $ac_status" >&5
++ echo "$as_me:14506: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14506: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14509: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14509: \$? = $ac_status" >&5
++ echo "$as_me:14512: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14517,7 +14520,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14520: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14523: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+
+@@ -14553,17 +14556,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:14556: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14559: testing found package x11 ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`"
+ test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:14562: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14565: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:14566: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14569: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14683,24 +14686,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14686: WARNING: unable to find X11 library" >&5
++ { echo "$as_me:14689: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ test -n "$verbose" && echo " found package ice" 1>&6
+
+-echo "${as_me:-configure}:14693: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14696: testing found package ice ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`"
+ test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:14699: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14702: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:14703: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14706: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14820,24 +14823,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14823: WARNING: unable to find ICE library" >&5
++ { echo "$as_me:14826: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:14830: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14833: testing found package sm ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`"
+ test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:14836: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14839: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:14840: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14843: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14957,24 +14960,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14960: WARNING: unable to find SM library" >&5
++ { echo "$as_me:14963: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:14967: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14970: testing found package xt ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`"
+ test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:14973: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14976: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:14977: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14980: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15094,7 +15097,7 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:15097: WARNING: unable to find Xt library" >&5
++ { echo "$as_me:15100: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+
+@@ -15107,17 +15110,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:15110: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15113: testing found package xt ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`"
+ test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:15116: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15119: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:15120: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15123: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15238,14 +15241,14 @@
+ ;;
+ (*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15241: checking for usable X dependency" >&5
++echo "$as_me:15244: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15248 "configure"
++#line 15251 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15265,16 +15268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15268: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15271: \$? = $ac_status" >&5
++ echo "$as_me:15274: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15274: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15277: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15277: \$? = $ac_status" >&5
++ echo "$as_me:15280: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_x11_compat=yes
+ else
+@@ -15284,30 +15287,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15287: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15290: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ if test "$cf_cv_xt_x11_compat" = no
+ then
+ test -n "$verbose" && echo " work around broken X11 dependency" 1>&6
+
+-echo "${as_me:-configure}:15293: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15296: testing work around broken X11 dependency ..." 1>&5
+
+ # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:15300: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15303: testing found package x11 ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`"
+ test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:15306: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15309: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:15310: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15313: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15430,12 +15433,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15433: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15436: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15438: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15441: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15443,14 +15446,14 @@
+ ;;
+ esac
+
+-echo "$as_me:15446: checking for usable X Toolkit package" >&5
++echo "$as_me:15449: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15453 "configure"
++#line 15456 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15466,16 +15469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15469: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15472: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15472: \$? = $ac_status" >&5
++ echo "$as_me:15475: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15475: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15478: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15478: \$? = $ac_status" >&5
++ echo "$as_me:15481: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_ice_compat=yes
+ else
+@@ -15485,7 +15488,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15488: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15491: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+
+ if test "$cf_cv_xt_ice_compat" = no
+@@ -15499,22 +15502,22 @@
+ (*)
+ test -n "$verbose" && echo " work around broken ICE dependency" 1>&6
+
+-echo "${as_me:-configure}:15502: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15505: testing work around broken ICE dependency ..." 1>&5
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ test -n "$verbose" && echo " found package ice" 1>&6
+
+-echo "${as_me:-configure}:15507: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15510: testing found package ice ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`"
+ test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:15513: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15516: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:15517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15633,17 +15636,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:15636: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15639: testing found package sm ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`"
+ test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:15642: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15645: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:15646: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15649: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15772,12 +15775,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15775: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15778: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15780: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15783: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15797,7 +15800,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15800: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15803: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15882,7 +15885,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:15885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15888: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15892,7 +15895,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:15895: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15898: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15902,7 +15905,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}:15905: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15908: 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"
+@@ -15911,7 +15914,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15914 "configure"
++#line 15917 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -15923,16 +15926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15929: \$? = $ac_status" >&5
++ echo "$as_me:15932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15932: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15935: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15935: \$? = $ac_status" >&5
++ echo "$as_me:15938: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -15940,12 +15943,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15943: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15946: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+
+ if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15948: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15951: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -15953,13 +15956,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+- echo "$as_me:15956: checking for XOpenDisplay" >&5
++ echo "$as_me:15959: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15962 "configure"
++#line 15965 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15990,16 +15993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15996: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15996: \$? = $ac_status" >&5
++ echo "$as_me:15999: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15999: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16002: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16002: \$? = $ac_status" >&5
++ echo "$as_me:16005: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XOpenDisplay=yes
+ else
+@@ -16009,13 +16012,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16012: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16015: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+ :
+ else
+
+- echo "$as_me:16018: checking for XOpenDisplay in -lX11" >&5
++ echo "$as_me:16021: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16023,7 +16026,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16026 "configure"
++#line 16029 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16042,16 +16045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16045: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16048: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16048: \$? = $ac_status" >&5
++ echo "$as_me:16051: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16051: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16054: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16054: \$? = $ac_status" >&5
++ echo "$as_me:16057: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16062,7 +16065,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16065: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16068: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+
+@@ -16086,13 +16089,13 @@
+
+ fi
+
+- echo "$as_me:16089: checking for XtAppInitialize" >&5
++ echo "$as_me:16092: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16095 "configure"
++#line 16098 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16123,16 +16126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16129: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16129: \$? = $ac_status" >&5
++ echo "$as_me:16132: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16132: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16135: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16135: \$? = $ac_status" >&5
++ echo "$as_me:16138: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16142,13 +16145,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16145: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16148: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+ :
+ else
+
+- echo "$as_me:16151: checking for XtAppInitialize in -lXt" >&5
++ echo "$as_me:16154: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16156,7 +16159,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16159 "configure"
++#line 16162 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16175,16 +16178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16181: \$? = $ac_status" >&5
++ echo "$as_me:16184: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16184: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16187: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16187: \$? = $ac_status" >&5
++ echo "$as_me:16190: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16195,7 +16198,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16198: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16201: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+
+@@ -16212,7 +16215,7 @@
+ fi
+
+ if test "$cf_have_X_LIBS" = no ; then
+- { echo "$as_me:16215: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++ { echo "$as_me:16218: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program. You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16253,14 +16256,14 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+
+- echo "$as_me:16256: checking for $cf_test in $cf_path" >&5
++ echo "$as_me:16259: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ else
+- echo "$as_me:16259: checking for $cf_test" >&5
++ echo "$as_me:16262: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16263 "configure"
++#line 16266 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Intrinsic.h>
+@@ -16274,16 +16277,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16280: \$? = $ac_status" >&5
++ echo "$as_me:16283: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16283: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16286: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16286: \$? = $ac_status" >&5
++ echo "$as_me:16289: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16292,7 +16295,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:16295: result: $cf_result" >&5
++ echo "$as_me:16298: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16308,7 +16311,7 @@
+ done
+
+ if test -z "$cf_x_athena_inc" ; then
+- { echo "$as_me:16311: WARNING: Unable to find Athena header files" >&5
++ { echo "$as_me:16314: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+
+@@ -16373,10 +16376,10 @@
+ done
+ LIBS="$cf_add_libs"
+
+- echo "$as_me:16376: checking for $cf_test in $cf_libs" >&5
++ echo "$as_me:16379: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16379 "configure"
++#line 16382 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16393,16 +16396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16396: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16399: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16399: \$? = $ac_status" >&5
++ echo "$as_me:16402: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16402: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16405: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16405: \$? = $ac_status" >&5
++ echo "$as_me:16408: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16411,7 +16414,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:16414: result: $cf_result" >&5
++ echo "$as_me:16417: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16428,7 +16431,7 @@
+ done
+
+ if test -z "$cf_x_athena_lib" ; then
+- { { echo "$as_me:16431: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++ { { echo "$as_me:16434: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -16462,7 +16465,7 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:16465: checking for $ac_word" >&5
++echo "$as_me:16468: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16477,7 +16480,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16480: found $ac_dir/$ac_word" >&5
++echo "$as_me:16483: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16485,10 +16488,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+- echo "$as_me:16488: result: $XCURSES_CONFIG" >&5
++ echo "$as_me:16491: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16491: result: no" >&5
++ echo "$as_me:16494: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16501,7 +16504,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:16504: checking for $ac_word" >&5
++echo "$as_me:16507: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16516,7 +16519,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16519: found $ac_dir/$ac_word" >&5
++echo "$as_me:16522: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16524,10 +16527,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+- echo "$as_me:16527: result: $ac_ct_XCURSES_CONFIG" >&5
++ echo "$as_me:16530: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16530: result: no" >&5
++ echo "$as_me:16533: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16662,7 +16665,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16665: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16668: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16747,7 +16750,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:16750: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16753: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16757,7 +16760,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:16760: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16763: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16767,7 +16770,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}:16770: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16773: 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"
+@@ -16776,7 +16779,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16779 "configure"
++#line 16782 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -16788,16 +16791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16794: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16794: \$? = $ac_status" >&5
++ echo "$as_me:16797: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16797: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16800: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16800: \$? = $ac_status" >&5
++ echo "$as_me:16803: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -16805,12 +16808,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16808: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16811: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+
+ if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16813: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16816: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -16818,7 +16821,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:16821: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16824: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16826,7 +16829,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16829 "configure"
++#line 16832 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16845,16 +16848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16851: \$? = $ac_status" >&5
++ echo "$as_me:16854: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16854: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16857: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16857: \$? = $ac_status" >&5
++ echo "$as_me:16860: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16865,7 +16868,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16868: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16871: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+
+@@ -16887,7 +16890,7 @@
+
+ fi
+
+-echo "$as_me:16890: checking for XCurses library" >&5
++echo "$as_me:16893: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16910,7 +16913,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16913 "configure"
++#line 16916 "configure"
+ #include "confdefs.h"
+
+ #include <xcurses.h>
+@@ -16925,16 +16928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16931: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16931: \$? = $ac_status" >&5
++ echo "$as_me:16934: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16934: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16937: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16937: \$? = $ac_status" >&5
++ echo "$as_me:16940: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_lib_XCurses=yes
+ else
+@@ -16945,7 +16948,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16948: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16951: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+
+ fi
+@@ -16960,23 +16963,23 @@
+ #define XCURSES 1
+ EOF
+
+- echo "$as_me:16963: checking for xcurses.h" >&5
++ echo "$as_me:16966: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16969 "configure"
++#line 16972 "configure"
+ #include "confdefs.h"
+ #include <xcurses.h>
+ _ACEOF
+-if { (eval echo "$as_me:16973: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16976: \"$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:16979: \$? = $ac_status" >&5
++ echo "$as_me:16982: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16995,7 +16998,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16998: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:17001: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+
+@@ -17006,26 +17009,26 @@
+ fi
+
+ else
+- { { echo "$as_me:17009: error: Cannot link with XCurses" >&5
++ { { echo "$as_me:17012: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ ;;
+ (*)
+- { { echo "$as_me:17016: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:17019: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+-echo "$as_me:17022: checking for _nc_init_pthreads" >&5
++echo "$as_me:17025: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17028 "configure"
++#line 17031 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17056,16 +17059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17062: \$? = $ac_status" >&5
++ echo "$as_me:17065: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17065: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17068: \$? = $ac_status" >&5
++ echo "$as_me:17071: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17075,7 +17078,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17078: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17081: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+ cf_cv_ncurses_pthreads=yes
+@@ -17110,7 +17113,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17113: checking for X11 rgb file" >&5
++echo "$as_me:17116: 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.
+@@ -17172,7 +17175,7 @@
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:17175: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:17178: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -17180,7 +17183,7 @@
+
+ fi
+
+-echo "$as_me:17183: result: $RGB_PATH" >&5
++echo "$as_me:17186: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -17221,7 +17224,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17224: checking for desired basename for form library" >&5
++echo "$as_me:17227: 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.
+@@ -17241,10 +17244,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17244: result: $FORM_NAME" >&5
++echo "$as_me:17247: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:17247: checking for desired basename for menu library" >&5
++echo "$as_me:17250: 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.
+@@ -17264,10 +17267,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17267: result: $MENU_NAME" >&5
++echo "$as_me:17270: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:17270: checking for desired basename for panel library" >&5
++echo "$as_me:17273: 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.
+@@ -17287,10 +17290,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17290: result: $PANEL_NAME" >&5
++echo "$as_me:17293: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:17293: checking if you want to check for panel functions" >&5
++echo "$as_me:17296: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17307,7 +17310,7 @@
+ cf_enable_panel=$cf_default_panel
+
+ fi;
+-echo "$as_me:17310: result: $cf_enable_panel" >&5
++echo "$as_me:17313: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17318,13 +17321,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17321: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17324: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+- echo "$as_me:17324: result: yes" >&5
++ echo "$as_me:17327: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17327: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17330: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+
+ cf_save_CFLAGS="$CFLAGS"
+@@ -17474,7 +17477,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17477 "configure"
++#line 17480 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17486,37 +17489,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17492: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17492: \$? = $ac_status" >&5
++ echo "$as_me:17495: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17495: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17498: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17498: \$? = $ac_status" >&5
++ echo "$as_me:17501: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_curses_lib=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17504 "configure"
++#line 17507 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int main(void)
+ { (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17514: \$? = $ac_status" >&5
++ echo "$as_me:17517: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17516: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17519: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17519: \$? = $ac_status" >&5
++ echo "$as_me:17522: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17533,7 +17536,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17536: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17539: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ if test "$cf_have_curses_lib" = "yes"
+@@ -17554,7 +17557,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17557: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17560: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17562,7 +17565,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17565 "configure"
++#line 17568 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17581,16 +17584,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17587: \$? = $ac_status" >&5
++ echo "$as_me:17590: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17590: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17593: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17593: \$? = $ac_status" >&5
++ echo "$as_me:17596: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17601,7 +17604,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17604: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17607: 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
+
+@@ -17634,7 +17637,7 @@
+ cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+
+-echo "$as_me:17637: checking if you want to check for menu functions" >&5
++echo "$as_me:17640: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17651,7 +17654,7 @@
+ cf_enable_menu=$cf_default_menu
+
+ fi;
+-echo "$as_me:17654: result: $cf_enable_menu" >&5
++echo "$as_me:17657: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17660,14 +17663,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:17663: checking for NetBSD menu.h" >&5
++echo "$as_me:17666: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17670 "configure"
++#line 17673 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17685,16 +17688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17691: \$? = $ac_status" >&5
++ echo "$as_me:17694: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17694: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17697: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17697: \$? = $ac_status" >&5
++ echo "$as_me:17700: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_menu_h=yes
+
+@@ -17706,7 +17709,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17709: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17712: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17723,13 +17726,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17726: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17729: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+- echo "$as_me:17729: result: yes" >&5
++ echo "$as_me:17732: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17732: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17735: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+
+ cf_save_CFLAGS="$CFLAGS"
+@@ -17879,7 +17882,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17882 "configure"
++#line 17885 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17891,37 +17894,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17897: \$? = $ac_status" >&5
++ echo "$as_me:17900: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17900: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17903: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17903: \$? = $ac_status" >&5
++ echo "$as_me:17906: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_curses_lib=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17909 "configure"
++#line 17912 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int main(void)
+ { (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17919: \$? = $ac_status" >&5
++ echo "$as_me:17922: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17921: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17924: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17924: \$? = $ac_status" >&5
++ echo "$as_me:17927: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17938,7 +17941,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17941: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17944: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ if test "$cf_have_curses_lib" = "yes"
+@@ -17959,7 +17962,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17962: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17965: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17967,7 +17970,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17970 "configure"
++#line 17973 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17986,16 +17989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17992: \$? = $ac_status" >&5
++ echo "$as_me:17995: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17995: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17998: \$? = $ac_status" >&5
++ echo "$as_me:18001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -18006,7 +18009,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18009: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18012: 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
+
+@@ -18039,7 +18042,7 @@
+ cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+
+-echo "$as_me:18042: checking if you want to check for form functions" >&5
++echo "$as_me:18045: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+
+ # Check whether --enable-form or --disable-form was given.
+@@ -18056,7 +18059,7 @@
+ cf_enable_form=$cf_default_form
+
+ fi;
+-echo "$as_me:18059: result: $cf_enable_form" >&5
++echo "$as_me:18062: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18065,14 +18068,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:18068: checking for NetBSD form.h" >&5
++echo "$as_me:18071: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18075 "configure"
++#line 18078 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18091,16 +18094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18097: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18097: \$? = $ac_status" >&5
++ echo "$as_me:18100: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18100: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18103: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18103: \$? = $ac_status" >&5
++ echo "$as_me:18106: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_form_h=yes
+
+@@ -18112,7 +18115,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18115: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18118: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18129,13 +18132,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:18132: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++ echo "$as_me:18135: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+- echo "$as_me:18135: result: yes" >&5
++ echo "$as_me:18138: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:18138: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:18141: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+
+ cf_save_CFLAGS="$CFLAGS"
+@@ -18285,7 +18288,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18288 "configure"
++#line 18291 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18297,37 +18300,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18300: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18303: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18303: \$? = $ac_status" >&5
++ echo "$as_me:18306: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18306: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18309: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18309: \$? = $ac_status" >&5
++ echo "$as_me:18312: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_curses_lib=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18315 "configure"
++#line 18318 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int main(void)
+ { (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18325: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18325: \$? = $ac_status" >&5
++ echo "$as_me:18328: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:18327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18330: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18330: \$? = $ac_status" >&5
++ echo "$as_me:18333: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -18344,7 +18347,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18347: result: $cf_have_curses_lib" >&5
++ echo "$as_me:18350: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ if test "$cf_have_curses_lib" = "yes"
+@@ -18365,7 +18368,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18368: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18371: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18373,7 +18376,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18376 "configure"
++#line 18379 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18392,16 +18395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18398: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18398: \$? = $ac_status" >&5
++ echo "$as_me:18401: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18401: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18404: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18404: \$? = $ac_status" >&5
++ echo "$as_me:18407: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -18412,7 +18415,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18415: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18418: 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
+
+@@ -18450,23 +18453,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18453: checking for $ac_header" >&5
++echo "$as_me:18456: 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 18459 "configure"
++#line 18462 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18463: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18466: \"$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:18469: \$? = $ac_status" >&5
++ echo "$as_me:18472: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18485,7 +18488,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18488: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18491: 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
+@@ -18495,13 +18498,13 @@
+ fi
+ done
+
+-echo "$as_me:18498: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18501: 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 18504 "configure"
++#line 18507 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -18517,16 +18520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18523: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18523: \$? = $ac_status" >&5
++ echo "$as_me:18526: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18526: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18529: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18529: \$? = $ac_status" >&5
++ echo "$as_me:18532: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -18536,7 +18539,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18539: result: $ac_cv_header_time" >&5
++echo "$as_me:18542: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -18557,23 +18560,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18560: checking for $ac_header" >&5
++echo "$as_me:18563: 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 18566 "configure"
++#line 18569 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18573: \"$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:18576: \$? = $ac_status" >&5
++ echo "$as_me:18579: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18592,7 +18595,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18598: 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
+@@ -18605,23 +18608,23 @@
+ for ac_header in getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18608: checking for $ac_header" >&5
++echo "$as_me:18611: 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 18614 "configure"
++#line 18617 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18621: \"$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:18624: \$? = $ac_status" >&5
++ echo "$as_me:18627: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18640,7 +18643,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18646: 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
+@@ -18650,7 +18653,7 @@
+ fi
+ done
+
+-echo "$as_me:18653: checking for header declaring getopt variables" >&5
++echo "$as_me:18656: 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
+@@ -18660,7 +18663,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18663 "configure"
++#line 18666 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -18673,16 +18676,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18676: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18679: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18679: \$? = $ac_status" >&5
++ echo "$as_me:18682: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18682: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18685: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18685: \$? = $ac_status" >&5
++ echo "$as_me:18688: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -18694,7 +18697,7 @@
+ done
+
+ fi
+-echo "$as_me:18697: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18700: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -18712,13 +18715,13 @@
+ fi
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:18715: checking for clock_gettime" >&5
++echo "$as_me:18718: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18721 "configure"
++#line 18724 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18749,16 +18752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18755: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18755: \$? = $ac_status" >&5
++ echo "$as_me:18758: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18758: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18761: \$? = $ac_status" >&5
++ echo "$as_me:18764: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -18768,12 +18771,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18771: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18774: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+ cf_cv_test_clock_gettime=yes
+ else
+- echo "$as_me:18776: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:18779: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18781,7 +18784,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18784 "configure"
++#line 18787 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18800,16 +18803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18806: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18806: \$? = $ac_status" >&5
++ echo "$as_me:18809: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18809: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18812: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18812: \$? = $ac_status" >&5
++ echo "$as_me:18815: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18820,7 +18823,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18823: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18826: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+ LIBS="-lrt $LIBS"
+@@ -18832,14 +18835,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18835: checking if clock_gettime links" >&5
++echo "$as_me:18838: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18842 "configure"
++#line 18845 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -18857,16 +18860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18863: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18863: \$? = $ac_status" >&5
++ echo "$as_me:18866: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18866: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18869: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18869: \$? = $ac_status" >&5
++ echo "$as_me:18872: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -18877,7 +18880,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18880: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18883: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -18891,13 +18894,13 @@
+ EOF
+
+ else
+-echo "$as_me:18894: checking for gettimeofday" >&5
++echo "$as_me:18897: 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 18900 "configure"
++#line 18903 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18928,16 +18931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18934: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18934: \$? = $ac_status" >&5
++ echo "$as_me:18937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18937: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18940: \$? = $ac_status" >&5
++ echo "$as_me:18943: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -18947,7 +18950,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18950: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18953: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -18957,7 +18960,7 @@
+
+ else
+
+-echo "$as_me:18960: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18963: 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
+@@ -18965,7 +18968,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18968 "configure"
++#line 18971 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18984,16 +18987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18990: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18990: \$? = $ac_status" >&5
++ echo "$as_me:18993: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18993: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18996: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18996: \$? = $ac_status" >&5
++ echo "$as_me:18999: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -19004,7 +19007,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19007: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19010: 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
+
+@@ -19042,13 +19045,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19045: checking for $ac_func" >&5
++echo "$as_me:19048: 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 19051 "configure"
++#line 19054 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19079,16 +19082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19085: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19085: \$? = $ac_status" >&5
++ echo "$as_me:19088: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19088: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19091: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19091: \$? = $ac_status" >&5
++ echo "$as_me:19094: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19098,7 +19101,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19101: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19104: 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
+@@ -19109,14 +19112,14 @@
+ done
+
+ # use a compile-check to work with ncurses*-config and subdirectory includes
+-echo "$as_me:19112: checking if we can use termcap.h" >&5
++echo "$as_me:19115: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19119 "configure"
++#line 19122 "configure"
+ #include "confdefs.h"
+
+ #include <curses.h>
+@@ -19137,16 +19140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19143: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19143: \$? = $ac_status" >&5
++ echo "$as_me:19146: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19149: \$? = $ac_status" >&5
++ echo "$as_me:19152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_termcap_h=yes
+ else
+@@ -19156,7 +19159,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19159: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19162: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19166,14 +19169,14 @@
+ EOF
+
+ else
+-echo "$as_me:19169: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19172: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19176 "configure"
++#line 19179 "configure"
+ #include "confdefs.h"
+
+ #include <ncurses/curses.h>
+@@ -19194,16 +19197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19200: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19200: \$? = $ac_status" >&5
++ echo "$as_me:19203: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19206: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19206: \$? = $ac_status" >&5
++ echo "$as_me:19209: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19213,7 +19216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19216: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19219: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19223,7 +19226,7 @@
+ fi
+
+ if test "x$ac_cv_func_getopt" = xno; then
+- { { echo "$as_me:19226: error: getopt is required for building programs" >&5
++ { { echo "$as_me:19229: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -19242,13 +19245,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19245: checking for $ac_func" >&5
++echo "$as_me:19248: 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 19251 "configure"
++#line 19254 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19279,16 +19282,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19285: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19285: \$? = $ac_status" >&5
++ echo "$as_me:19288: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19288: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19291: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19291: \$? = $ac_status" >&5
++ echo "$as_me:19294: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19298,7 +19301,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19301: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19304: 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
+@@ -19310,7 +19313,7 @@
+
+ fi
+
+-echo "$as_me:19313: checking definition to turn on extended curses functions" >&5
++echo "$as_me:19316: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19318,7 +19321,7 @@
+
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19321 "configure"
++#line 19324 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -19351,16 +19354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19357: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19357: \$? = $ac_status" >&5
++ echo "$as_me:19360: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19360: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19363: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19363: \$? = $ac_status" >&5
++ echo "$as_me:19366: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=none
+ else
+@@ -19370,7 +19373,7 @@
+ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19373 "configure"
++#line 19376 "configure"
+ #include "confdefs.h"
+
+ #define $cf_try_xopen_extension 1
+@@ -19396,16 +19399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19402: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19402: \$? = $ac_status" >&5
++ echo "$as_me:19405: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19405: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19408: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19408: \$? = $ac_status" >&5
++ echo "$as_me:19411: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19419,7 +19422,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19422: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19425: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+
+ case "$cf_cv_need_xopen_extension" in
+@@ -19431,7 +19434,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19434: checking for term.h" >&5
++echo "$as_me:19437: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19452,7 +19455,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19455 "configure"
++#line 19458 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19466,16 +19469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19472: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19472: \$? = $ac_status" >&5
++ echo "$as_me:19475: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19475: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19478: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19478: \$? = $ac_status" >&5
++ echo "$as_me:19481: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19494,7 +19497,7 @@
+ for cf_header in ncurses/term.h ncursesw/term.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19497 "configure"
++#line 19500 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19512,16 +19515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19518: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19518: \$? = $ac_status" >&5
++ echo "$as_me:19521: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19521: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19524: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19524: \$? = $ac_status" >&5
++ echo "$as_me:19527: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19536,7 +19539,7 @@
+ esac
+
+ fi
+-echo "$as_me:19539: result: $cf_cv_term_header" >&5
++echo "$as_me:19542: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ case "$cf_cv_term_header" in
+@@ -19563,7 +19566,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19566: checking for unctrl.h" >&5
++echo "$as_me:19569: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19584,7 +19587,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19587 "configure"
++#line 19590 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19598,16 +19601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19604: \$? = $ac_status" >&5
++ echo "$as_me:19607: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19607: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19610: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19610: \$? = $ac_status" >&5
++ echo "$as_me:19613: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unctrl_header=$cf_header
+ break
+@@ -19620,12 +19623,12 @@
+ done
+
+ fi
+-echo "$as_me:19623: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19626: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+
+ case "$cf_cv_unctrl_header" in
+ (no)
+- { echo "$as_me:19628: WARNING: unctrl.h header not found" >&5
++ { echo "$as_me:19631: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ ;;
+ esac
+@@ -19723,10 +19726,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19726: checking for ${cf_func}" >&5
++ echo "$as_me:19729: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19729: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19735,7 +19738,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19738 "configure"
++#line 19741 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19768,16 +19771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19774: \$? = $ac_status" >&5
++ echo "$as_me:19777: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19780: \$? = $ac_status" >&5
++ echo "$as_me:19783: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19793,7 +19796,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19796: result: $cf_result" >&5
++ echo "$as_me:19799: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19808,10 +19811,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19811: checking for ${cf_func}" >&5
++ echo "$as_me:19814: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19814: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19817: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19820,7 +19823,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19823 "configure"
++#line 19826 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19853,16 +19856,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19856: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19859: \$? = $ac_status" >&5
++ echo "$as_me:19862: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19862: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19865: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19865: \$? = $ac_status" >&5
++ echo "$as_me:19868: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19878,7 +19881,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19881: result: $cf_result" >&5
++ echo "$as_me:19884: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19902,7 +19905,7 @@
+ cf_return="return value"
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19905 "configure"
++#line 19908 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19922,21 +19925,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19928: \$? = $ac_status" >&5
++ echo "$as_me:19931: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19931: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19934: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19934: \$? = $ac_status" >&5
++ echo "$as_me:19937: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6
+
+-echo "${as_me:-configure}:19939: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19942: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TPUTS_ARG $cf_arg
+@@ -19956,14 +19959,14 @@
+ done
+ fi
+
+-echo "$as_me:19959: checking for ncurses extended functions" >&5
++echo "$as_me:19962: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19966 "configure"
++#line 19969 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19978,16 +19981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19984: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19984: \$? = $ac_status" >&5
++ echo "$as_me:19987: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19987: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19990: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19990: \$? = $ac_status" >&5
++ echo "$as_me:19993: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19995,7 +19998,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19998 "configure"
++#line 20001 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20020,16 +20023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20023: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20026: \$? = $ac_status" >&5
++ echo "$as_me:20029: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20029: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20032: \$? = $ac_status" >&5
++ echo "$as_me:20035: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -20043,7 +20046,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20046: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20049: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20057,11 +20060,11 @@
+ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ then
+ cf_define_xpg5=no
+- echo "$as_me:20060: checking if _XPG5 should be defined to enable wide-characters" >&5
++ echo "$as_me:20063: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20064 "configure"
++#line 20067 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20074,16 +20077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20077: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20080: \$? = $ac_status" >&5
++ echo "$as_me:20083: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20083: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20086: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20086: \$? = $ac_status" >&5
++ echo "$as_me:20089: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -20092,7 +20095,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XPG5"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20095 "configure"
++#line 20098 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20105,16 +20108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20111: \$? = $ac_status" >&5
++ echo "$as_me:20114: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20114: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20117: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20117: \$? = $ac_status" >&5
++ echo "$as_me:20120: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_define_xpg5=yes
+ else
+@@ -20125,7 +20128,7 @@
+ CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:20128: result: $cf_define_xpg5" >&5
++ echo "$as_me:20131: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+
+ if test "$cf_define_xpg5" = yes
+@@ -20134,14 +20137,14 @@
+ fi
+ fi
+
+- echo "$as_me:20137: checking for wide-character functions" >&5
++ echo "$as_me:20140: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20144 "configure"
++#line 20147 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20158,16 +20161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20164: \$? = $ac_status" >&5
++ echo "$as_me:20167: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20167: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20170: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20170: \$? = $ac_status" >&5
++ echo "$as_me:20173: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_widechar_funcs=yes
+ else
+@@ -20178,7 +20181,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20181: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20184: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ if test "$cf_cv_widechar_funcs" != no ; then
+
+@@ -20199,14 +20202,14 @@
+
+ fi
+
+-echo "$as_me:20202: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20205: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20209 "configure"
++#line 20212 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20224,16 +20227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20230: \$? = $ac_status" >&5
++ echo "$as_me:20233: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20233: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20236: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20236: \$? = $ac_status" >&5
++ echo "$as_me:20239: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_use_pthreads=yes
+ else
+@@ -20244,21 +20247,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20247: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20250: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+
+-echo "$as_me:20254: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20257: 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 20261 "configure"
++#line 20264 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -20278,16 +20281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20284: \$? = $ac_status" >&5
++ echo "$as_me:20287: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20287: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20290: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20290: \$? = $ac_status" >&5
++ echo "$as_me:20293: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -20299,7 +20302,7 @@
+
+ fi
+
+-echo "$as_me:20302: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20305: 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
+@@ -20308,7 +20311,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:20311: checking for openpty in -lutil" >&5
++echo "$as_me:20314: 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
+@@ -20316,7 +20319,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20319 "configure"
++#line 20322 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20335,16 +20338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20341: \$? = $ac_status" >&5
++ echo "$as_me:20344: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20344: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20347: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20347: \$? = $ac_status" >&5
++ echo "$as_me:20350: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -20355,7 +20358,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20358: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20361: 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
+@@ -20363,7 +20366,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:20366: checking for openpty header" >&5
++echo "$as_me:20369: 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
+@@ -20390,7 +20393,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20393 "configure"
++#line 20396 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20408,16 +20411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20414: \$? = $ac_status" >&5
++ echo "$as_me:20417: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20417: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20420: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20420: \$? = $ac_status" >&5
++ echo "$as_me:20423: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -20435,7 +20438,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:20438: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20441: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20469,7 +20472,7 @@
+ fi
+ fi
+
+-echo "$as_me:20472: checking for function curses_version" >&5
++echo "$as_me:20475: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20479,7 +20482,7 @@
+ cf_cv_func_curses_version=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20482 "configure"
++#line 20485 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20495,15 +20498,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20501: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20501: \$? = $ac_status" >&5
++ echo "$as_me:20504: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:20503: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20506: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20506: \$? = $ac_status" >&5
++ echo "$as_me:20509: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_curses_version=yes
+
+@@ -20518,14 +20521,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20521: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20524: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+
+-echo "$as_me:20528: checking for alternate character set array" >&5
++echo "$as_me:20531: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20535,7 +20538,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20538 "configure"
++#line 20541 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20551,16 +20554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20557: \$? = $ac_status" >&5
++ echo "$as_me:20560: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20560: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20563: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20563: \$? = $ac_status" >&5
++ echo "$as_me:20566: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_acs_map=$name; break
+ else
+@@ -20571,7 +20574,7 @@
+ done
+
+ fi
+-echo "$as_me:20574: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20577: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20581,7 +20584,7 @@
+
+ if test "$cf_enable_widec" = yes; then
+
+-echo "$as_me:20584: checking for wide alternate character set array" >&5
++echo "$as_me:20587: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20591,7 +20594,7 @@
+ for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20594 "configure"
++#line 20597 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20607,16 +20610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20613: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20613: \$? = $ac_status" >&5
++ echo "$as_me:20616: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20616: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20619: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20619: \$? = $ac_status" >&5
++ echo "$as_me:20622: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_map=$name
+ break
+@@ -20627,7 +20630,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ done
+ fi
+-echo "$as_me:20630: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20633: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20635,7 +20638,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+
+-echo "$as_me:20638: checking for wide alternate character constants" >&5
++echo "$as_me:20641: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20645,7 +20648,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20648 "configure"
++#line 20651 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20662,16 +20665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20668: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20668: \$? = $ac_status" >&5
++ echo "$as_me:20671: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20671: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20674: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20674: \$? = $ac_status" >&5
++ echo "$as_me:20677: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20681,7 +20684,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20684 "configure"
++#line 20687 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20697,16 +20700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20703: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20703: \$? = $ac_status" >&5
++ echo "$as_me:20706: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20706: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20709: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20709: \$? = $ac_status" >&5
++ echo "$as_me:20712: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20717,7 +20720,7 @@
+ fi
+
+ fi
+-echo "$as_me:20720: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20723: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20727,10 +20730,10 @@
+
+ fi
+
+-echo "$as_me:20730: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20733: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20733 "configure"
++#line 20736 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20748,16 +20751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20754: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20754: \$? = $ac_status" >&5
++ echo "$as_me:20757: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20757: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20760: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20760: \$? = $ac_status" >&5
++ echo "$as_me:20763: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -20766,7 +20769,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20769: result: $cf_result" >&5
++echo "$as_me:20772: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -20787,14 +20790,14 @@
+ if test "$cf_enable_widec" = yes; then
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20790: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20793: 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 20797 "configure"
++#line 20800 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20812,23 +20815,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20815: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20818: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20818: \$? = $ac_status" >&5
++ echo "$as_me:20821: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20821: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20824: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20824: \$? = $ac_status" >&5
++ echo "$as_me:20827: \$? = $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 20831 "configure"
++#line 20834 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20847,16 +20850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20853: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20853: \$? = $ac_status" >&5
++ echo "$as_me:20856: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20856: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20859: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20859: \$? = $ac_status" >&5
++ echo "$as_me:20862: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -20868,7 +20871,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20871: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20874: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20891,14 +20894,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20894: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20897: 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 20901 "configure"
++#line 20904 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20916,23 +20919,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20922: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20922: \$? = $ac_status" >&5
++ echo "$as_me:20925: \$? = $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:20928: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20928: \$? = $ac_status" >&5
++ echo "$as_me:20931: \$? = $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 20935 "configure"
++#line 20938 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20951,16 +20954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20957: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20957: \$? = $ac_status" >&5
++ echo "$as_me:20960: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20963: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20963: \$? = $ac_status" >&5
++ echo "$as_me:20966: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -20972,7 +20975,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20975: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20978: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20995,14 +20998,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20998: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:21001: 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 21005 "configure"
++#line 21008 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -21020,23 +21023,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21026: \$? = $ac_status" >&5
++ echo "$as_me:21029: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21029: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21032: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21032: \$? = $ac_status" >&5
++ echo "$as_me:21035: \$? = $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 21039 "configure"
++#line 21042 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -21055,16 +21058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21058: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21061: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21061: \$? = $ac_status" >&5
++ echo "$as_me:21064: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21064: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21067: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21067: \$? = $ac_status" >&5
++ echo "$as_me:21070: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -21076,7 +21079,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21079: result: $cf_cv_wint_t" >&5
++echo "$as_me:21082: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21100,10 +21103,10 @@
+
+ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+
+-echo "$as_me:21103: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21106: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21106 "configure"
++#line 21109 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21121,16 +21124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21127: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21127: \$? = $ac_status" >&5
++ echo "$as_me:21130: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21130: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21133: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21133: \$? = $ac_status" >&5
++ echo "$as_me:21136: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21139,7 +21142,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21142: result: $cf_result" >&5
++echo "$as_me:21145: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21161,10 +21164,10 @@
+
+ if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+
+-echo "$as_me:21164: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21167: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21167 "configure"
++#line 21170 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21182,16 +21185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21185: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21188: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21188: \$? = $ac_status" >&5
++ echo "$as_me:21191: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21191: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21194: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21194: \$? = $ac_status" >&5
++ echo "$as_me:21197: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21200,7 +21203,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21203: result: $cf_result" >&5
++echo "$as_me:21206: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21222,10 +21225,10 @@
+
+ if test "$NCURSES_OK_WINT_T" = 0 ; then
+
+-echo "$as_me:21225: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21228: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21228 "configure"
++#line 21231 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21243,16 +21246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21249: \$? = $ac_status" >&5
++ echo "$as_me:21252: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21252: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21255: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21255: \$? = $ac_status" >&5
++ echo "$as_me:21258: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21261,7 +21264,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21264: result: $cf_result" >&5
++echo "$as_me:21267: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21290,11 +21293,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21293: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21296: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21297 "configure"
++#line 21300 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21327,16 +21330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21333: \$? = $ac_status" >&5
++ echo "$as_me:21336: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21336: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21339: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21339: \$? = $ac_status" >&5
++ echo "$as_me:21342: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21346,7 +21349,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21349: result: $cf_result" >&5
++echo "$as_me:21352: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = yes ; then
+@@ -21358,14 +21361,14 @@
+ EOF
+
+ else
+- echo "$as_me:21361: checking for data $cf_data in library" >&5
++ echo "$as_me:21364: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ # BSD linkers insist on making weak linkage, but resolve at runtime.
+ if test "$cross_compiling" = yes; then
+
+ # cross-compiling
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21368 "configure"
++#line 21371 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21404,16 +21407,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21410: \$? = $ac_status" >&5
++ echo "$as_me:21413: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21413: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21416: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21416: \$? = $ac_status" >&5
++ echo "$as_me:21419: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21425,7 +21428,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21428 "configure"
++#line 21431 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21457,15 +21460,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21463: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21463: \$? = $ac_status" >&5
++ echo "$as_me:21466: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21465: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21468: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21468: \$? = $ac_status" >&5
++ echo "$as_me:21471: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21477,7 +21480,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+- echo "$as_me:21480: result: $cf_result" >&5
++ echo "$as_me:21483: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21494,7 +21497,7 @@
+
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+- echo "$as_me:21497: checking for X" >&5
++ echo "$as_me:21500: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -21598,17 +21601,17 @@
+ # Guess where to find include files, by looking for Intrinsic.h.
+ # First, try using that file with no special directory specified.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21601 "configure"
++#line 21604 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:21605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21608: \"$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:21611: \$? = $ac_status" >&5
++ echo "$as_me:21614: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21641,7 +21644,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21644 "configure"
++#line 21647 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -21653,16 +21656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21659: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21659: \$? = $ac_status" >&5
++ echo "$as_me:21662: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21662: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21665: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21665: \$? = $ac_status" >&5
++ echo "$as_me:21668: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21700,7 +21703,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:21703: result: $have_x" >&5
++ echo "$as_me:21706: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -21710,7 +21713,7 @@
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+- echo "$as_me:21713: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:21716: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -21737,11 +21740,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:21740: checking whether -R must be followed by a space" >&5
++ echo "$as_me:21743: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21744 "configure"
++#line 21747 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21753,16 +21756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21759: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21759: \$? = $ac_status" >&5
++ echo "$as_me:21762: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21762: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21765: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21765: \$? = $ac_status" >&5
++ echo "$as_me:21768: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -21772,13 +21775,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:21775: result: no" >&5
++ echo "$as_me:21778: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21781 "configure"
++#line 21784 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21790,16 +21793,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21796: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21796: \$? = $ac_status" >&5
++ echo "$as_me:21799: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21799: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21802: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21802: \$? = $ac_status" >&5
++ echo "$as_me:21805: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -21809,11 +21812,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:21812: result: yes" >&5
++ echo "$as_me:21815: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:21816: result: neither works" >&5
++ echo "$as_me:21819: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -21833,7 +21836,7 @@
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21836 "configure"
++#line 21839 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21852,22 +21855,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21858: \$? = $ac_status" >&5
++ echo "$as_me:21861: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21861: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21864: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21864: \$? = $ac_status" >&5
++ echo "$as_me:21867: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21870: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21873: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21875,7 +21878,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21878 "configure"
++#line 21881 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21894,16 +21897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21900: \$? = $ac_status" >&5
++ echo "$as_me:21903: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21903: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21906: \$? = $ac_status" >&5
++ echo "$as_me:21909: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21914,14 +21917,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21917: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21920: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- echo "$as_me:21924: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:21927: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21929,7 +21932,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21932 "configure"
++#line 21935 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21948,16 +21951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21954: \$? = $ac_status" >&5
++ echo "$as_me:21957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21957: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21960: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21960: \$? = $ac_status" >&5
++ echo "$as_me:21963: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21968,7 +21971,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21971: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21974: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21987,13 +21990,13 @@
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+- echo "$as_me:21990: checking for gethostbyname" >&5
++ echo "$as_me:21993: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21996 "configure"
++#line 21999 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22024,16 +22027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22030: \$? = $ac_status" >&5
++ echo "$as_me:22033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22033: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22036: \$? = $ac_status" >&5
++ echo "$as_me:22039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -22043,11 +22046,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22046: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22049: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+
+ if test $ac_cv_func_gethostbyname = no; then
+- echo "$as_me:22050: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:22053: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22055,7 +22058,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22058 "configure"
++#line 22061 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22074,16 +22077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22080: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22080: \$? = $ac_status" >&5
++ echo "$as_me:22083: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22083: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22086: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22086: \$? = $ac_status" >&5
++ echo "$as_me:22089: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22094,14 +22097,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22097: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22100: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+- echo "$as_me:22104: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:22107: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22109,7 +22112,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22112 "configure"
++#line 22115 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22128,16 +22131,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22134: \$? = $ac_status" >&5
++ echo "$as_me:22137: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22137: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22140: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22140: \$? = $ac_status" >&5
++ echo "$as_me:22143: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22148,7 +22151,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22151: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22154: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22164,13 +22167,13 @@
+ # variants that don't use the nameserver (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+- echo "$as_me:22167: checking for connect" >&5
++ echo "$as_me:22170: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22173 "configure"
++#line 22176 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22201,16 +22204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22207: \$? = $ac_status" >&5
++ echo "$as_me:22210: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22210: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22213: \$? = $ac_status" >&5
++ echo "$as_me:22216: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -22220,11 +22223,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22223: result: $ac_cv_func_connect" >&5
++echo "$as_me:22226: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+
+ if test $ac_cv_func_connect = no; then
+- echo "$as_me:22227: checking for connect in -lsocket" >&5
++ echo "$as_me:22230: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22232,7 +22235,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22235 "configure"
++#line 22238 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22251,16 +22254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22257: \$? = $ac_status" >&5
++ echo "$as_me:22260: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22260: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22263: \$? = $ac_status" >&5
++ echo "$as_me:22266: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -22271,7 +22274,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22274: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22277: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22280,13 +22283,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:22283: checking for remove" >&5
++ echo "$as_me:22286: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22289 "configure"
++#line 22292 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22317,16 +22320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22323: \$? = $ac_status" >&5
++ echo "$as_me:22326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22329: \$? = $ac_status" >&5
++ echo "$as_me:22332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -22336,11 +22339,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22339: result: $ac_cv_func_remove" >&5
++echo "$as_me:22342: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+
+ if test $ac_cv_func_remove = no; then
+- echo "$as_me:22343: checking for remove in -lposix" >&5
++ echo "$as_me:22346: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22348,7 +22351,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22351 "configure"
++#line 22354 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22367,16 +22370,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22373: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22373: \$? = $ac_status" >&5
++ echo "$as_me:22376: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22376: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22379: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22379: \$? = $ac_status" >&5
++ echo "$as_me:22382: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -22387,7 +22390,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22390: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22393: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22396,13 +22399,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:22399: checking for shmat" >&5
++ echo "$as_me:22402: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22405 "configure"
++#line 22408 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22433,16 +22436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22439: \$? = $ac_status" >&5
++ echo "$as_me:22442: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22442: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22445: \$? = $ac_status" >&5
++ echo "$as_me:22448: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -22452,11 +22455,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22455: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22458: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+
+ if test $ac_cv_func_shmat = no; then
+- echo "$as_me:22459: checking for shmat in -lipc" >&5
++ echo "$as_me:22462: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22464,7 +22467,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22467 "configure"
++#line 22470 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22483,16 +22486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22489: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22489: \$? = $ac_status" >&5
++ echo "$as_me:22492: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22492: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22495: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22495: \$? = $ac_status" >&5
++ echo "$as_me:22498: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22503,7 +22506,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22506: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22509: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22521,7 +22524,7 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+- echo "$as_me:22524: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:22527: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22529,7 +22532,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22532 "configure"
++#line 22535 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22548,16 +22551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22554: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22554: \$? = $ac_status" >&5
++ echo "$as_me:22557: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22557: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22560: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22560: \$? = $ac_status" >&5
++ echo "$as_me:22563: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22568,7 +22571,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22571: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22574: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22615,16 +22618,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22618: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22621: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22623: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22626: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22627: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22630: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22663,16 +22666,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22666: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22669: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22671: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22674: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22675: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22678: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22711,23 +22714,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22714: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22717: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22719: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22722: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22723: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22726: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:22730: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22733: 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.
+@@ -22744,7 +22747,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:22747: result: $enable_warnings" >&5
++echo "$as_me:22750: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22767,10 +22770,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:22770: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:22773: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22773 "${as_me:-configure}"
++#line 22776 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22820,12 +22823,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22826: \$? = $ac_status" >&5
++ echo "$as_me:22829: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:22828: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:22831: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -22903,7 +22906,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22906 "configure"
++#line 22909 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -22918,26 +22921,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22921: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22924: \$? = $ac_status" >&5
++ echo "$as_me:22927: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22927: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22930: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22930: \$? = $ac_status" >&5
++ echo "$as_me:22933: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:22933: checking for X11/Xt const-feature" >&5
++echo "$as_me:22936: 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 22940 "configure"
++#line 22943 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -22955,16 +22958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22961: \$? = $ac_status" >&5
++ echo "$as_me:22964: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22964: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22967: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22967: \$? = $ac_status" >&5
++ echo "$as_me:22970: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -22979,7 +22982,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22982: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22985: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -23008,7 +23011,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 23011 "${as_me:-configure}"
++#line 23014 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -23024,7 +23027,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:23027: checking for $CC warning options..." >&5
++ { echo "$as_me:23030: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -23040,12 +23043,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:23043: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:23046: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23046: \$? = $ac_status" >&5
++ echo "$as_me:23049: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:23048: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23051: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -23053,7 +23056,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:23056: checking for $CC warning options..." >&5
++ { echo "$as_me:23059: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -23076,12 +23079,12 @@
+ Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:23079: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:23082: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23082: \$? = $ac_status" >&5
++ echo "$as_me:23085: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:23084: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23087: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -23089,7 +23092,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23095: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23099,7 +23102,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23105: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23116,7 +23119,7 @@
+
+ fi
+
+-echo "$as_me:23119: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23122: 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.
+@@ -23138,7 +23141,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:23141: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23144: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23252,23 +23255,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:23255: checking for dmalloc.h" >&5
++ echo "$as_me:23258: 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 23261 "configure"
++#line 23264 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23268: \"$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:23271: \$? = $ac_status" >&5
++ echo "$as_me:23274: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23287,11 +23290,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23290: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23293: 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:23294: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23297: 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
+@@ -23299,7 +23302,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23302 "configure"
++#line 23305 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23318,16 +23321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23324: \$? = $ac_status" >&5
++ echo "$as_me:23327: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23330: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23330: \$? = $ac_status" >&5
++ echo "$as_me:23333: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23338,7 +23341,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23341: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23344: 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
+@@ -23353,7 +23356,7 @@
+
+ fi
+
+-echo "$as_me:23356: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:23359: 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.
+@@ -23375,7 +23378,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:23378: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23381: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23489,23 +23492,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:23492: checking for dbmalloc.h" >&5
++ echo "$as_me:23495: 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 23498 "configure"
++#line 23501 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23502: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23505: \"$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:23508: \$? = $ac_status" >&5
++ echo "$as_me:23511: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23524,11 +23527,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23527: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23530: 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:23531: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23534: 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
+@@ -23536,7 +23539,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23539 "configure"
++#line 23542 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23555,16 +23558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23561: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23561: \$? = $ac_status" >&5
++ echo "$as_me:23564: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23564: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23567: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23567: \$? = $ac_status" >&5
++ echo "$as_me:23570: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23575,7 +23578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23578: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23581: 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
+@@ -23590,7 +23593,7 @@
+
+ fi
+
+-echo "$as_me:23593: checking if you want to use valgrind for testing" >&5
++echo "$as_me:23596: 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.
+@@ -23612,7 +23615,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:23615: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23618: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23725,7 +23728,7 @@
+ ;;
+ esac
+
+-echo "$as_me:23728: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23731: 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.
+@@ -23736,7 +23739,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:23739: result: $with_no_leaks" >&5
++echo "$as_me:23742: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -23754,7 +23757,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:23757: checking for an rpath option" >&5
++ echo "$as_me:23760: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -23785,12 +23788,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:23788: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:23791: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:23793: checking if we need a space after rpath option" >&5
++ echo "$as_me:23796: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ cf_save_LIBS="$LIBS"
+
+@@ -23811,7 +23814,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23814 "configure"
++#line 23817 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -23823,16 +23826,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23829: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23829: \$? = $ac_status" >&5
++ echo "$as_me:23832: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23832: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23835: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23835: \$? = $ac_status" >&5
++ echo "$as_me:23838: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -23842,14 +23845,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:23845: result: $cf_rpath_space" >&5
++ echo "$as_me:23848: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+ esac
+ fi
+
+-echo "$as_me:23852: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23855: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -23867,22 +23870,22 @@
+
+ fi;
+ if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+-echo "$as_me:23870: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23873: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:23875: checking for updated LDFLAGS" >&5
++echo "$as_me:23878: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+- echo "$as_me:23878: result: maybe" >&5
++ echo "$as_me:23881: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+
+ for ac_prog in ldd
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:23885: checking for $ac_word" >&5
++echo "$as_me:23888: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23897,7 +23900,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:23900: found $ac_dir/$ac_word" >&5
++echo "$as_me:23903: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -23905,10 +23908,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:23908: result: $cf_ldd_prog" >&5
++ echo "$as_me:23911: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:23911: result: no" >&5
++ echo "$as_me:23914: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -23922,7 +23925,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23925 "configure"
++#line 23928 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -23934,16 +23937,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23940: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23940: \$? = $ac_status" >&5
++ echo "$as_me:23943: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23943: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23946: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23946: \$? = $ac_status" >&5
++ echo "$as_me:23949: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -23971,7 +23974,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:23974: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23977: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -23983,11 +23986,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23986: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23989: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23990: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23993: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -24024,7 +24027,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:24027: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24030: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -24037,11 +24040,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:24040: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24043: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:24044: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24047: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24078,7 +24081,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:24081: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -24091,14 +24094,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:24094: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24097: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:24098: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24101: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:24101: result: no" >&5
++ echo "$as_me:24104: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -24188,7 +24191,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24191: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24194: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24369,7 +24372,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:24372: error: ambiguous option: $1
++ { { echo "$as_me:24375: 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;}
+@@ -24388,7 +24391,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:24391: error: unrecognized option: $1
++ -*) { { echo "$as_me:24394: 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;}
+@@ -24438,7 +24441,7 @@
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+- *) { { echo "$as_me:24441: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:24444: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -24754,7 +24757,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:24757: creating $ac_file" >&5
++ { echo "$as_me:24760: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -24772,7 +24775,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24775: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24778: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -24785,7 +24788,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24788: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24791: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24801,7 +24804,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:24804: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:24807: 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;}
+@@ -24810,7 +24813,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:24813: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:24816: 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;}
+@@ -24855,7 +24858,7 @@
+ ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"`
+ if test -z "$ac_init"; then
+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+- { echo "$as_me:24858: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:24861: 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;}
+@@ -24866,7 +24869,7 @@
+ $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
+ if test -s "$tmp"/out; then
+ ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
+- { echo "$as_me:24869: WARNING: Some variables may not be substituted:
++ { echo "$as_me:24872: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24915,7 +24918,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:24918: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:24921: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -24926,7 +24929,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24929: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24932: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -24939,7 +24942,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24942: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24945: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24997,7 +25000,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:25000: $ac_file is unchanged" >&5
++ { echo "$as_me:25003: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/demo_menus.c
+Prereq: 1.83
+--- ncurses-6.5-20241123+/test/demo_menus.c 2024-10-19 21:53:57.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_menus.c 2024-11-30 18:52:09.000000000 +0000
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: demo_menus.c,v 1.83 2024/10/19 21:53:57 tom Exp $
++ * $Id: demo_menus.c,v 1.85 2024/11/30 18:52:09 tom Exp $
+ *
+ * Demonstrate a variety of functions from the menu library.
+ * Thomas Dickey - 2005/4/9
+@@ -991,7 +991,7 @@
+ ," -H rip-off header line (can repeat)"
+ #endif
+ #ifdef TRACE
+- ," -t mask specify default trace-level (may toggle with ^T)"
++ ," -D mask specify trace mask (may toggle with ^T)"
+ #endif
+ };
+ size_t n;
+@@ -1011,7 +1011,7 @@
+ setlocale(LC_ALL, "");
+ START_TRACE();
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "FHt:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "D:FH")) != -1) {
+ switch (ch) {
+ #if HAVE_RIPOFFLINE
+ case 'F':
+@@ -1022,7 +1022,7 @@
+ break;
+ #endif /* HAVE_RIPOFFLINE */
+ #ifdef TRACE
+- case 't':
++ case 'D':
+ curses_trace((unsigned) strtoul(optarg, 0, 0));
+ break;
+ #endif
+Index: test/demo_tabs.c
+Prereq: 1.10
+--- ncurses-6.5-20241123+/test/demo_tabs.c 2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_tabs.c 2024-11-30 18:47:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey *
++ * Copyright 2019-2022,2024 Thomas E. Dickey *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+@@ -29,7 +29,7 @@
+ /*
+ * Author: Thomas E. Dickey
+ *
+- * $Id: demo_tabs.c,v 1.10 2022/12/04 00:40:11 tom Exp $
++ * $Id: demo_tabs.c,v 1.12 2024/11/30 18:47:39 tom Exp $
+ *
+ * A simple demo of tabs in curses.
+ */
+@@ -48,7 +48,7 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -l COUNT total number of lines to show"
++ ," -m NUM total number of lines to show"
+ ," -t NUM set TABSIZE variable to the given value"
+ };
+ unsigned n;
+@@ -69,9 +69,9 @@
+ int line_limit = -1;
+ int curses_stops = -1;
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "l:t:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "m:t:")) != -1) {
+ switch (ch) {
+- case 'l':
++ case 'm':
+ line_limit = atoi(optarg);
+ break;
+ case 't':
+Index: test/demo_termcap.c
+Prereq: 1.70
+--- ncurses-6.5-20241123+/test/demo_termcap.c 2024-10-06 20:05:09.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_termcap.c 2024-11-30 18:31:01.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+ * Author: Thomas E. Dickey
+ *
+- * $Id: demo_termcap.c,v 1.70 2024/10/06 20:05:09 tom Exp $
++ * $Id: demo_termcap.c,v 1.72 2024/11/30 18:31:01 tom Exp $
+ *
+ * A simple demo of the termcap interface.
+ */
+@@ -756,10 +756,10 @@
+ ," -b print boolean-capabilities"
+ ," -d LIST colon-separated list of databases to use"
+ ," -e NAME environment variable to set with -d option"
+- ," -i NAME terminal description to use as names for \"-a\" option, etc."
++ ," -i NAME terminal description to use as names for \"-a\" option"
+ ," -n print numeric-capabilities"
+ ," -q quiet (prints only counts)"
+- ," -r COUNT repeat for given count"
++ ," -r NUM repeat tests NUM times"
+ ," -s print string-capabilities"
+ ," -v print termcap-variables"
+ #ifdef NCURSES_VERSION
+Index: test/demo_terminfo.c
+Prereq: 1.59
+--- ncurses-6.5-20241123+/test/demo_terminfo.c 2024-10-06 21:16:43.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_terminfo.c 2024-11-30 18:31:01.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+ * Author: Thomas E. Dickey
+ *
+- * $Id: demo_terminfo.c,v 1.59 2024/10/06 21:16:43 tom Exp $
++ * $Id: demo_terminfo.c,v 1.61 2024/11/30 18:31:01 tom Exp $
+ *
+ * A simple demo of the terminfo interface.
+ */
+@@ -786,11 +786,11 @@
+ ," -b print boolean-capabilities"
+ ," -d LIST colon-separated list of databases to use"
+ ," -e NAME environment variable to set with -d option"
+- ," -f print full names"
++ ," -f print full terminfo names"
+ ," -i NAME terminal description to use as names for \"-a\" option"
+ ," -n print numeric-capabilities"
+ ," -q quiet (prints only counts)"
+- ," -r COUNT repeat for given count"
++ ," -r NUM repeat tests NUM times"
+ ," -s print string-capabilities"
+ #ifdef NCURSES_VERSION
+ ," -x print extended capabilities"
+Index: test/dots_curses.c
+Prereq: 1.25
+--- ncurses-6.5-20241123+/test/dots_curses.c 2023-01-07 17:21:48.000000000 +0000
++++ ncurses-6.5-20241130/test/dots_curses.c 2024-11-30 17:48:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey *
++ * Copyright 2018-2023,2024 Thomas E. Dickey *
+ * Copyright 2014,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_curses.c,v 1.25 2023/01/07 17:21:48 tom Exp $
++ * $Id: dots_curses.c,v 1.26 2024/11/30 17:48:07 tom Exp $
+ *
+ * A simple demo of the curses interface used for comparison with termcap.
+ */
+@@ -97,7 +97,7 @@
+ ,"Options:"
+ ," -T TERM override $TERM"
+ #if HAVE_USE_DEFAULT_COLORS
+- ," -d invoke use_default_colors()"
++ ," -d invoke use_default_colors"
+ #endif
+ #if HAVE_USE_ENV
+ ," -e allow environment $LINES / $COLUMNS"
+Index: test/dots_xcurses.c
+Prereq: 1.30
+--- ncurses-6.5-20241123+/test/dots_xcurses.c 2024-08-31 15:55:52.000000000 +0000
++++ ncurses-6.5-20241130/test/dots_xcurses.c 2024-11-30 17:41:18.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+ * Author: Thomas E. Dickey
+ *
+- * $Id: dots_xcurses.c,v 1.30 2024/08/31 15:55:52 tom Exp $
++ * $Id: dots_xcurses.c,v 1.31 2024/11/30 17:41:18 tom Exp $
+ *
+ * A simple demo of the wide-curses interface used for comparison with termcap.
+ */
+@@ -120,7 +120,7 @@
+ ,"Options:"
+ ," -T TERM override $TERM"
+ #if HAVE_USE_DEFAULT_COLORS
+- ," -d invoke use_default_colors()"
++ ," -d invoke use_default_colors"
+ #endif
+ #if HAVE_USE_ENV
+ ," -e allow environment $LINES / $COLUMNS"
+Index: test/filter.c
+Prereq: 1.39
+--- ncurses-6.5-20241123+/test/filter.c 2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/filter.c 2024-11-30 16:49:53.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+ * Author: Thomas E. Dickey 1998
+ *
+- * $Id: filter.c,v 1.39 2024/10/05 19:26:24 tom Exp $
++ * $Id: filter.c,v 1.40 2024/11/30 16:49:53 tom Exp $
+ *
+ * An example of the 'filter()' function in ncurses, this program prompts
+ * for commands and executes them (like a command shell). It illustrates
+@@ -310,7 +310,7 @@
+ #ifdef NCURSES_VERSION
+ ," -a suppress xterm alternate-screen by amending smcup/rmcup"
+ #endif
+- ," -c show current time on prompt line with \"Command\""
++ ," -t show current time on prompt line with \"Command\""
+ #if HAVE_USE_DEFAULT_COLORS
+ ," -d invoke use_default_colors"
+ #endif
+@@ -335,7 +335,7 @@
+ #ifdef NCURSES_VERSION
+ bool a_option = FALSE;
+ #endif
+- bool c_option = FALSE;
++ bool t_option = FALSE;
+ #if HAVE_USE_DEFAULT_COLORS
+ bool d_option = FALSE;
+ #endif
+@@ -344,15 +344,15 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "adtip")) != -1) {
+ switch (ch) {
+ #ifdef NCURSES_VERSION
+ case 'a':
+ a_option = TRUE;
+ break;
+ #endif
+- case 'c':
+- c_option = TRUE;
++ case 't':
++ t_option = TRUE;
+ break;
+ #if HAVE_USE_DEFAULT_COLORS
+ case 'd':
+@@ -408,7 +408,7 @@
+
+ for (;;) {
+ int code = new_command(buffer, sizeof(buffer) - 1,
+- underline, c_option, p_option);
++ underline, t_option, p_option);
+ if (code == ERR || *buffer == '\0')
+ break;
+ reset_shell_mode();
+Index: test/gdc.c
+Prereq: 1.62
+--- ncurses-6.5-20241123+/test/gdc.c 2024-10-06 20:08:59.000000000 +0000
++++ ncurses-6.5-20241130/test/gdc.c 2024-11-30 18:56:02.000000000 +0000
+@@ -34,7 +34,7 @@
+ * modified 10-18-89 for curses (jrl)
+ * 10-18-89 added signal handling
+ *
+- * $Id: gdc.c,v 1.62 2024/10/06 20:08:59 tom Exp $
++ * $Id: gdc.c,v 1.63 2024/11/30 18:56:02 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -166,7 +166,7 @@
+ #endif
+ ," -n reads input from /dev/null"
+ ," -s scrolls each digit into place"
+- ," -t TIME specify starting time as hh:mm:ss (default is ``now'')"
++ ," -t TIME specify starting time as hh:mm:ss (default is \"now\")"
+ };
+ unsigned j;
+ for (j = 0; j < SIZEOF(msg); j++)
+Index: test/hashtest.c
+Prereq: 1.39
+--- ncurses-6.5-20241123+/test/hashtest.c 2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241130/test/hashtest.c 2024-11-30 18:54:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey *
++ * Copyright 2019-2022,2024 Thomas E. Dickey *
+ * Copyright 1998-2013,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -31,7 +31,7 @@
+ *
+ * Generate timing statistics for vertical-motion optimization.
+ *
+- * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $
++ * $Id: hashtest.c,v 1.42 2024/11/30 18:54:40 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -158,13 +158,13 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -c continuous (don't reset between refresh's)"
+- ," -F num leave 'num' lines constant for footer"
+- ," -H num leave 'num' lines constant for header"
+- ," -l num repeat test 'num' times"
++ ," -S continuous (don't reset between refresh's)"
++ ," -F NUM leave NUM lines constant for footer"
++ ," -H NUM leave NUM lines constant for header"
++ ," -r NUM repeat tests NUM times"
+ ," -n test the normal optimizer"
+ ," -o test the hashed optimizer"
+- ," -r reverse the loops"
++ ," -R reverse the loops"
+ ," -s single-step"
+ ," -x assume lower-right corner extension"
+ };
+@@ -188,9 +188,9 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "F:H:RSnor:sx")) != -1) {
+ switch (ch) {
+- case 'c':
++ case 'S':
+ continuous = TRUE;
+ break;
+ case 'F':
+@@ -199,7 +199,7 @@
+ case 'H':
+ head_lines = atoi(optarg);
+ break;
+- case 'l':
++ case 'r':
+ test_loops = atoi(optarg);
+ assert(test_loops >= 0);
+ break;
+@@ -209,7 +209,7 @@
+ case 'o':
+ test_optimize = TRUE;
+ break;
+- case 'r':
++ case 'R':
+ reverse_loops = TRUE;
+ break;
+ case 's':
+Index: test/list_keys.c
+Prereq: 1.34
+--- ncurses-6.5-20241123+/test/list_keys.c 2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/list_keys.c 2024-11-30 18:07:01.000000000 +0000
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: list_keys.c,v 1.34 2024/10/05 19:26:24 tom Exp $
++ * $Id: list_keys.c,v 1.36 2024/11/30 18:07:01 tom Exp $
+ *
+ * Author: Thomas E Dickey
+ *
+@@ -440,9 +440,9 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -f print full names"
++ ," -f print full terminfo names"
+ ," -m print modifier-column for shift/control keys"
+- ," -t print result as CSV table"
++ ," -t print the result as CSV table"
+ #ifdef NCURSES_VERSION
+ ," -x print extended capabilities"
+ #endif
+Index: test/ncurses.c
+Prereq: 1.541
+--- ncurses-6.5-20241123+/test/ncurses.c 2024-10-06 20:18:59.000000000 +0000
++++ ncurses-6.5-20241130/test/ncurses.c 2024-11-30 18:54:06.000000000 +0000
+@@ -41,7 +41,7 @@
+ Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
+ Thomas E. Dickey (beginning revision 1.27 in 1996).
+
+-$Id: ncurses.c,v 1.541 2024/10/06 20:18:59 tom Exp $
++$Id: ncurses.c,v 1.544 2024/11/30 18:54:06 tom Exp $
+
+ ***************************************************************************/
+
+@@ -7647,7 +7647,7 @@
+ ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS"
+ #endif
+ #if USE_SOFTKEYS
+- ," -e fmt specify format for soft-keys test (e)"
++ ," -e FMT specify format for soft-keys test (e)"
+ #endif
+ #if HAVE_RIPOFFLINE
+ ," -F rip-off footer line (can repeat)"
+@@ -7658,13 +7658,13 @@
+ ," -p file rgb values to use in 'd' rather than ncurses's builtin"
+ #endif
+ #if USE_LIBPANEL
+- ," -s msec specify nominal time for panel-demo (default: 1, to hold)"
++ ," -s MSECS specify nominal time for panel-demo (default: 1, to hold)"
+ #endif
+ #if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS)
+ ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment"
+ #endif
+ #ifdef TRACE
+- ," -t mask specify default trace-level (may toggle with ^T)"
++ ," -D mask specify trace mask (may toggle with ^T)"
+ #endif
+ #if HAVE_COLOR_CONTENT
+ ," -x use xterm-compatible control for reading color palette"
+@@ -7907,7 +7907,7 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "D:EFHTa:de:mp:s:x")) != -1) {
+ switch (ch) {
+ #ifdef NCURSES_VERSION_PATCH
+ #if HAVE_USE_DEFAULT_COLORS
+@@ -7971,7 +7971,7 @@
+ break;
+ #endif
+ #ifdef TRACE
+- case 't':
++ case 'D':
+ save_trace = (unsigned) strtol(optarg, 0, 0);
+ break;
+ #endif
+Index: test/padview.c
+Prereq: 1.24
+--- ncurses-6.5-20241123+/test/padview.c 2024-10-06 21:08:25.000000000 +0000
++++ ncurses-6.5-20241130/test/padview.c 2024-11-30 18:14:46.000000000 +0000
+@@ -29,7 +29,7 @@
+ /*
+ * clone of view.c, using pads
+ *
+- * $Id: padview.c,v 1.24 2024/10/06 21:08:25 tom Exp $
++ * $Id: padview.c,v 1.26 2024/11/30 18:14:46 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -256,15 +256,15 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -c use color if terminal supports it"
++ ," -C use color if terminal supports it"
+ ," -i ignore INT, QUIT, TERM signals"
+ #if USE_WIDEC_SUPPORT
+ ," -n use waddch (bytes) rather then wadd_wch (wide-chars)"
+ #endif
+- ," -s start in single-step mode, waiting for input"
++ ," -s start in single-step mode"
+ #ifdef TRACE
+ ," -t trace screen updates"
+- ," -T NUM specify trace mask"
++ ," -D NUM specify trace mask"
+ #endif
+ };
+ size_t n;
+@@ -318,9 +318,9 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) {
+ switch (ch) {
+- case 'c':
++ case 'C':
+ try_color = TRUE;
+ break;
+ case 'i':
+@@ -335,7 +335,7 @@
+ single_step = TRUE;
+ break;
+ #ifdef TRACE
+- case 'T':
++ case 'D':
+ {
+ char *next = 0;
+ int tvalue = (int) strtol(optarg, &next, 0);
+Index: test/pair_content.c
+Prereq: 1.22
+--- ncurses-6.5-20241123+/test/pair_content.c 2023-02-25 16:43:56.000000000 +0000
++++ ncurses-6.5-20241130/test/pair_content.c 2024-11-30 18:31:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey *
++ * Copyright 2018-2023,2024 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.22 2023/02/25 16:43:56 tom Exp $
++ * $Id: pair_content.c,v 1.24 2024/11/30 18:31:01 tom Exp $
+ */
+
+ #define NEED_TIME_H
+@@ -213,10 +213,10 @@
+ ,"Options:"
+ ," -f PAIR first color pair to test (default: 1)"
+ ," -i interactive, showing test-progress"
+- ," -l PAIR last color pair to test (default: max_pairs-1)"
++ ," -F PAIR last color pair to test (default: max_pairs-1)"
+ ," -n do not initialize color pairs"
+ ," -p print data for color pairs instead of testing"
+- ," -r COUNT repeat for given count"
++ ," -r NUM repeat tests NUM times"
+ ," -s initialize pairs sequentially rather than random"
+ #if USE_EXTENDED_COLOR
+ ," -x use extended color pairs/values"
+@@ -236,7 +236,7 @@
+ {
+ int ch;
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) {
+ switch (ch) {
+ case 'f':
+ if ((f_opt = atoi(optarg)) <= 0)
+@@ -245,7 +245,7 @@
+ case 'i':
+ i_opt = 1;
+ break;
+- case 'l':
++ case 'F':
+ if ((l_opt = atoi(optarg)) <= 0)
+ usage(FALSE);
+ break;
+Index: test/picsmap.c
+Prereq: 1.150
+--- ncurses-6.5-20241123+/test/picsmap.c 2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/picsmap.c 2024-11-30 21:39:57.000000000 +0000
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.150 2024/10/05 19:26:24 tom Exp $
++ * $Id: picsmap.c,v 1.152 2024/11/30 21:39:57 tom Exp $
+ *
+ * Author: Thomas E. Dickey
+ *
+@@ -494,7 +494,7 @@
+ ," -d invoke use_default_colors"
+ #endif
+ ," -L add debugging information to logfile"
+- ," -l FILE write informational messages to FILE"
++ ," -F FILE write informational messages to FILE"
+ ," -p FILE color-palette file (default \"$TERM.dat\")"
+ ," -q less verbose"
+ ," -r FILE xpm uses X rgb color-names in FILE (default \"" RGB_PATH "\")"
+@@ -948,6 +948,7 @@
+ for (n = 0; data[n] != 0; ++n) {
+ if (strlen(t = data[n]) >= sizeof(buf) - 1)
+ continue;
++ t = strcpy(buf, t);
+ if (*(s = skip_s(t)) == '!')
+ continue;
+
+@@ -1156,6 +1157,7 @@
+ for (n = 0; data[n] != 0; ++n) {
+ if (strlen(s = data[n]) >= sizeof(buf) - 1)
+ continue;
++ s = strcpy(buf, s);
+ switch (state) {
+ case 0:
+ if (match_c(s, " /* XPM */ ")) {
+@@ -1730,7 +1732,7 @@
+ const char *palette_path = 0;
+ const char *rgb_path = RGB_PATH;
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLl:p:qr:s:x:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) {
+ switch (ch) {
+ case 'a':
+ if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1
+@@ -1748,7 +1750,7 @@
+ case 'L':
+ debugging = TRUE;
+ break;
+- case 'l':
++ case 'F':
+ if ((logfp = fopen(optarg, "a")) == 0)
+ failed(optarg);
+ break;
+Index: test/savescreen.c
+Prereq: 1.65
+--- ncurses-6.5-20241123+/test/savescreen.c 2024-10-06 21:10:09.000000000 +0000
++++ ncurses-6.5-20241130/test/savescreen.c 2024-11-30 18:48:40.000000000 +0000
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: savescreen.c,v 1.65 2024/10/06 21:10:09 tom Exp $
++ * $Id: savescreen.c,v 1.66 2024/11/30 18:48:40 tom Exp $
+ *
+ * Demonstrate save/restore functions from the curses library.
+ * Thomas Dickey - 2007/7/14
+@@ -261,7 +261,7 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -f file fill/initialize screen using text from this file"
++ ," -f FILE fill/initialize screen using text from this file"
+ ," -i use scr_init/scr_restore rather than scr_set"
+ ," -k keep the restored dump-files rather than removing them"
+ ," -r replay the screen-dump files"
+Index: test/test_arrays.c
+Prereq: 1.13
+--- ncurses-6.5-20241123+/test/test_arrays.c 2022-12-10 23:23:27.000000000 +0000
++++ ncurses-6.5-20241130/test/test_arrays.c 2024-11-30 17:00:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey *
++ * Copyright 2020-2022,2024 Thomas E. Dickey *
+ * Copyright 2007-2010,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -27,7 +27,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $
++ * $Id: test_arrays.c,v 1.14 2024/11/30 17:00:55 tom Exp $
+ *
+ * Author: Thomas E Dickey
+ *
+@@ -53,7 +53,7 @@
+
+ static bool opt_C;
+ static bool opt_T;
+-static bool opt_c;
++static bool opt_s;
+ static bool opt_f;
+ static bool opt_n;
+ static bool opt_t;
+@@ -75,15 +75,15 @@
+ dump_plain(void)
+ {
+ PLAIN(opt_T && opt_n, boolnames);
+- PLAIN(opt_C && opt_c, boolcodes);
++ PLAIN(opt_C && opt_s, boolcodes);
+ PLAIN(opt_T && opt_f, boolfnames);
+
+ PLAIN(opt_T && opt_n, numnames);
+- PLAIN(opt_C && opt_c, numcodes);
++ PLAIN(opt_C && opt_s, numcodes);
+ PLAIN(opt_T && opt_f, numfnames);
+
+ PLAIN(opt_T && opt_n, strnames);
+- PLAIN(opt_C && opt_c, strcodes);
++ PLAIN(opt_C && opt_s, strcodes);
+ PLAIN(opt_T && opt_f, strfnames);
+ }
+
+@@ -99,7 +99,7 @@
+ STRING(opt_t, "Index");
+ STRING(opt_t, "Type");
+ STRING(opt_n, "Name");
+- STRING(opt_c, "Code");
++ STRING(opt_s, "Code");
+ STRING(opt_f, "FName");
+ printf("\n");
+
+@@ -108,7 +108,7 @@
+ NUMBER(opt_t, r);
+ STRING(opt_t, "bool");
+ STRING(opt_T && opt_n, boolnames[r]);
+- STRING(opt_C && opt_c, boolcodes[r]);
++ STRING(opt_C && opt_s, boolcodes[r]);
+ STRING(opt_T && opt_f, boolfnames[r]);
+ printf("\n");
+ }
+@@ -118,7 +118,7 @@
+ NUMBER(opt_t, r);
+ STRING(opt_t, "num");
+ STRING(opt_T && opt_n, numnames[r]);
+- STRING(opt_C && opt_c, numcodes[r]);
++ STRING(opt_C && opt_s, numcodes[r]);
+ STRING(opt_T && opt_f, numfnames[r]);
+ printf("\n");
+ }
+@@ -128,7 +128,7 @@
+ NUMBER(opt_t, r);
+ STRING(opt_t, "str");
+ STRING(opt_T && opt_n, strnames[r]);
+- STRING(opt_C && opt_c, strcodes[r]);
++ STRING(opt_C && opt_s, strcodes[r]);
+ STRING(opt_T && opt_f, strfnames[r]);
+ printf("\n");
+ }
+@@ -148,7 +148,7 @@
+ ,"Options:"
+ ," -C print termcap names"
+ ," -T print terminfo names"
+- ," -c print termcap names"
++ ," -s print short termcap names"
+ ," -f print full terminfo names"
+ ," -n print short terminfo names"
+ ," -t print the result as CSV table"
+@@ -168,7 +168,7 @@
+ {
+ int ch;
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "CTcfnt")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "CTsfnt")) != -1) {
+ switch (ch) {
+ case 'C':
+ opt_C = TRUE;
+@@ -176,8 +176,8 @@
+ case 'T':
+ opt_T = TRUE;
+ break;
+- case 'c':
+- opt_c = TRUE;
++ case 's':
++ opt_s = TRUE;
+ break;
+ case 'f':
+ opt_f = TRUE;
+@@ -202,8 +202,8 @@
+ if (!(opt_T || opt_C)) {
+ opt_T = opt_C = TRUE;
+ }
+- if (!(opt_c || opt_f || opt_n)) {
+- opt_c = opt_f = opt_n = TRUE;
++ if (!(opt_s || opt_f || opt_n)) {
++ opt_s = opt_f = opt_n = TRUE;
+ }
+
+ if (opt_t) {
+Index: test/test_endwin.c
+Prereq: 1.3
+--- ncurses-6.5-20241123+/test/test_endwin.c 2024-10-05 19:27:33.000000000 +0000
++++ ncurses-6.5-20241130/test/test_endwin.c 2024-11-30 17:34:56.000000000 +0000
+@@ -26,7 +26,7 @@
+ * authorization. *
+ ****************************************************************************/
+ /*
+- * $Id: test_endwin.c,v 1.3 2024/10/05 19:27:33 tom Exp $
++ * $Id: test_endwin.c,v 1.4 2024/11/30 17:34:56 tom Exp $
+ */
+ #include <test.priv.h>
+
+@@ -38,11 +38,11 @@
+ "Usage: test_endwin [options]"
+ ,""
+ ,"Options:"
+- ," -e call endwin() an extra time"
+- ," -i call initscr() before endwin()"
+- ," -n call newterm() before endwin()"
+- ," -r call refresh() before endwin()"
+- ," -s call getch() after endwin(), to refresh screen"
++ ," -e call endwin() an extra time"
++ ," -i call initscr() before endwin()"
++ ," -n call newterm() before endwin()"
++ ," -r call refresh() before endwin()"
++ ," -s call getch() after endwin(), to refresh screen"
+ ,""
+ ,USAGE_COMMON
+ };
+Index: test/test_mouse.c
+Prereq: 1.33
+--- ncurses-6.5-20241123+/test/test_mouse.c 2024-10-05 18:47:56.000000000 +0000
++++ ncurses-6.5-20241130/test/test_mouse.c 2024-11-30 18:46:48.000000000 +0000
+@@ -22,7 +22,7 @@
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
+ ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.33 2024/10/05 18:47:56 tom Exp $
++ * $Id: test_mouse.c,v 1.35 2024/11/30 18:46:48 tom Exp $
+ *
+ * Author: Leonid S Usov
+ *
+@@ -214,8 +214,8 @@
+ ,USAGE_COMMON
+ ,"Options:"
+ ," -r show raw input stream, injecting a new line before every ESC"
+- ," -i n set mouse interval to n; default is 0 (no double-clicks)"
+- ," -T term use terminal description other than $TERM"
++ ," -i NUM set mouse interval to NUM; default is 0 (no double-clicks)"
++ ," -T TERM override $TERM"
+ };
+ unsigned n;
+ for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) {
+Index: test/view.c
+Prereq: 1.147
+--- ncurses-6.5-20241123+/test/view.c 2024-10-06 21:08:05.000000000 +0000
++++ ncurses-6.5-20241130/test/view.c 2024-11-30 18:15:06.000000000 +0000
+@@ -52,7 +52,7 @@
+ * scroll operation worked, and the refresh() code only had to do a
+ * partial repaint.
+ *
+- * $Id: view.c,v 1.147 2024/10/06 21:08:05 tom Exp $
++ * $Id: view.c,v 1.149 2024/11/30 18:15:06 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -382,15 +382,15 @@
+ ,""
+ ,USAGE_COMMON
+ ,"Options:"
+- ," -c use color if terminal supports it"
++ ," -C use color if terminal supports it"
+ ," -i ignore INT, QUIT, TERM signals"
+ #if USE_WIDEC_SUPPORT
+ ," -n use waddch (bytes) rather then wadd_wch (wide-chars)"
+ #endif
+- ," -s start in single-step mode, waiting for input"
++ ," -s start in single-step mode"
+ #ifdef TRACE
+ ," -t trace screen updates"
+- ," -T NUM specify trace mask"
++ ," -D NUM specify trace mask"
+ #endif
+ };
+ size_t n;
+@@ -443,9 +443,9 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) {
+ switch (ch) {
+- case 'c':
++ case 'C':
+ try_color = TRUE;
+ break;
+ case 'i':
+@@ -460,7 +460,7 @@
+ single_step = TRUE;
+ break;
+ #ifdef TRACE
+- case 'T':
++ case 'D':
+ {
+ char *next = 0;
+ int tvalue = (int) strtol(optarg, &next, 0);
+Index: test/worm.c
+Prereq: 1.89
+--- ncurses-6.5-20241123+/test/worm.c 2022-12-24 20:46:49.000000000 +0000
++++ ncurses-6.5-20241130/test/worm.c 2024-11-30 18:53:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2022 Thomas E. Dickey *
++ * Copyright 2018-2022,2024 Thomas E. Dickey *
+ * Copyright 1998-2016,2017 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+@@ -53,7 +53,7 @@
+ traces will be dumped. The program stops and waits for one character of
+ input at the beginning and end of the interval.
+
+- $Id: worm.c,v 1.89 2022/12/24 20:46:49 tom Exp $
++ $Id: worm.c,v 1.93 2024/11/30 18:53:39 tom Exp $
+ */
+
+ #include <test.priv.h>
+@@ -119,9 +119,6 @@
+ #define Locked(statement) statement
+ #endif
+
+-#ifdef TRACE
+-static int generation, trace_start, trace_end;
+-#endif /* TRACE */
+ /* *INDENT-OFF* */
+ static const struct options {
+ int nopts;
+@@ -463,11 +460,10 @@
+ ," -d invoke use_default_colors"
+ #endif
+ ," -f fill screen with copies of \"WORM\" at start"
+- ," -l <n> set length of worms"
+- ," -n <n> set number of worms"
++ ," -M NUM set length of worms"
++ ," -n NUM set number of worms"
+ ," -t leave trail of \".\""
+ #ifdef TRACE
+- ," -T <start>,<end> set trace interval"
+ ," -N suppress cursor-movement optimization"
+ #endif
+ };
+@@ -497,7 +493,7 @@
+
+ setlocale(LC_ALL, "");
+
+- while ((ch = getopt(argc, argv, OPTS_COMMON "dfl:n:tT:N")) != -1) {
++ while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfn:t")) != -1) {
+ switch (ch) {
+ #if HAVE_USE_DEFAULT_COLORS
+ case 'd':
+@@ -507,7 +503,7 @@
+ case 'f':
+ field = "WORM";
+ break;
+- case 'l':
++ case 'M':
+ if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) {
+ fprintf(stderr, "%s: Invalid length\n", *argv);
+ usage(FALSE);
+@@ -523,10 +519,6 @@
+ trail = '.';
+ break;
+ #ifdef TRACE
+- case 'T':
+- if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2)
+- usage(FALSE);
+- break;
+ case 'N':
+ _nc_optimize_enable ^= OPTIMIZE_ALL; /* declared by ncurses */
+ break;
+@@ -631,19 +623,6 @@
+ while (!done) {
+ Locked(++sequence);
+ if ((ch = get_input()) > 0) {
+-#ifdef TRACE
+- if (trace_start || trace_end) {
+- if (generation == trace_start) {
+- curses_trace(TRACE_CALLS);
+- get_input();
+- } else if (generation == trace_end) {
+- curses_trace(0);
+- get_input();
+- }
+-
+- generation++;
+- }
+-#endif
+
+ #ifdef KEY_RESIZE
+ if (ch == KEY_RESIZE) {