aboutsummaryrefslogtreecommitdiff
path: root/packages/ncurses/6.5/ncurses-6.5-20240810.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/ncurses/6.5/ncurses-6.5-20240810.patch')
-rw-r--r--packages/ncurses/6.5/ncurses-6.5-20240810.patch39746
1 files changed, 39746 insertions, 0 deletions
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240810.patch b/packages/ncurses/6.5/ncurses-6.5-20240810.patch
new file mode 100644
index 00000000..fb609a6c
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240810.patch
@@ -0,0 +1,39746 @@
+# ncurses 6.5 - patch 20240810 - 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-20240810.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created Sat Aug 10 19:08:00 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4 | 70
+# Ada95/configure | 2587 ++++++++++----------
+# NEWS | 11
+# VERSION | 2
+# aclocal.m4 | 83
+# config.guess | 15
+# config.sub | 733 ++++-
+# configure | 4725 ++++++++++++++++++-------------------
+# dist.mk | 4
+# menu/menu.priv.h | 7
+# misc/Makefile.in | 59
+# misc/run_tic.in | 49
+# package/debian-mingw/changelog | 4
+# package/debian-mingw64/changelog | 4
+# package/debian/changelog | 4
+# package/mingw-ncurses.nsi | 4
+# package/mingw-ncurses.spec | 2
+# package/ncurses.spec | 2
+# package/ncursest.spec | 2
+# test/aclocal.m4 | 80
+# test/configure | 4006 +++++++++++++++----------------
+# test/configure.in | 8
+# 22 files changed, 6489 insertions(+), 5972 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq: 1.217
+--- ncurses-6.5-20240727+/Ada95/aclocal.m4 2024-06-22 17:42:22.000000000 +0000
++++ ncurses-6.5-20240810/Ada95/aclocal.m4 2024-08-10 15:52:30.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.217 2024/06/22 17:42:22 tom Exp $
++dnl $Id: aclocal.m4,v 1.220 2024/08/10 15:52:30 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -1622,6 +1622,26 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
++dnl ----------------
++dnl Use this in case-statements to check for pathname syntax, i.e., absolute
++dnl pathnames. The "x" is assumed since we provide an alternate form for DOS.
++AC_DEFUN([CF_GLOB_FULLPATH],[
++AC_REQUIRE([CF_WITH_SYSTYPE])dnl
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
++ ;;
++(*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++ ;;
++esac
++AC_SUBST(GLOB_FULLPATH_POSIX)
++AC_SUBST(GLOB_FULLPATH_OTHER)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
+ dnl -----------------
+ AC_DEFUN([CF_GNATPREP_OPT_T],[
+@@ -3434,35 +3454,35 @@
+ AC_MSG_RESULT($PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
++dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname. Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+ dnl result begins with 'NONE'. This is necessary to work around autoconf's
+ dnl delayed evaluation of those symbols.
+ AC_DEFUN([CF_PATH_SYNTAX],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++
+ if test "x$prefix" != xNONE; then
+ cf_path_syntax="$prefix"
+ else
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".[$]$1" in
+-(.\[$]\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x[$]$1" in
++(x\[$]\(*\)*|x\'*\'*)
+ ;;
+-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
++(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
+ eval $1="[$]$1"
+- case ".[$]$1" in
+- (.NONE/*)
++ case "x[$]$1" in
++ (xNONE/*)
+ $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+@@ -3834,15 +3854,16 @@
+ AC_SUBST(cf_ada_config_C)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
++dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
+ dnl ---------------
+ dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the
+ dnl misc/tabset install won't work properly. Usually this happens only when
+ dnl using the fallback mkinstalldirs script
+ AC_DEFUN([CF_PROG_INSTALL],
+ [AC_PROG_INSTALL
+-case $INSTALL in
+-(/*)
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+ (*)
+ CF_DIRNAME(cf_dir,$INSTALL)
+@@ -4657,12 +4678,12 @@
+ $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
++dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
+ dnl -----------
+ dnl Check for multibyte support, and if not found, utf8 compatibility library
+ AC_DEFUN([CF_UTF8_LIB],
+ [
+-AC_HAVE_HEADERS(wchar.h)
++AC_CHECK_HEADERS(wchar.h)
+ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+ cf_save_LIBS="$LIBS"
+ AC_TRY_LINK([
+@@ -4949,7 +4970,7 @@
+ AC_SUBST($3)dnl
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -4963,6 +4984,7 @@
+ dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config,
+ dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR.
+ AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
+ case "$PKG_CONFIG" in
+ (no|none|yes)
+@@ -4996,10 +5018,10 @@
+ ;;
+ (x)
+ ;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ PKG_CONFIG_LIBDIR=
+ ;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+ AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+ cf_search_path=
+@@ -5018,7 +5040,15 @@
+ pkg-config \
+ pkgconf
+ do
+- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++ cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++ case "$cf_raw_search_path" in
++ (*\\*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++ ;;
++ (*/*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++ ;;
++ esac
+ test -n "$cf_search_path" && break
+ done
+
+Index: Ada95/configure
+--- ncurses-6.5-20240727+/Ada95/configure 2024-07-06 18:15:37.000000000 +0000
++++ ncurses-6.5-20240810/Ada95/configure 2024-08-03 17:38:14.000000000 +0000
+@@ -3224,6 +3224,17 @@
+
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
++ ;;
++(*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++ ;;
++esac
++
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -3236,7 +3247,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:3239: checking for a BSD compatible install" >&5
++echo "$as_me:3250: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -3285,7 +3296,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:3288: result: $INSTALL" >&5
++echo "$as_me:3299: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3296,8 +3307,8 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-case $INSTALL in
+-(/*)
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+ (*)
+ cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
+@@ -3306,7 +3317,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3309: checking if you want to install stripped executables" >&5
++echo "$as_me:3320: 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.
+@@ -3323,7 +3334,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:3326: result: $enable_stripping" >&5
++echo "$as_me:3337: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -3334,7 +3345,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:3337: checking if install accepts -p option" >&5
++echo "$as_me:3348: 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
+@@ -3365,10 +3376,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:3368: result: $cf_cv_install_p" >&5
++echo "$as_me:3379: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:3371: checking if install needs to be told about ownership" >&5
++echo "$as_me:3382: 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)
+@@ -3379,7 +3390,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3382: result: $with_install_o" >&5
++echo "$as_me:3393: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3390,7 +3401,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:3393: checking if you want to specify strip-program" >&5
++ echo "$as_me:3404: 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.
+@@ -3400,11 +3411,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:3403: result: $with_strip_program" >&5
++ echo "$as_me:3414: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:3407: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:3418: 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
+@@ -3425,11 +3436,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:3428: result: $check_install_strip" >&5
++ echo "$as_me:3439: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:3432: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:3443: 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
+ ;;
+@@ -3444,7 +3455,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -3454,7 +3465,7 @@
+ fi
+ fi
+
+-echo "$as_me:3457: checking for long file names" >&5
++echo "$as_me:3468: 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
+@@ -3493,7 +3504,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3496: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3507: 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
+
+@@ -3505,7 +3516,7 @@
+
+ # if we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:3508: checking if you want to use pkg-config" >&5
++echo "$as_me:3519: 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.
+@@ -3515,7 +3526,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:3518: result: $cf_pkg_config" >&5
++echo "$as_me:3529: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -3527,7 +3538,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:3530: checking for $ac_word" >&5
++echo "$as_me:3541: 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
+@@ -3544,7 +3555,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:3547: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3558: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3555,10 +3566,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:3558: result: $PKG_CONFIG" >&5
++ echo "$as_me:3569: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:3561: result: no" >&5
++ echo "$as_me:3572: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3567,7 +3578,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:3570: checking for $ac_word" >&5
++echo "$as_me:3581: 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
+@@ -3584,7 +3595,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:3587: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3598: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3596,10 +3607,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:3599: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:3610: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:3602: result: no" >&5
++ echo "$as_me:3613: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3623,43 +3634,41 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$PKG_CONFIG" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$PKG_CONFIG" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval PKG_CONFIG="$PKG_CONFIG"
+- case ".$PKG_CONFIG" in
+- (.NONE/*)
++ case "x$PKG_CONFIG" in
++ (xNONE/*)
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:3645: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:3654: 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:3652: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:3661: 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:3658: checking for pkg-config library directory" >&5
++ echo "$as_me:3667: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:3662: checking for $PKG_CONFIG library directory" >&5
++ echo "$as_me:3671: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ ;;
+ esac
+@@ -3686,27 +3695,27 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:3689: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3698: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (x)
+ ;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ PKG_CONFIG_LIBDIR=
+ ;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:3700: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3709: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:3705: result: auto" >&5
++ echo "$as_me:3714: 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:3709: checking for search-list" >&5
++ echo "$as_me:3718: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -3717,7 +3726,15 @@
+ pkg-config \
+ pkgconf
+ do
+- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++ cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++ case "$cf_raw_search_path" in
++ (*\\*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++ ;;
++ (*/*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++ ;;
++ esac
+ test -n "$cf_search_path" && break
+ done
+
+@@ -3733,11 +3750,11 @@
+ "`
+ fi
+
+- echo "$as_me:3736: result: $cf_search_path" >&5
++ echo "$as_me:3753: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:3740: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:3757: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -3745,7 +3762,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:3748: checking for first directory" >&5
++ echo "$as_me:3765: 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
+@@ -3756,7 +3773,7 @@
+ break
+ fi
+ done
+- echo "$as_me:3759: result: $cf_pkg_config_path" >&5
++ echo "$as_me:3776: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3766,7 +3783,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:3769: checking for workaround" >&5
++ echo "$as_me:3786: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -3789,12 +3806,12 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:3792: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3809: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+-echo "$as_me:3797: checking if you want to build test-programs" >&5
++echo "$as_me:3814: checking if you want to build test-programs" >&5
+ echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
+
+ # Check whether --with-tests or --without-tests was given.
+@@ -3804,10 +3821,10 @@
+ else
+ cf_with_tests=yes
+ fi;
+-echo "$as_me:3807: result: $cf_with_tests" >&5
++echo "$as_me:3824: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+
+-echo "$as_me:3810: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3827: 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.
+@@ -3817,11 +3834,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:3820: result: $enable_mixedcase" >&5
++echo "$as_me:3837: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:3824: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3841: 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
+@@ -3848,7 +3865,7 @@
+ fi
+
+ fi
+-echo "$as_me:3851: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3868: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3866,7 +3883,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3869: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3886: 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
+@@ -3886,16 +3903,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:3889: result: yes" >&5
++ echo "$as_me:3906: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:3893: result: no" >&5
++ echo "$as_me:3910: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:3898: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3915: 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
+@@ -3950,7 +3967,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3953: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3970: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3961,7 +3978,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:3964: checking for $ac_word" >&5
++echo "$as_me:3981: 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
+@@ -3976,7 +3993,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3979: found $ac_dir/$ac_word" >&5
++echo "$as_me:3996: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3984,10 +4001,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:3987: result: $CTAGS" >&5
++ echo "$as_me:4004: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:3990: result: no" >&5
++ echo "$as_me:4007: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3998,7 +4015,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:4001: checking for $ac_word" >&5
++echo "$as_me:4018: 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
+@@ -4013,7 +4030,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4016: found $ac_dir/$ac_word" >&5
++echo "$as_me:4033: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4021,10 +4038,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4024: result: $ETAGS" >&5
++ echo "$as_me:4041: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4027: result: no" >&5
++ echo "$as_me:4044: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4033,7 +4050,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:4036: checking for $ac_word" >&5
++echo "$as_me:4053: 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
+@@ -4048,7 +4065,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:4051: found $ac_dir/$ac_word" >&5
++echo "$as_me:4068: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4057,17 +4074,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4060: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4077: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4063: result: no" >&5
++ echo "$as_me:4080: 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:4070: checking for $ac_word" >&5
++echo "$as_me:4087: 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
+@@ -4082,7 +4099,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:4085: found $ac_dir/$ac_word" >&5
++echo "$as_me:4102: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4091,10 +4108,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4094: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4111: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4097: result: no" >&5
++ echo "$as_me:4114: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4114,7 +4131,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:4117: checking for makeflags variable" >&5
++echo "$as_me:4134: 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
+@@ -4144,7 +4161,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -4152,13 +4169,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:4155: result: $cf_cv_makeflags" >&5
++echo "$as_me:4172: 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:4161: checking for $ac_word" >&5
++echo "$as_me:4178: 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
+@@ -4173,7 +4190,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:4176: found $ac_dir/$ac_word" >&5
++echo "$as_me:4193: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4181,10 +4198,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:4184: result: $RANLIB" >&5
++ echo "$as_me:4201: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:4187: result: no" >&5
++ echo "$as_me:4204: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4193,7 +4210,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:4196: checking for $ac_word" >&5
++echo "$as_me:4213: 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
+@@ -4208,7 +4225,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:4211: found $ac_dir/$ac_word" >&5
++echo "$as_me:4228: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4217,10 +4234,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:4220: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:4237: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:4223: result: no" >&5
++ echo "$as_me:4240: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4232,7 +4249,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:4235: checking for $ac_word" >&5
++echo "$as_me:4252: 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
+@@ -4247,7 +4264,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:4250: found $ac_dir/$ac_word" >&5
++echo "$as_me:4267: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4255,10 +4272,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:4258: result: $LD" >&5
++ echo "$as_me:4275: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:4261: result: no" >&5
++ echo "$as_me:4278: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4267,7 +4284,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:4270: checking for $ac_word" >&5
++echo "$as_me:4287: 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
+@@ -4282,7 +4299,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:4285: found $ac_dir/$ac_word" >&5
++echo "$as_me:4302: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4291,10 +4308,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:4294: result: $ac_ct_LD" >&5
++ echo "$as_me:4311: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:4297: result: no" >&5
++ echo "$as_me:4314: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4306,7 +4323,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:4309: checking for $ac_word" >&5
++echo "$as_me:4326: 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
+@@ -4321,7 +4338,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:4324: found $ac_dir/$ac_word" >&5
++echo "$as_me:4341: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4329,10 +4346,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:4332: result: $AR" >&5
++ echo "$as_me:4349: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:4335: result: no" >&5
++ echo "$as_me:4352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4341,7 +4358,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:4344: checking for $ac_word" >&5
++echo "$as_me:4361: 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
+@@ -4356,7 +4373,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:4359: found $ac_dir/$ac_word" >&5
++echo "$as_me:4376: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4365,10 +4382,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:4368: result: $ac_ct_AR" >&5
++ echo "$as_me:4385: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:4371: result: no" >&5
++ echo "$as_me:4388: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4380,7 +4397,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:4383: checking for $ac_word" >&5
++echo "$as_me:4400: 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
+@@ -4395,7 +4412,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:4398: found $ac_dir/$ac_word" >&5
++echo "$as_me:4415: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4403,10 +4420,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:4406: result: $AR" >&5
++ echo "$as_me:4423: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:4409: result: no" >&5
++ echo "$as_me:4426: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4415,7 +4432,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:4418: checking for $ac_word" >&5
++echo "$as_me:4435: 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
+@@ -4430,7 +4447,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:4433: found $ac_dir/$ac_word" >&5
++echo "$as_me:4450: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4439,10 +4456,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:4442: result: $ac_ct_AR" >&5
++ echo "$as_me:4459: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:4445: result: no" >&5
++ echo "$as_me:4462: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4451,7 +4468,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:4454: checking for options to update archives" >&5
++echo "$as_me:4471: 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
+@@ -4488,13 +4505,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 4491 "configure"
++#line 4508 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:4511: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4497: \$? = $ac_status" >&5
++ echo "$as_me:4514: \$? = $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
+@@ -4505,7 +4522,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -4515,7 +4532,7 @@
+ esac
+
+ fi
+-echo "$as_me:4518: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4535: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -4526,17 +4543,17 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+- echo "$as_me:4529: checking for PATH separator" >&5
++ echo "$as_me:4546: 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:4536: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:4553: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+-echo "$as_me:4539: checking if you have specified an install-prefix" >&5
++echo "$as_me:4556: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -4549,7 +4566,7 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:4552: result: $DESTDIR" >&5
++echo "$as_me:4569: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+
+ ###############################################################################
+@@ -4577,7 +4594,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:4580: checking for $ac_word" >&5
++echo "$as_me:4597: 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
+@@ -4592,7 +4609,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:4595: found $ac_dir/$ac_word" >&5
++echo "$as_me:4612: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4600,10 +4617,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:4603: result: $BUILD_CC" >&5
++ echo "$as_me:4620: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:4606: result: no" >&5
++ echo "$as_me:4623: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4612,12 +4629,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:4615: checking for native build C compiler" >&5
++ echo "$as_me:4632: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:4617: result: $BUILD_CC" >&5
++ echo "$as_me:4634: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:4620: checking for native build C preprocessor" >&5
++ echo "$as_me:4637: 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.
+@@ -4627,10 +4644,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:4630: result: $BUILD_CPP" >&5
++ echo "$as_me:4647: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:4633: checking for native build C flags" >&5
++ echo "$as_me:4650: 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.
+@@ -4638,10 +4655,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:4641: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:4658: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:4644: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:4661: 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.
+@@ -4649,10 +4666,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:4652: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:4669: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:4655: checking for native build linker-flags" >&5
++ echo "$as_me:4672: 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.
+@@ -4660,10 +4677,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:4663: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:4680: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:4666: checking for native build linker-libraries" >&5
++ echo "$as_me:4683: 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.
+@@ -4671,7 +4688,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:4674: result: $BUILD_LIBS" >&5
++ echo "$as_me:4691: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -4680,7 +4697,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:4683: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:4700: 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
+@@ -4694,7 +4711,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4697 "configure"
++#line 4714 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -4704,15 +4721,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4724: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4710: \$? = $ac_status" >&5
++ echo "$as_me:4727: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:4712: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4729: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4715: \$? = $ac_status" >&5
++ echo "$as_me:4732: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -4727,12 +4744,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:4730: result: $cf_ok_build_cc" >&5
++ echo "$as_me:4747: 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:4735: error: Cross-build requires two compilers.
++ { { echo "$as_me:4752: 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;}
+@@ -4757,7 +4774,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:4760: checking if you want to build shared C-objects" >&5
++echo "$as_me:4777: checking if you want to build shared C-objects" >&5
+ echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
+
+ # Check whether --with-shared or --without-shared was given.
+@@ -4767,27 +4784,27 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:4770: result: $with_shared" >&5
++echo "$as_me:4787: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+
+-echo "$as_me:4774: checking for specified models" >&5
++echo "$as_me:4791: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+-echo "$as_me:4777: result: $cf_list_models" >&5
++echo "$as_me:4794: 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:4782: checking for default model" >&5
++echo "$as_me:4799: 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:4785: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4802: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+-echo "$as_me:4790: checking for specific curses-directory" >&5
++echo "$as_me:4807: 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.
+@@ -4797,7 +4814,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4800: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4817: 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"
+@@ -4809,26 +4826,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+- ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4831: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:4846: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4864,7 +4879,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4867 "configure"
++#line 4882 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4876,16 +4891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4879: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4882: \$? = $ac_status" >&5
++ echo "$as_me:4897: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4885: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4900: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4888: \$? = $ac_status" >&5
++ echo "$as_me:4903: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4902,7 +4917,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}:4905: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4920: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -4938,7 +4953,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}:4941: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4956: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -4953,13 +4968,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:4956: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:4971: 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:4959: result: yes" >&5
++ echo "$as_me:4974: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:4962: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:4977: 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
+
+@@ -5092,7 +5107,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5095 "configure"
++#line 5110 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5104,37 +5119,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5110: \$? = $ac_status" >&5
++ echo "$as_me:5125: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:5113: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5128: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5116: \$? = $ac_status" >&5
++ echo "$as_me:5131: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5122 "configure"
++#line 5137 "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:5129: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5144: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5132: \$? = $ac_status" >&5
++ echo "$as_me:5147: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5134: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5137: \$? = $ac_status" >&5
++ echo "$as_me:5152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -5308,7 +5323,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5311 "configure"
++#line 5326 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5320,37 +5335,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5326: \$? = $ac_status" >&5
++ echo "$as_me:5341: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:5329: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5344: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5332: \$? = $ac_status" >&5
++ echo "$as_me:5347: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5338 "configure"
++#line 5353 "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:5345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5348: \$? = $ac_status" >&5
++ echo "$as_me:5363: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5350: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5365: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5353: \$? = $ac_status" >&5
++ echo "$as_me:5368: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -5367,7 +5382,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:5370: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:5385: 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"
+@@ -5383,7 +5398,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:5386: checking for terminfo header" >&5
++echo "$as_me:5401: 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
+@@ -5401,7 +5416,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5404 "configure"
++#line 5419 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5416,16 +5431,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5422: \$? = $ac_status" >&5
++ echo "$as_me:5437: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5425: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5440: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5428: \$? = $ac_status" >&5
++ echo "$as_me:5443: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -5441,7 +5456,7 @@
+ done
+
+ fi
+-echo "$as_me:5444: result: $cf_cv_term_header" >&5
++echo "$as_me:5459: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5476,7 +5491,7 @@
+ fi
+
+ else
+- echo "$as_me:5479: result: no" >&5
++ echo "$as_me:5494: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -5492,7 +5507,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:5495: checking for $ac_word" >&5
++echo "$as_me:5510: 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
+@@ -5507,7 +5522,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:5510: found $ac_dir/$ac_word" >&5
++echo "$as_me:5525: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5515,10 +5530,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:5518: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:5521: result: no" >&5
++ echo "$as_me:5536: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5531,7 +5546,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:5534: checking for $ac_word" >&5
++echo "$as_me:5549: 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
+@@ -5546,7 +5561,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:5549: found $ac_dir/$ac_word" >&5
++echo "$as_me:5564: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5554,10 +5569,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:5557: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:5560: result: no" >&5
++ echo "$as_me:5575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5714,7 +5729,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:5717: checking if we have identified curses headers" >&5
++echo "$as_me:5732: 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
+@@ -5726,7 +5741,7 @@
+ curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5729 "configure"
++#line 5744 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5738,16 +5753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5744: \$? = $ac_status" >&5
++ echo "$as_me:5759: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5747: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5762: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5750: \$? = $ac_status" >&5
++ echo "$as_me:5765: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5758,11 +5773,11 @@
+ done
+
+ fi
+-echo "$as_me:5761: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5776: 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:5765: error: No curses header-files found" >&5
++ { { echo "$as_me:5780: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -5772,23 +5787,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:5775: checking for $ac_header" >&5
++echo "$as_me:5790: 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 5781 "configure"
++#line 5796 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5785: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5800: \"$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:5791: \$? = $ac_status" >&5
++ echo "$as_me:5806: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5807,7 +5822,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5810: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5825: 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
+@@ -5863,7 +5878,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5866 "configure"
++#line 5881 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5875,16 +5890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5881: \$? = $ac_status" >&5
++ echo "$as_me:5896: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5884: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5899: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5887: \$? = $ac_status" >&5
++ echo "$as_me:5902: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5901,7 +5916,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}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -5920,7 +5935,7 @@
+
+ }
+
+-echo "$as_me:5923: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5938: 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
+@@ -5932,7 +5947,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5935 "configure"
++#line 5950 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -5956,16 +5971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5962: \$? = $ac_status" >&5
++ echo "$as_me:5977: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5980: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5968: \$? = $ac_status" >&5
++ echo "$as_me:5983: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -5980,14 +5995,14 @@
+ done
+
+ fi
+-echo "$as_me:5983: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5998: 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:5990: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6005: 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
+@@ -6108,7 +6123,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6111 "configure"
++#line 6126 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6120,16 +6135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6126: \$? = $ac_status" >&5
++ echo "$as_me:6141: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6129: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6144: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6132: \$? = $ac_status" >&5
++ echo "$as_me:6147: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6146,7 +6161,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}:6149: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6169,7 +6184,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6172 "configure"
++#line 6187 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -6193,16 +6208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6199: \$? = $ac_status" >&5
++ echo "$as_me:6214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6202: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6205: \$? = $ac_status" >&5
++ echo "$as_me:6220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -6223,12 +6238,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6226: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:6231: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6246: 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%/[^/]*$%%'`
+@@ -6264,7 +6279,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6267 "configure"
++#line 6282 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6276,16 +6291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6282: \$? = $ac_status" >&5
++ echo "$as_me:6297: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6285: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6300: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6288: \$? = $ac_status" >&5
++ echo "$as_me:6303: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6302,7 +6317,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}:6305: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6350,7 +6365,7 @@
+ ;;
+ esac
+
+-echo "$as_me:6353: checking for terminfo header" >&5
++echo "$as_me:6368: 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
+@@ -6368,7 +6383,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6371 "configure"
++#line 6386 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6383,16 +6398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6389: \$? = $ac_status" >&5
++ echo "$as_me:6404: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6392: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6407: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6395: \$? = $ac_status" >&5
++ echo "$as_me:6410: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -6408,7 +6423,7 @@
+ done
+
+ fi
+-echo "$as_me:6411: result: $cf_cv_term_header" >&5
++echo "$as_me:6426: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6446,7 +6461,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:6449: checking for ncurses version" >&5
++echo "$as_me:6464: 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
+@@ -6472,10 +6487,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:6475: \"$cf_try\"") >&5
++ { (eval echo "$as_me:6490: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6478: \$? = $ac_status" >&5
++ echo "$as_me:6493: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6485,7 +6500,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6488 "configure"
++#line 6503 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6512,15 +6527,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6518: \$? = $ac_status" >&5
++ echo "$as_me:6533: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6520: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6535: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6523: \$? = $ac_status" >&5
++ echo "$as_me:6538: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6534,7 +6549,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:6537: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6547,7 +6562,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6550: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6565: 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
+@@ -6555,7 +6570,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6558 "configure"
++#line 6573 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6574,16 +6589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6580: \$? = $ac_status" >&5
++ echo "$as_me:6595: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6583: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6598: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6586: \$? = $ac_status" >&5
++ echo "$as_me:6601: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6594,10 +6609,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6597: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6612: 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:6600: checking for initscr in -lgpm" >&5
++ echo "$as_me:6615: 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
+@@ -6605,7 +6620,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6608 "configure"
++#line 6623 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6624,16 +6639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6630: \$? = $ac_status" >&5
++ echo "$as_me:6645: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6633: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6636: \$? = $ac_status" >&5
++ echo "$as_me:6651: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6644,7 +6659,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6647: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6662: 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"
+@@ -6659,7 +6674,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:6662: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:6677: 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
+@@ -6667,7 +6682,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6670 "configure"
++#line 6685 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6686,16 +6701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6692: \$? = $ac_status" >&5
++ echo "$as_me:6707: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6695: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6710: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6698: \$? = $ac_status" >&5
++ echo "$as_me:6713: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6706,7 +6721,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6709: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6724: 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"
+@@ -6755,13 +6770,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:6758: checking for initscr" >&5
++ echo "$as_me:6773: 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 6764 "configure"
++#line 6779 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6792,16 +6807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6798: \$? = $ac_status" >&5
++ echo "$as_me:6813: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6801: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6804: \$? = $ac_status" >&5
++ echo "$as_me:6819: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -6811,18 +6826,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6814: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6829: 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:6821: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:6836: 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 6825 "configure"
++#line 6840 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6834,25 +6849,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6840: \$? = $ac_status" >&5
++ echo "$as_me:6855: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6843: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6858: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6846: \$? = $ac_status" >&5
++ echo "$as_me:6861: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:6848: result: yes" >&5
++ echo "$as_me:6863: 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:6855: result: no" >&5
++echo "$as_me:6870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -6920,11 +6935,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:6923: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:6938: 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 6927 "configure"
++#line 6942 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6936,25 +6951,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6939: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6942: \$? = $ac_status" >&5
++ echo "$as_me:6957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6945: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6948: \$? = $ac_status" >&5
++ echo "$as_me:6963: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:6950: result: yes" >&5
++ echo "$as_me:6965: 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:6957: result: no" >&5
++echo "$as_me:6972: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -6969,7 +6984,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:6972: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6977,7 +6992,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:6980: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:6995: 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
+@@ -6987,7 +7002,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6990 "configure"
++#line 7005 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6999,23 +7014,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7005: \$? = $ac_status" >&5
++ echo "$as_me:7020: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7008: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7011: \$? = $ac_status" >&5
++ echo "$as_me:7026: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:7013: result: yes" >&5
++ echo "$as_me:7028: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7018: result: no" >&5
++echo "$as_me:7033: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7033,7 +7048,7 @@
+ NCURSES_CONFIG=none
+ fi
+
+-echo "$as_me:7036: checking for specified curses library type" >&5
++echo "$as_me:7051: 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.
+@@ -7053,23 +7068,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7056: checking for $ac_header" >&5
++echo "$as_me:7071: 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 7062 "configure"
++#line 7077 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7066: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7081: \"$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:7072: \$? = $ac_status" >&5
++ echo "$as_me:7087: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7088,7 +7103,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7091: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7106: 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
+@@ -7098,7 +7113,7 @@
+ fi
+ done
+
+-echo "$as_me:7101: checking for multibyte character support" >&5
++echo "$as_me:7116: 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
+@@ -7106,7 +7121,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7109 "configure"
++#line 7124 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7123,16 +7138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7141: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7129: \$? = $ac_status" >&5
++ echo "$as_me:7144: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7132: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7147: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7135: \$? = $ac_status" >&5
++ echo "$as_me:7150: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -7144,12 +7159,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:7147: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7162: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7152 "configure"
++#line 7167 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7162,16 +7177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7168: \$? = $ac_status" >&5
++ echo "$as_me:7183: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7171: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7174: \$? = $ac_status" >&5
++ echo "$as_me:7189: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -7185,7 +7200,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7188 "configure"
++#line 7203 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7198,16 +7213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7216: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7204: \$? = $ac_status" >&5
++ echo "$as_me:7219: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7207: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7222: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7210: \$? = $ac_status" >&5
++ echo "$as_me:7225: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -7224,9 +7239,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:7227: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7242: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:7229: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7244: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7317,7 +7332,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}:7320: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7335: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -7325,7 +7340,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7328 "configure"
++#line 7343 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7338,21 +7353,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7344: \$? = $ac_status" >&5
++ echo "$as_me:7359: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7347: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7362: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7350: \$? = $ac_status" >&5
++ echo "$as_me:7365: \$? = $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}:7355: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7370,7 +7385,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:7373: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -7445,13 +7460,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}:7448: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7463: 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 7454 "configure"
++#line 7469 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7464,21 +7479,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7482: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7470: \$? = $ac_status" >&5
++ echo "$as_me:7485: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7473: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7488: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7476: \$? = $ac_status" >&5
++ echo "$as_me:7491: \$? = $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}:7481: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7496: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -7520,7 +7535,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7523: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7538: 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
+@@ -7558,7 +7573,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7561 "configure"
++#line 7576 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7570,16 +7585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7576: \$? = $ac_status" >&5
++ echo "$as_me:7591: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7579: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7594: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7582: \$? = $ac_status" >&5
++ echo "$as_me:7597: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -7596,7 +7611,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}:7599: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7614: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -7632,7 +7647,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}:7635: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7650: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7662,13 +7677,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:7665: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:7680: 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:7668: result: yes" >&5
++ echo "$as_me:7683: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:7671: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:7686: 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
+
+@@ -7801,7 +7816,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7804 "configure"
++#line 7819 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7813,37 +7828,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7819: \$? = $ac_status" >&5
++ echo "$as_me:7834: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7822: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7837: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7825: \$? = $ac_status" >&5
++ echo "$as_me:7840: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7831 "configure"
++#line 7846 "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:7838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7853: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7841: \$? = $ac_status" >&5
++ echo "$as_me:7856: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7843: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7858: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7846: \$? = $ac_status" >&5
++ echo "$as_me:7861: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8017,7 +8032,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8020 "configure"
++#line 8035 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8029,37 +8044,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8035: \$? = $ac_status" >&5
++ echo "$as_me:8050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8038: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8041: \$? = $ac_status" >&5
++ echo "$as_me:8056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8047 "configure"
++#line 8062 "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:8054: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8069: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8057: \$? = $ac_status" >&5
++ echo "$as_me:8072: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8059: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8062: \$? = $ac_status" >&5
++ echo "$as_me:8077: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -8076,7 +8091,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8079: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:8094: 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"
+@@ -8092,7 +8107,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:8095: checking for terminfo header" >&5
++echo "$as_me:8110: 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
+@@ -8110,7 +8125,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8113 "configure"
++#line 8128 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8125,16 +8140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8143: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8131: \$? = $ac_status" >&5
++ echo "$as_me:8146: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8134: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8137: \$? = $ac_status" >&5
++ echo "$as_me:8152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -8150,7 +8165,7 @@
+ done
+
+ fi
+-echo "$as_me:8153: result: $cf_cv_term_header" >&5
++echo "$as_me:8168: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8185,7 +8200,7 @@
+ fi
+
+ else
+- echo "$as_me:8188: result: no" >&5
++ echo "$as_me:8203: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -8201,7 +8216,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:8204: checking for $ac_word" >&5
++echo "$as_me:8219: 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
+@@ -8216,7 +8231,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:8219: found $ac_dir/$ac_word" >&5
++echo "$as_me:8234: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8224,10 +8239,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:8227: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:8242: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:8230: result: no" >&5
++ echo "$as_me:8245: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8240,7 +8255,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:8243: checking for $ac_word" >&5
++echo "$as_me:8258: 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
+@@ -8255,7 +8270,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:8258: found $ac_dir/$ac_word" >&5
++echo "$as_me:8273: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8263,10 +8278,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:8266: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:8281: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:8269: result: no" >&5
++ echo "$as_me:8284: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8423,7 +8438,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:8426: checking if we have identified curses headers" >&5
++echo "$as_me:8441: 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
+@@ -8435,7 +8450,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8438 "configure"
++#line 8453 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8447,16 +8462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8453: \$? = $ac_status" >&5
++ echo "$as_me:8468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8456: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8459: \$? = $ac_status" >&5
++ echo "$as_me:8474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8467,11 +8482,11 @@
+ done
+
+ fi
+-echo "$as_me:8470: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8485: 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:8474: error: No curses header-files found" >&5
++ { { echo "$as_me:8489: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8481,23 +8496,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:8484: checking for $ac_header" >&5
++echo "$as_me:8499: 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 8490 "configure"
++#line 8505 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8494: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8509: \"$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:8500: \$? = $ac_status" >&5
++ echo "$as_me:8515: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8516,7 +8531,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8519: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8534: 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
+@@ -8572,7 +8587,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8575 "configure"
++#line 8590 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8584,16 +8599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8590: \$? = $ac_status" >&5
++ echo "$as_me:8605: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8593: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8596: \$? = $ac_status" >&5
++ echo "$as_me:8611: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8610,7 +8625,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}:8613: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8628: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8629,7 +8644,7 @@
+
+ }
+
+-echo "$as_me:8632: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8647: 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
+@@ -8641,7 +8656,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8644 "configure"
++#line 8659 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8665,16 +8680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8671: \$? = $ac_status" >&5
++ echo "$as_me:8686: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8674: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8689: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8677: \$? = $ac_status" >&5
++ echo "$as_me:8692: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -8689,14 +8704,14 @@
+ done
+
+ fi
+-echo "$as_me:8692: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8707: 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:8699: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8714: 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
+@@ -8817,7 +8832,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8820 "configure"
++#line 8835 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8829,16 +8844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8835: \$? = $ac_status" >&5
++ echo "$as_me:8850: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8838: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8853: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8841: \$? = $ac_status" >&5
++ echo "$as_me:8856: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8855,7 +8870,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}:8858: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8878,7 +8893,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8881 "configure"
++#line 8896 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8902,16 +8917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8905: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8920: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8908: \$? = $ac_status" >&5
++ echo "$as_me:8923: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8911: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8926: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8914: \$? = $ac_status" >&5
++ echo "$as_me:8929: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -8932,12 +8947,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8935: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8950: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:8940: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8955: 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%/[^/]*$%%'`
+@@ -8973,7 +8988,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8976 "configure"
++#line 8991 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8985,16 +9000,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9003: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8991: \$? = $ac_status" >&5
++ echo "$as_me:9006: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8994: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9009: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8997: \$? = $ac_status" >&5
++ echo "$as_me:9012: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9011,7 +9026,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}:9014: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9029: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9059,7 +9074,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9062: checking for terminfo header" >&5
++echo "$as_me:9077: 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
+@@ -9077,7 +9092,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9080 "configure"
++#line 9095 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9092,16 +9107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9098: \$? = $ac_status" >&5
++ echo "$as_me:9113: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9101: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9116: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9104: \$? = $ac_status" >&5
++ echo "$as_me:9119: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9117,7 +9132,7 @@
+ done
+
+ fi
+-echo "$as_me:9120: result: $cf_cv_term_header" >&5
++echo "$as_me:9135: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9155,7 +9170,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:9158: checking for ncurses version" >&5
++echo "$as_me:9173: 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
+@@ -9181,10 +9196,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:9184: \"$cf_try\"") >&5
++ { (eval echo "$as_me:9199: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9187: \$? = $ac_status" >&5
++ echo "$as_me:9202: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9194,7 +9209,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9197 "configure"
++#line 9212 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -9221,15 +9236,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9239: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9227: \$? = $ac_status" >&5
++ echo "$as_me:9242: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9229: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9244: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9232: \$? = $ac_status" >&5
++ echo "$as_me:9247: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9243,7 +9258,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:9246: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9261: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9256,7 +9271,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9259: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9274: 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
+@@ -9264,7 +9279,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9267 "configure"
++#line 9282 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9283,16 +9298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9289: \$? = $ac_status" >&5
++ echo "$as_me:9304: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9292: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9307: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9295: \$? = $ac_status" >&5
++ echo "$as_me:9310: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9303,10 +9318,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9306: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9321: 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:9309: checking for initscr in -lgpm" >&5
++ echo "$as_me:9324: 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
+@@ -9314,7 +9329,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9317 "configure"
++#line 9332 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9333,16 +9348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9351: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9339: \$? = $ac_status" >&5
++ echo "$as_me:9354: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9342: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9357: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9345: \$? = $ac_status" >&5
++ echo "$as_me:9360: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9353,7 +9368,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9356: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9371: 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"
+@@ -9368,7 +9383,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:9371: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:9386: 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
+@@ -9376,7 +9391,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9379 "configure"
++#line 9394 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9395,16 +9410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9413: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9401: \$? = $ac_status" >&5
++ echo "$as_me:9416: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9404: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9419: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9407: \$? = $ac_status" >&5
++ echo "$as_me:9422: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9415,7 +9430,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9418: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9433: 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"
+@@ -9464,13 +9479,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:9467: checking for initscr" >&5
++ echo "$as_me:9482: 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 9473 "configure"
++#line 9488 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9501,16 +9516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9507: \$? = $ac_status" >&5
++ echo "$as_me:9522: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9510: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9525: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9513: \$? = $ac_status" >&5
++ echo "$as_me:9528: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -9520,18 +9535,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9523: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9538: 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:9530: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:9545: 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 9534 "configure"
++#line 9549 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9543,25 +9558,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9549: \$? = $ac_status" >&5
++ echo "$as_me:9564: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9552: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9567: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9555: \$? = $ac_status" >&5
++ echo "$as_me:9570: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9557: result: yes" >&5
++ echo "$as_me:9572: 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:9564: result: no" >&5
++echo "$as_me:9579: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -9629,11 +9644,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:9632: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:9647: 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 9636 "configure"
++#line 9651 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9645,25 +9660,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9651: \$? = $ac_status" >&5
++ echo "$as_me:9666: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9654: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9669: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9657: \$? = $ac_status" >&5
++ echo "$as_me:9672: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9659: result: yes" >&5
++ echo "$as_me:9674: 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:9666: result: no" >&5
++echo "$as_me:9681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -9678,7 +9693,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:9681: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:9696: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9686,7 +9701,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:9689: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:9704: 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
+@@ -9696,7 +9711,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9699 "configure"
++#line 9714 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9708,23 +9723,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9726: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9714: \$? = $ac_status" >&5
++ echo "$as_me:9729: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9717: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9732: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9720: \$? = $ac_status" >&5
++ echo "$as_me:9735: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9722: result: yes" >&5
++ echo "$as_me:9737: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9727: result: no" >&5
++echo "$as_me:9742: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9749,13 +9764,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:9752: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:9767: 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:9755: result: yes" >&5
++ echo "$as_me:9770: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:9758: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:9773: 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
+
+@@ -9888,7 +9903,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9891 "configure"
++#line 9906 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9900,37 +9915,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9906: \$? = $ac_status" >&5
++ echo "$as_me:9921: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9909: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9912: \$? = $ac_status" >&5
++ echo "$as_me:9927: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9918 "configure"
++#line 9933 "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:9925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9940: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9928: \$? = $ac_status" >&5
++ echo "$as_me:9943: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9930: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9945: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9933: \$? = $ac_status" >&5
++ echo "$as_me:9948: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -10104,7 +10119,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10107 "configure"
++#line 10122 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10116,37 +10131,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10134: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10122: \$? = $ac_status" >&5
++ echo "$as_me:10137: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10125: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10140: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10128: \$? = $ac_status" >&5
++ echo "$as_me:10143: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10134 "configure"
++#line 10149 "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:10141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10156: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10144: \$? = $ac_status" >&5
++ echo "$as_me:10159: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10161: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10149: \$? = $ac_status" >&5
++ echo "$as_me:10164: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -10163,7 +10178,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:10166: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:10181: 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"
+@@ -10179,7 +10194,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:10182: checking for terminfo header" >&5
++echo "$as_me:10197: 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
+@@ -10197,7 +10212,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10200 "configure"
++#line 10215 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10212,16 +10227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10218: \$? = $ac_status" >&5
++ echo "$as_me:10233: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10221: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10236: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10224: \$? = $ac_status" >&5
++ echo "$as_me:10239: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -10237,7 +10252,7 @@
+ done
+
+ fi
+-echo "$as_me:10240: result: $cf_cv_term_header" >&5
++echo "$as_me:10255: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10272,7 +10287,7 @@
+ fi
+
+ else
+- echo "$as_me:10275: result: no" >&5
++ echo "$as_me:10290: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -10288,7 +10303,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:10291: checking for $ac_word" >&5
++echo "$as_me:10306: 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
+@@ -10303,7 +10318,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:10306: found $ac_dir/$ac_word" >&5
++echo "$as_me:10321: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -10311,10 +10326,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:10329: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:10317: result: no" >&5
++ echo "$as_me:10332: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10327,7 +10342,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:10330: checking for $ac_word" >&5
++echo "$as_me:10345: 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
+@@ -10342,7 +10357,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:10345: found $ac_dir/$ac_word" >&5
++echo "$as_me:10360: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -10350,10 +10365,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:10368: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:10356: result: no" >&5
++ echo "$as_me:10371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10510,7 +10525,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:10513: checking if we have identified curses headers" >&5
++echo "$as_me:10528: 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
+@@ -10522,7 +10537,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10525 "configure"
++#line 10540 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10534,16 +10549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10540: \$? = $ac_status" >&5
++ echo "$as_me:10555: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10543: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10558: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10546: \$? = $ac_status" >&5
++ echo "$as_me:10561: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10554,11 +10569,11 @@
+ done
+
+ fi
+-echo "$as_me:10557: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10572: 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:10561: error: No curses header-files found" >&5
++ { { echo "$as_me:10576: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10568,23 +10583,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:10571: checking for $ac_header" >&5
++echo "$as_me:10586: 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 10577 "configure"
++#line 10592 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10596: \"$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:10587: \$? = $ac_status" >&5
++ echo "$as_me:10602: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10603,7 +10618,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10606: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10621: 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
+@@ -10659,7 +10674,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10662 "configure"
++#line 10677 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10671,16 +10686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10677: \$? = $ac_status" >&5
++ echo "$as_me:10692: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10680: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10695: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10683: \$? = $ac_status" >&5
++ echo "$as_me:10698: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10697,7 +10712,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}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10715: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -10716,7 +10731,7 @@
+
+ }
+
+-echo "$as_me:10719: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10734: 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
+@@ -10728,7 +10743,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10731 "configure"
++#line 10746 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -10752,16 +10767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10758: \$? = $ac_status" >&5
++ echo "$as_me:10773: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10761: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10776: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10764: \$? = $ac_status" >&5
++ echo "$as_me:10779: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -10776,14 +10791,14 @@
+ done
+
+ fi
+-echo "$as_me:10779: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10794: 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:10786: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10801: 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
+@@ -10904,7 +10919,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10907 "configure"
++#line 10922 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10916,16 +10931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10922: \$? = $ac_status" >&5
++ echo "$as_me:10937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10925: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10928: \$? = $ac_status" >&5
++ echo "$as_me:10943: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10942,7 +10957,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}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -10965,7 +10980,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10968 "configure"
++#line 10983 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -10989,16 +11004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10995: \$? = $ac_status" >&5
++ echo "$as_me:11010: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11013: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11001: \$? = $ac_status" >&5
++ echo "$as_me:11016: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11019,12 +11034,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11037: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11027: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11042: 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%/[^/]*$%%'`
+@@ -11060,7 +11075,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11063 "configure"
++#line 11078 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11072,16 +11087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11078: \$? = $ac_status" >&5
++ echo "$as_me:11093: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11081: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11096: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11084: \$? = $ac_status" >&5
++ echo "$as_me:11099: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11098,7 +11113,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}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11116: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11146,7 +11161,7 @@
+ ;;
+ esac
+
+-echo "$as_me:11149: checking for terminfo header" >&5
++echo "$as_me:11164: 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
+@@ -11164,7 +11179,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11167 "configure"
++#line 11182 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11179,16 +11194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11185: \$? = $ac_status" >&5
++ echo "$as_me:11200: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11188: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11203: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11191: \$? = $ac_status" >&5
++ echo "$as_me:11206: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11204,7 +11219,7 @@
+ done
+
+ fi
+-echo "$as_me:11207: result: $cf_cv_term_header" >&5
++echo "$as_me:11222: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11242,7 +11257,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:11245: checking for ncurses version" >&5
++echo "$as_me:11260: 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
+@@ -11268,10 +11283,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:11271: \"$cf_try\"") >&5
++ { (eval echo "$as_me:11286: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11274: \$? = $ac_status" >&5
++ echo "$as_me:11289: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11281,7 +11296,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11284 "configure"
++#line 11299 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11308,15 +11323,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11326: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11314: \$? = $ac_status" >&5
++ echo "$as_me:11329: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11316: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11331: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11319: \$? = $ac_status" >&5
++ echo "$as_me:11334: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11330,7 +11345,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11348: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11343,7 +11358,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11346: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11361: 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
+@@ -11351,7 +11366,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11354 "configure"
++#line 11369 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11370,16 +11385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11388: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11376: \$? = $ac_status" >&5
++ echo "$as_me:11391: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11379: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11394: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11382: \$? = $ac_status" >&5
++ echo "$as_me:11397: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11390,10 +11405,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11393: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11408: 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:11396: checking for initscr in -lgpm" >&5
++ echo "$as_me:11411: 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
+@@ -11401,7 +11416,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11404 "configure"
++#line 11419 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11420,16 +11435,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11426: \$? = $ac_status" >&5
++ echo "$as_me:11441: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11429: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11444: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11432: \$? = $ac_status" >&5
++ echo "$as_me:11447: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11440,7 +11455,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11443: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11458: 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"
+@@ -11455,7 +11470,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:11458: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:11473: 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
+@@ -11463,7 +11478,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11466 "configure"
++#line 11481 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11482,16 +11497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11500: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11488: \$? = $ac_status" >&5
++ echo "$as_me:11503: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11491: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11494: \$? = $ac_status" >&5
++ echo "$as_me:11509: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11502,7 +11517,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11505: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11520: 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"
+@@ -11551,13 +11566,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:11554: checking for initscr" >&5
++ echo "$as_me:11569: 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 11560 "configure"
++#line 11575 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11588,16 +11603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11594: \$? = $ac_status" >&5
++ echo "$as_me:11609: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11597: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11612: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11600: \$? = $ac_status" >&5
++ echo "$as_me:11615: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -11607,18 +11622,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11610: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11625: 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:11617: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:11632: 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 11621 "configure"
++#line 11636 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11630,25 +11645,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11636: \$? = $ac_status" >&5
++ echo "$as_me:11651: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11639: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11654: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11642: \$? = $ac_status" >&5
++ echo "$as_me:11657: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11644: result: yes" >&5
++ echo "$as_me:11659: 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:11651: result: no" >&5
++echo "$as_me:11666: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -11716,11 +11731,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:11719: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:11734: 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 11723 "configure"
++#line 11738 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11732,25 +11747,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11750: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11738: \$? = $ac_status" >&5
++ echo "$as_me:11753: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11741: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11756: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11744: \$? = $ac_status" >&5
++ echo "$as_me:11759: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11746: result: yes" >&5
++ echo "$as_me:11761: 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:11753: result: no" >&5
++echo "$as_me:11768: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -11765,7 +11780,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:11783: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11773,7 +11788,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:11776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:11791: 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
+@@ -11783,7 +11798,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11786 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11795,23 +11810,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11813: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11801: \$? = $ac_status" >&5
++ echo "$as_me:11816: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11804: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11819: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11807: \$? = $ac_status" >&5
++ echo "$as_me:11822: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11809: result: yes" >&5
++ echo "$as_me:11824: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11814: result: no" >&5
++echo "$as_me:11829: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11831,7 +11846,7 @@
+
+ ;;
+ (*)
+- { { echo "$as_me:11834: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:11849: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -11870,10 +11885,10 @@
+ AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
+ CF_EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
+- { (eval echo "$as_me:11873: \"$cf_try\"") >&5
++ { (eval echo "$as_me:11888: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11876: \$? = $ac_status" >&5
++ echo "$as_me:11891: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out`
+@@ -11891,17 +11906,17 @@
+
+ cf_cv_timestamp=`date`
+
+-echo "$as_me:11894: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11909: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
+
+-echo "$as_me:11897: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:11912: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11904 "configure"
++#line 11919 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11913,16 +11928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11919: \$? = $ac_status" >&5
++ echo "$as_me:11934: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11922: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11937: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11925: \$? = $ac_status" >&5
++ echo "$as_me:11940: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_resizes=yes
+ else
+@@ -11932,12 +11947,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11935: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:11950: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+
+-echo "$as_me:11940: checking if you want to have a library-prefix" >&5
++echo "$as_me:11955: 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.
+@@ -11947,7 +11962,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:11950: result: $with_lib_prefix" >&5
++echo "$as_me:11965: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -11985,7 +12000,7 @@
+ test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+
+-echo "$as_me:11988: checking for default loader flags" >&5
++echo "$as_me:12003: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case $DFT_LWR_MODEL in
+ (normal) LD_MODEL='' ;;
+@@ -11993,13 +12008,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:11996: result: $LD_MODEL" >&5
++echo "$as_me:12011: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:12002: checking for an rpath option" >&5
++ echo "$as_me:12017: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -12030,12 +12045,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:12033: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:12048: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:12038: checking if we need a space after rpath option" >&5
++ echo "$as_me:12053: 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"
+
+@@ -12056,7 +12071,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12059 "configure"
++#line 12074 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12068,16 +12083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12086: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12074: \$? = $ac_status" >&5
++ echo "$as_me:12089: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12077: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12092: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12080: \$? = $ac_status" >&5
++ echo "$as_me:12095: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -12087,7 +12102,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:12090: result: $cf_rpath_space" >&5
++ echo "$as_me:12105: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -12109,7 +12124,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:12112: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:12127: 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.
+@@ -12124,9 +12139,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:12127: result: $withval" >&5
++ echo "$as_me:12142: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:12129: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:12144: 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; }; }
+ ;;
+@@ -12135,7 +12150,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:12138: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:12153: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -12158,14 +12173,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:12161: checking which $CC option to use" >&5
++ echo "$as_me:12176: 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 12168 "configure"
++#line 12183 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12177,16 +12192,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12183: \$? = $ac_status" >&5
++ echo "$as_me:12198: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12186: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12201: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12189: \$? = $ac_status" >&5
++ echo "$as_me:12204: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -12195,7 +12210,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:12198: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:12213: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -12266,7 +12281,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:12269: checking if ld -search_paths_first works" >&5
++ echo "$as_me:12284: 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
+@@ -12275,7 +12290,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12278 "configure"
++#line 12293 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12287,16 +12302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12293: \$? = $ac_status" >&5
++ echo "$as_me:12308: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12311: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12299: \$? = $ac_status" >&5
++ echo "$as_me:12314: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12307,7 +12322,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12310: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:12325: 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"
+@@ -12657,7 +12672,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12660 "configure"
++#line 12675 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12669,16 +12684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12675: \$? = $ac_status" >&5
++ echo "$as_me:12690: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12678: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12693: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12681: \$? = $ac_status" >&5
++ echo "$as_me:12696: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -12715,7 +12730,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:12718: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:12733: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -12725,7 +12740,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 12728 "${as_me:-configure}"
++#line 12743 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -12737,18 +12752,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:12740: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:12755: 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:12742: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:12757: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12745: \$? = $ac_status" >&5
++ echo "$as_me:12760: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:12747: result: yes" >&5
++ echo "$as_me:12762: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:12751: result: no" >&5
++ echo "$as_me:12766: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -12763,17 +12778,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:12766: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12781: 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}:12770: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12785: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ # The test/sample programs in the original tree link using rpath option.
+ # Make it optional for packagers.
+ if test -n "$LOCAL_LDFLAGS"
+ then
+- echo "$as_me:12776: checking if you want to link sample programs with rpath option" >&5
++ echo "$as_me:12791: checking if you want to link sample programs with rpath option" >&5
+ echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
+
+ # Check whether --enable-rpath-link or --disable-rpath-link was given.
+@@ -12783,7 +12798,7 @@
+ else
+ with_rpath_link=yes
+ fi;
+- echo "$as_me:12786: result: $with_rpath_link" >&5
++ echo "$as_me:12801: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ if test "$with_rpath_link" = no
+ then
+@@ -12796,7 +12811,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:12799: checking if you want broken-linker support code" >&5
++echo "$as_me:12814: 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.
+@@ -12806,7 +12821,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:12809: result: $with_broken_linker" >&5
++echo "$as_me:12824: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -12821,14 +12836,14 @@
+
+ # Check to define _XOPEN_SOURCE "automatically"
+
+-echo "$as_me:12824: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12839: 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 12831 "configure"
++#line 12846 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12847,16 +12862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12853: \$? = $ac_status" >&5
++ echo "$as_me:12868: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12856: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12871: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12859: \$? = $ac_status" >&5
++ echo "$as_me:12874: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -12867,7 +12882,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12870: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12885: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12909,14 +12924,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:12912: checking if this is the GNU C library" >&5
++echo "$as_me:12927: 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 12919 "configure"
++#line 12934 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12935,16 +12950,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12941: \$? = $ac_status" >&5
++ echo "$as_me:12956: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12944: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12959: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12947: \$? = $ac_status" >&5
++ echo "$as_me:12962: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -12955,7 +12970,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12958: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12973: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12963,7 +12978,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:12966: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:12981: 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
+@@ -12975,7 +12990,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12978 "configure"
++#line 12993 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12994,16 +13009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13000: \$? = $ac_status" >&5
++ echo "$as_me:13015: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13003: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13018: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13006: \$? = $ac_status" >&5
++ echo "$as_me:13021: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -13015,12 +13030,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:13018: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:13033: 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:13023: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:13038: 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
+@@ -13125,7 +13140,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13128 "configure"
++#line 13143 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -13145,16 +13160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13151: \$? = $ac_status" >&5
++ echo "$as_me:13166: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13154: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13169: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13157: \$? = $ac_status" >&5
++ echo "$as_me:13172: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13165,7 +13180,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13168: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:13183: 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
+@@ -13174,14 +13189,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:13177: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:13192: 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 13184 "configure"
++#line 13199 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13196,16 +13211,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13214: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13202: \$? = $ac_status" >&5
++ echo "$as_me:13217: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13205: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13220: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13208: \$? = $ac_status" >&5
++ echo "$as_me:13223: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -13312,7 +13327,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13315 "configure"
++#line 13330 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13327,16 +13342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13333: \$? = $ac_status" >&5
++ echo "$as_me:13348: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13336: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13351: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13339: \$? = $ac_status" >&5
++ echo "$as_me:13354: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -13351,12 +13366,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13354: result: $cf_cv_gnu_source" >&5
++echo "$as_me:13369: 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:13359: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:13374: 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
+@@ -13366,7 +13381,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13369 "configure"
++#line 13384 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13381,16 +13396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13399: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13387: \$? = $ac_status" >&5
++ echo "$as_me:13402: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13390: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13405: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13393: \$? = $ac_status" >&5
++ echo "$as_me:13408: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -13401,7 +13416,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13404: result: $cf_cv_default_source" >&5
++echo "$as_me:13419: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -13438,16 +13453,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:13441: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13456: 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}:13447: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13462: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13450 "configure"
++#line 13465 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13462,16 +13477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13468: \$? = $ac_status" >&5
++ echo "$as_me:13483: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13486: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13474: \$? = $ac_status" >&5
++ echo "$as_me:13489: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -13492,7 +13507,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13495 "configure"
++#line 13510 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13507,16 +13522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13525: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13513: \$? = $ac_status" >&5
++ echo "$as_me:13528: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13516: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13531: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13519: \$? = $ac_status" >&5
++ echo "$as_me:13534: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13527,7 +13542,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13535,10 +13550,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:13538: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13553: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13541 "configure"
++#line 13556 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13553,16 +13568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13559: \$? = $ac_status" >&5
++ echo "$as_me:13574: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13562: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13565: \$? = $ac_status" >&5
++ echo "$as_me:13580: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13578,7 +13593,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13581: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13596: 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
+@@ -13695,7 +13710,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:13698: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:13713: 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
+@@ -13727,14 +13742,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:13730: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13745: 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 13737 "configure"
++#line 13752 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13752,16 +13767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13770: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13758: \$? = $ac_status" >&5
++ echo "$as_me:13773: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13761: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13776: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13764: \$? = $ac_status" >&5
++ echo "$as_me:13779: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -13773,7 +13788,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13776 "configure"
++#line 13791 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13791,16 +13806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13809: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13797: \$? = $ac_status" >&5
++ echo "$as_me:13812: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13800: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13815: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13803: \$? = $ac_status" >&5
++ echo "$as_me:13818: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -13815,7 +13830,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13818: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13833: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13975,16 +13990,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:13978: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13993: 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}:13984: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13999: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13987 "configure"
++#line 14002 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13999,16 +14014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14005: \$? = $ac_status" >&5
++ echo "$as_me:14020: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14008: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14011: \$? = $ac_status" >&5
++ echo "$as_me:14026: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -14029,7 +14044,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14032 "configure"
++#line 14047 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14044,16 +14059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14050: \$? = $ac_status" >&5
++ echo "$as_me:14065: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14068: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14056: \$? = $ac_status" >&5
++ echo "$as_me:14071: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14064,7 +14079,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14072,10 +14087,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:14075: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14090: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14078 "configure"
++#line 14093 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14090,16 +14105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14096: \$? = $ac_status" >&5
++ echo "$as_me:14111: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14099: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14114: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14102: \$? = $ac_status" >&5
++ echo "$as_me:14117: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14115,7 +14130,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14118: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14133: 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
+@@ -14228,10 +14243,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}:14231: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14246: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14234 "configure"
++#line 14249 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14249,23 +14264,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14267: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14255: \$? = $ac_status" >&5
++ echo "$as_me:14270: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14258: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14273: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14261: \$? = $ac_status" >&5
++ echo "$as_me:14276: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:14268: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:14283: 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
+@@ -14288,7 +14303,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}:14291: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14306: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -14300,7 +14315,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}:14303: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14318: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14388,7 +14403,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:14391: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14406: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14398,7 +14413,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:14401: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14416: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14408,7 +14423,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}:14411: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14426: 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"
+@@ -14420,10 +14435,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:14423: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:14438: 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 14426 "configure"
++#line 14441 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -14438,16 +14453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14444: \$? = $ac_status" >&5
++ echo "$as_me:14459: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14447: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14450: \$? = $ac_status" >&5
++ echo "$as_me:14465: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14456,12 +14471,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:14459: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:14474: 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 14464 "configure"
++#line 14479 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -14476,16 +14491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14494: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14482: \$? = $ac_status" >&5
++ echo "$as_me:14497: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14485: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14500: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14488: \$? = $ac_status" >&5
++ echo "$as_me:14503: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14496,19 +14511,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:14499: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:14514: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:14504: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14519: 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 14511 "configure"
++#line 14526 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14526,16 +14541,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14532: \$? = $ac_status" >&5
++ echo "$as_me:14547: \$? = $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:14550: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14538: \$? = $ac_status" >&5
++ echo "$as_me:14553: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -14547,7 +14562,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14550 "configure"
++#line 14565 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14565,16 +14580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14568: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14571: \$? = $ac_status" >&5
++ echo "$as_me:14586: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14574: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14589: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14577: \$? = $ac_status" >&5
++ echo "$as_me:14592: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -14589,7 +14604,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14592: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14607: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14736,13 +14751,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:14739: checking for ANSI C header files" >&5
++echo "$as_me:14754: 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 14745 "configure"
++#line 14760 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14750,13 +14765,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:14753: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14768: \"$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:14759: \$? = $ac_status" >&5
++ echo "$as_me:14774: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14778,7 +14793,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 14781 "configure"
++#line 14796 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -14796,7 +14811,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 14799 "configure"
++#line 14814 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -14817,7 +14832,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14820 "configure"
++#line 14835 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14843,15 +14858,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14849: \$? = $ac_status" >&5
++ echo "$as_me:14864: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:14851: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14854: \$? = $ac_status" >&5
++ echo "$as_me:14869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14864,7 +14879,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14867: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14882: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -14880,28 +14895,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14883: checking for $ac_header" >&5
++echo "$as_me:14898: 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 14889 "configure"
++#line 14904 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14895: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14898: \$? = $ac_status" >&5
++ echo "$as_me:14913: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14901: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14916: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14904: \$? = $ac_status" >&5
++ echo "$as_me:14919: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -14911,7 +14926,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14929: 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
+@@ -14921,13 +14936,13 @@
+ fi
+ done
+
+-echo "$as_me:14924: checking whether exit is declared" >&5
++echo "$as_me:14939: 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 14930 "configure"
++#line 14945 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14942,16 +14957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14948: \$? = $ac_status" >&5
++ echo "$as_me:14963: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14951: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14966: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14954: \$? = $ac_status" >&5
++ echo "$as_me:14969: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -14961,7 +14976,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14964: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:14979: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -14971,7 +14986,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14974: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:14989: 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
+@@ -14983,7 +14998,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 14986 "configure"
++#line 15001 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15003,16 +15018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15009: \$? = $ac_status" >&5
++ echo "$as_me:15024: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15012: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15027: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15015: \$? = $ac_status" >&5
++ echo "$as_me:15030: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15022,16 +15037,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15028: \$? = $ac_status" >&5
++ echo "$as_me:15043: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15031: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15046: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15034: \$? = $ac_status" >&5
++ echo "$as_me:15049: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15045,13 +15060,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:15048: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15063: 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:15054: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:15069: 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
+@@ -15059,7 +15074,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15062 "configure"
++#line 15077 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15079,16 +15094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15085: \$? = $ac_status" >&5
++ echo "$as_me:15100: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15088: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15091: \$? = $ac_status" >&5
++ echo "$as_me:15106: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15097,7 +15112,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15100 "configure"
++#line 15115 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -15118,16 +15133,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15124: \$? = $ac_status" >&5
++ echo "$as_me:15139: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15127: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15142: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15130: \$? = $ac_status" >&5
++ echo "$as_me:15145: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15138,7 +15153,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15141: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15156: 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
+
+@@ -15148,7 +15163,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:15151: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:15166: 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
+@@ -15156,7 +15171,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15159 "configure"
++#line 15174 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15176,16 +15191,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15194: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15182: \$? = $ac_status" >&5
++ echo "$as_me:15197: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15185: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15200: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15188: \$? = $ac_status" >&5
++ echo "$as_me:15203: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15194,7 +15209,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15197 "configure"
++#line 15212 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -15215,16 +15230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15221: \$? = $ac_status" >&5
++ echo "$as_me:15236: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15224: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15239: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15227: \$? = $ac_status" >&5
++ echo "$as_me:15242: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -15235,7 +15250,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15238: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15253: 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
+
+@@ -15248,7 +15263,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:15251: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:15266: 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
+@@ -15256,7 +15271,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15259 "configure"
++#line 15274 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15271,16 +15286,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15289: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15277: \$? = $ac_status" >&5
++ echo "$as_me:15292: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15295: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15283: \$? = $ac_status" >&5
++ echo "$as_me:15298: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15289,7 +15304,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15292 "configure"
++#line 15307 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -15305,16 +15320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15311: \$? = $ac_status" >&5
++ echo "$as_me:15326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15314: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15317: \$? = $ac_status" >&5
++ echo "$as_me:15332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -15325,7 +15340,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15328: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15343: 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
+
+@@ -15339,13 +15354,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:15342: checking for fseeko" >&5
++echo "$as_me:15357: 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 15348 "configure"
++#line 15363 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15359,16 +15374,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15377: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15365: \$? = $ac_status" >&5
++ echo "$as_me:15380: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15368: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15383: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15371: \$? = $ac_status" >&5
++ echo "$as_me:15386: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -15378,7 +15393,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15381: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15396: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -15417,14 +15432,14 @@
+
+ fi
+
+- echo "$as_me:15420: checking whether to use struct dirent64" >&5
++ echo "$as_me:15435: 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 15427 "configure"
++#line 15442 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15451,16 +15466,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15457: \$? = $ac_status" >&5
++ echo "$as_me:15472: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15460: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15475: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15463: \$? = $ac_status" >&5
++ echo "$as_me:15478: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -15471,7 +15486,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15474: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15489: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15481,7 +15496,7 @@
+ fi
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15484: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15499: 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.
+@@ -15491,7 +15506,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15494: result: $with_rcs_ids" >&5
++echo "$as_me:15509: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15501,7 +15516,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15504: checking if you want to build with function extensions" >&5
++echo "$as_me:15519: 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.
+@@ -15511,7 +15526,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15514: result: $with_ext_funcs" >&5
++echo "$as_me:15529: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15529,7 +15544,7 @@
+ fi
+
+ ### use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15532: checking for extended use of const keyword" >&5
++echo "$as_me:15547: 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.
+@@ -15539,7 +15554,7 @@
+ else
+ with_ext_const=no
+ fi;
+-echo "$as_me:15542: result: $with_ext_const" >&5
++echo "$as_me:15557: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15549,7 +15564,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:15552: checking if you want all development code" >&5
++echo "$as_me:15567: 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.
+@@ -15559,7 +15574,7 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:15562: result: $with_develop" >&5
++echo "$as_me:15577: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ###############################################################################
+@@ -15568,7 +15583,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+
+-echo "$as_me:15571: checking if you want to link with the pthread library" >&5
++echo "$as_me:15586: 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.
+@@ -15578,27 +15593,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:15581: result: $with_pthread" >&5
++echo "$as_me:15596: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:15585: checking for pthread.h" >&5
++ echo "$as_me:15600: 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 15591 "configure"
++#line 15606 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15610: \"$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:15601: \$? = $ac_status" >&5
++ echo "$as_me:15616: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15617,7 +15632,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15620: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15635: 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
+
+@@ -15627,7 +15642,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:15630: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:15645: 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"
+
+@@ -15648,7 +15663,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15651 "configure"
++#line 15666 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -15665,16 +15680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15668: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15671: \$? = $ac_status" >&5
++ echo "$as_me:15686: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15674: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15689: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15677: \$? = $ac_status" >&5
++ echo "$as_me:15692: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -15684,7 +15699,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:15687: result: $with_pthread" >&5
++ echo "$as_me:15702: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -15712,7 +15727,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:15715: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:15730: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -15721,7 +15736,7 @@
+
+ fi
+
+-echo "$as_me:15724: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15739: 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.
+@@ -15731,18 +15746,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+-echo "$as_me:15734: result: $use_weak_symbols" >&5
++echo "$as_me:15749: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+
+-echo "$as_me:15738: checking if $CC supports weak symbols" >&5
++echo "$as_me:15753: 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 15745 "configure"
++#line 15760 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -15768,16 +15783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15774: \$? = $ac_status" >&5
++ echo "$as_me:15789: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15792: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15780: \$? = $ac_status" >&5
++ echo "$as_me:15795: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -15788,7 +15803,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15791: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15806: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -15817,13 +15832,13 @@
+ fi
+
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15820: checking for _nc_TABSIZE" >&5
++echo "$as_me:15835: checking for _nc_TABSIZE" >&5
+ echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15826 "configure"
++#line 15841 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15854,16 +15869,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15860: \$? = $ac_status" >&5
++ echo "$as_me:15875: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15863: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15878: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15866: \$? = $ac_status" >&5
++ echo "$as_me:15881: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15873,7 +15888,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15876: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15891: result: $ac_cv_func__nc_TABSIZE" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
+ if test "$ac_cv_func__nc_TABSIZE" = yes; then
+ assume_reentrant=yes
+@@ -15885,7 +15900,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:15888: checking if you want experimental reentrant code" >&5
++echo "$as_me:15903: checking if you want experimental reentrant code" >&5
+ echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
+
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -15895,7 +15910,7 @@
+ else
+ with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15898: result: $with_reentrant" >&5
++echo "$as_me:15913: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ cf_cv_enable_reentrant=1
+@@ -15918,7 +15933,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:15921: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:15936: 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.
+@@ -15928,7 +15943,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:15931: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:15946: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -15942,7 +15957,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:15945: checking if you want to see long compiling messages" >&5
++echo "$as_me:15960: 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.
+@@ -15976,10 +15991,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:15979: result: $enableval" >&5
++echo "$as_me:15994: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:15982: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15997: 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.
+@@ -15996,17 +16011,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:15999: result: $enable_stdnoreturn" >&5
++echo "$as_me:16014: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16003: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16018: 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 16009 "configure"
++#line 16024 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16022,16 +16037,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16028: \$? = $ac_status" >&5
++ echo "$as_me:16043: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16031: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16046: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16034: \$? = $ac_status" >&5
++ echo "$as_me:16049: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -16042,7 +16057,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16045: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16060: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -16098,16 +16113,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16101: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16106: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16121: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16110: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16146,16 +16161,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16149: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16154: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16169: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16158: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16194,23 +16209,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16197: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16202: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16217: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:16213: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16228: 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.
+@@ -16227,7 +16242,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:16230: result: $enable_warnings" >&5
++echo "$as_me:16245: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16251,7 +16266,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16254 "configure"
++#line 16269 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -16266,26 +16281,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16269: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16272: \$? = $ac_status" >&5
++ echo "$as_me:16287: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16275: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16290: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16278: \$? = $ac_status" >&5
++ echo "$as_me:16293: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:16281: checking for X11/Xt const-feature" >&5
++echo "$as_me:16296: 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 16288 "configure"
++#line 16303 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -16303,16 +16318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16309: \$? = $ac_status" >&5
++ echo "$as_me:16324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16315: \$? = $ac_status" >&5
++ echo "$as_me:16330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -16327,7 +16342,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16330: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16345: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16356,7 +16371,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16359 "${as_me:-configure}"
++#line 16374 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -16372,7 +16387,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:16375: checking for $CC warning options..." >&5
++ { echo "$as_me:16390: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16388,12 +16403,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:16391: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16394: \$? = $ac_status" >&5
++ echo "$as_me:16409: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16396: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16411: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -16401,7 +16416,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:16404: checking for $CC warning options..." >&5
++ { echo "$as_me:16419: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -16424,12 +16439,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:16427: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16442: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16430: \$? = $ac_status" >&5
++ echo "$as_me:16445: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16432: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16447: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -16437,7 +16452,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16447,7 +16462,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16450: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16465: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16480,10 +16495,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:16483: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16486 "${as_me:-configure}"
++#line 16501 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16533,12 +16548,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16539: \$? = $ac_status" >&5
++ echo "$as_me:16554: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16541: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:16556: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -16606,7 +16621,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16609: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16624: 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.
+@@ -16616,7 +16631,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:16619: result: $with_assertions" >&5
++echo "$as_me:16634: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16669,7 +16684,7 @@
+ ;;
+ esac
+
+-echo "$as_me:16672: checking whether to add trace feature to all models" >&5
++echo "$as_me:16687: 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.
+@@ -16679,7 +16694,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16682: result: $cf_with_trace" >&5
++echo "$as_me:16697: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "$cf_with_trace" = yes ; then
+@@ -16693,7 +16708,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:16696: checking if we want to use GNAT projects" >&5
++echo "$as_me:16711: 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.
+@@ -16710,21 +16725,21 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:16713: result: $enable_gnat_projects" >&5
++echo "$as_me:16728: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+ case $cf_cv_system_name in
+ (*mingw32*)
+
+-echo "$as_me:16720: checking if ssp library is needed" >&5
++echo "$as_me:16735: 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 16727 "configure"
++#line 16742 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16741,16 +16756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16747: \$? = $ac_status" >&5
++ echo "$as_me:16762: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16750: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16765: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16753: \$? = $ac_status" >&5
++ echo "$as_me:16768: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -16760,7 +16775,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16763 "configure"
++#line 16778 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16777,16 +16792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16783: \$? = $ac_status" >&5
++ echo "$as_me:16798: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16786: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16801: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16789: \$? = $ac_status" >&5
++ echo "$as_me:16804: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -16800,7 +16815,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16803: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16818: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16828,13 +16843,13 @@
+ (*)
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:16831: checking for clock_gettime" >&5
++echo "$as_me:16846: 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 16837 "configure"
++#line 16852 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16865,16 +16880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16871: \$? = $ac_status" >&5
++ echo "$as_me:16886: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16874: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16889: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16877: \$? = $ac_status" >&5
++ echo "$as_me:16892: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -16884,12 +16899,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16887: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16902: 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:16892: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:16907: 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
+@@ -16897,7 +16912,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16900 "configure"
++#line 16915 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16916,16 +16931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16922: \$? = $ac_status" >&5
++ echo "$as_me:16937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16925: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16928: \$? = $ac_status" >&5
++ echo "$as_me:16943: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16936,7 +16951,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16939: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16954: 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"
+@@ -16948,14 +16963,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16951: checking if clock_gettime links" >&5
++echo "$as_me:16966: 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 16958 "configure"
++#line 16973 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16973,16 +16988,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16979: \$? = $ac_status" >&5
++ echo "$as_me:16994: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16982: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16997: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16985: \$? = $ac_status" >&5
++ echo "$as_me:17000: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -16993,7 +17008,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16996: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:17011: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -17007,13 +17022,13 @@
+ EOF
+
+ else
+-echo "$as_me:17010: checking for gettimeofday" >&5
++echo "$as_me:17025: 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 17016 "configure"
++#line 17031 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17044,16 +17059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17050: \$? = $ac_status" >&5
++ echo "$as_me:17065: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17056: \$? = $ac_status" >&5
++ echo "$as_me:17071: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -17063,7 +17078,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17066: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17081: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -17073,7 +17088,7 @@
+
+ else
+
+-echo "$as_me:17076: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17091: 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
+@@ -17081,7 +17096,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17084 "configure"
++#line 17099 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17100,16 +17115,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17106: \$? = $ac_status" >&5
++ echo "$as_me:17121: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17109: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17112: \$? = $ac_status" >&5
++ echo "$as_me:17127: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17120,7 +17135,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17123: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17138: 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
+
+@@ -17153,13 +17168,13 @@
+ esac
+
+ ### Checks for header files.
+-echo "$as_me:17156: checking for signed char" >&5
++echo "$as_me:17171: 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 17162 "configure"
++#line 17177 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17174,16 +17189,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17180: \$? = $ac_status" >&5
++ echo "$as_me:17195: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17183: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17198: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17186: \$? = $ac_status" >&5
++ echo "$as_me:17201: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -17193,10 +17208,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17196: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17211: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:17199: checking size of signed char" >&5
++echo "$as_me:17214: 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
+@@ -17205,7 +17220,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17208 "configure"
++#line 17223 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17217,21 +17232,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17220: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17223: \$? = $ac_status" >&5
++ echo "$as_me:17238: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17226: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17241: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17229: \$? = $ac_status" >&5
++ echo "$as_me:17244: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17234 "configure"
++#line 17249 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17243,16 +17258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17249: \$? = $ac_status" >&5
++ echo "$as_me:17264: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17252: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17267: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17255: \$? = $ac_status" >&5
++ echo "$as_me:17270: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -17268,7 +17283,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17271 "configure"
++#line 17286 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17280,16 +17295,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17298: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17286: \$? = $ac_status" >&5
++ echo "$as_me:17301: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17289: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17304: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17292: \$? = $ac_status" >&5
++ echo "$as_me:17307: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -17305,7 +17320,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 17308 "configure"
++#line 17323 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17317,16 +17332,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17323: \$? = $ac_status" >&5
++ echo "$as_me:17338: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17341: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17329: \$? = $ac_status" >&5
++ echo "$as_me:17344: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -17339,12 +17354,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:17342: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:17357: 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 17347 "configure"
++#line 17362 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17360,15 +17375,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17378: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17366: \$? = $ac_status" >&5
++ echo "$as_me:17381: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17368: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17383: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17371: \$? = $ac_status" >&5
++ echo "$as_me:17386: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17384,7 +17399,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17387: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17402: 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
+@@ -17393,13 +17408,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:17396: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17411: 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 17402 "configure"
++#line 17417 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -17414,16 +17429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17432: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17420: \$? = $ac_status" >&5
++ echo "$as_me:17435: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17423: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17438: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17426: \$? = $ac_status" >&5
++ echo "$as_me:17441: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -17433,7 +17448,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17451: 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
+@@ -17446,7 +17461,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:17449: checking for opendir in -ldir" >&5
++ echo "$as_me:17464: 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
+@@ -17454,7 +17469,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17457 "configure"
++#line 17472 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17473,16 +17488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17479: \$? = $ac_status" >&5
++ echo "$as_me:17494: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17482: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17497: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17485: \$? = $ac_status" >&5
++ echo "$as_me:17500: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -17493,14 +17508,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17496: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17511: 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:17503: checking for opendir in -lx" >&5
++ echo "$as_me:17518: 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
+@@ -17508,7 +17523,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17511 "configure"
++#line 17526 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17527,16 +17542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17533: \$? = $ac_status" >&5
++ echo "$as_me:17548: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17551: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17539: \$? = $ac_status" >&5
++ echo "$as_me:17554: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -17547,7 +17562,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17550: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17565: 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"
+@@ -17555,13 +17570,13 @@
+
+ fi
+
+-echo "$as_me:17558: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17573: 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 17564 "configure"
++#line 17579 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -17577,16 +17592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17595: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17583: \$? = $ac_status" >&5
++ echo "$as_me:17598: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17586: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17601: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17589: \$? = $ac_status" >&5
++ echo "$as_me:17604: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -17596,7 +17611,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17599: result: $ac_cv_header_time" >&5
++echo "$as_me:17614: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -17614,13 +17629,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:17617: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17632: 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 17623 "configure"
++#line 17638 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17682,16 +17697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17700: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17688: \$? = $ac_status" >&5
++ echo "$as_me:17703: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17691: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17706: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17694: \$? = $ac_status" >&5
++ echo "$as_me:17709: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -17701,7 +17716,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17704: result: $ac_cv_c_const" >&5
++echo "$as_me:17719: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -17713,7 +17728,7 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:17716: checking if data-only library module links" >&5
++echo "$as_me:17731: 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
+@@ -17721,20 +17736,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 17724 "configure"
++#line 17739 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17742: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17730: \$? = $ac_status" >&5
++ echo "$as_me:17745: \$? = $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 17737 "configure"
++#line 17752 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -17751,10 +17766,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:17754: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17757: \$? = $ac_status" >&5
++ echo "$as_me:17772: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17767,7 +17782,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17770 "configure"
++#line 17785 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -17778,15 +17793,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17784: \$? = $ac_status" >&5
++ echo "$as_me:17799: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17786: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17801: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17789: \$? = $ac_status" >&5
++ echo "$as_me:17804: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -17801,7 +17816,7 @@
+
+ fi
+
+-echo "$as_me:17804: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17819: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17820,23 +17835,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17823: checking for $ac_header" >&5
++echo "$as_me:17838: 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 17829 "configure"
++#line 17844 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17848: \"$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:17839: \$? = $ac_status" >&5
++ echo "$as_me:17854: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17855,7 +17870,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17858: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17873: 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
+@@ -17865,7 +17880,7 @@
+ fi
+ done
+
+-echo "$as_me:17868: checking for working mkstemp" >&5
++echo "$as_me:17883: 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
+@@ -17876,7 +17891,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17879 "configure"
++#line 17894 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17911,15 +17926,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17917: \$? = $ac_status" >&5
++ echo "$as_me:17932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17919: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17934: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17922: \$? = $ac_status" >&5
++ echo "$as_me:17937: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -17934,16 +17949,16 @@
+ fi
+
+ fi
+-echo "$as_me:17937: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17952: 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:17940: checking for mkstemp" >&5
++ echo "$as_me:17955: 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 17946 "configure"
++#line 17961 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17974,16 +17989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17980: \$? = $ac_status" >&5
++ echo "$as_me:17995: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17983: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17986: \$? = $ac_status" >&5
++ echo "$as_me:18001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -17993,7 +18008,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17996: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:18011: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -18014,7 +18029,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+
+- echo "$as_me:18017: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:18032: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -18031,10 +18046,10 @@
+
+ ;;
+ esac
+- echo "$as_me:18034: result: $ADAFLAGS" >&5
++ echo "$as_me:18049: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:18037: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18052: 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
+@@ -18044,11 +18059,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:18047: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18062: 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:18051: checking if GNAT supports generics" >&5
++echo "$as_me:18066: 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])
+@@ -18058,7 +18073,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:18061: result: $cf_gnat_generics" >&5
++echo "$as_me:18076: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -18070,7 +18085,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:18073: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18088: 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
+@@ -18118,7 +18133,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:18121: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18136: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18131,7 +18146,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18134: checking if GNAT supports project files" >&5
++echo "$as_me:18149: 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]*)
+@@ -18194,15 +18209,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:18197: result: $cf_gnat_projects" >&5
++echo "$as_me:18212: 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:18203: checking if GNAT supports libraries" >&5
++ echo "$as_me:18218: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:18205: result: $cf_gnat_libraries" >&5
++ echo "$as_me:18220: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -18222,7 +18237,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:18225: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:18240: 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
+@@ -18234,7 +18249,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:18237: checking for Ada95 compiler" >&5
++echo "$as_me:18252: 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.
+@@ -18245,12 +18260,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:18248: result: $cf_ada_compiler" >&5
++echo "$as_me:18263: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:18253: checking for Ada95 include directory" >&5
++echo "$as_me:18268: 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.
+@@ -18267,26 +18282,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:18289: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18302: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18295,10 +18308,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:18298: result: $ADA_INCLUDE" >&5
++echo "$as_me:18311: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:18301: checking for Ada95 object directory" >&5
++echo "$as_me:18314: 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.
+@@ -18315,26 +18328,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:18337: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18348: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18343,10 +18354,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:18346: result: $ADA_OBJECTS" >&5
++echo "$as_me:18357: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:18349: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18360: 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.
+@@ -18367,11 +18378,11 @@
+ fi
+ fi
+
+-echo "$as_me:18370: result: $with_ada_sharedlib" >&5
++echo "$as_me:18381: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:18374: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:18385: 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
+
+@@ -18389,7 +18400,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:18392: checking for Ada95 curses library name" >&5
++echo "$as_me:18403: 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.
+@@ -18405,16 +18416,16 @@
+ ;;
+ esac
+
+-echo "$as_me:18408: result: $ADA_LIBNAME" >&5
++echo "$as_me:18419: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ else
+- { { echo "$as_me:18412: error: No usable Ada compiler found" >&5
++ { { echo "$as_me:18423: error: No usable Ada compiler found" >&5
+ echo "$as_me: error: No usable Ada compiler found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ else
+- { { echo "$as_me:18417: error: The Ada compiler is needed for this package" >&5
++ { { echo "$as_me:18428: error: The Ada compiler is needed for this package" >&5
+ echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -18454,7 +18465,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:18457: checking default library suffix" >&5
++echo "$as_me:18468: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18465,10 +18476,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18468: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18479: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:18471: checking default library-dependency suffix" >&5
++echo "$as_me:18482: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -18551,10 +18562,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:18554: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18565: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:18557: checking default object directory" >&5
++echo "$as_me:18568: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18570,7 +18581,7 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:18573: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18584: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18712,7 +18723,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18715: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18726: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18893,7 +18904,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:18896: error: ambiguous option: $1
++ { { echo "$as_me:18907: 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;}
+@@ -18912,7 +18923,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:18915: error: unrecognized option: $1
++ -*) { { echo "$as_me:18926: 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;}
+@@ -18987,7 +18998,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:18990: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:19001: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -19109,6 +19120,8 @@
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@LN_S@,$LN_S,;t t
++s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
++s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
+ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t
+ s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+@@ -19351,7 +19364,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:19354: creating $ac_file" >&5
++ { echo "$as_me:19367: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -19369,7 +19382,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:19372: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:19385: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -19382,7 +19395,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:19385: error: cannot find input file: $f" >&5
++ { { echo "$as_me:19398: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -19398,7 +19411,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:19401: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:19414: 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;}
+@@ -19407,7 +19420,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:19410: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:19423: 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;}
+@@ -19452,7 +19465,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:19455: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:19468: 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;}
+@@ -19463,7 +19476,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:19466: WARNING: Some variables may not be substituted:
++ { echo "$as_me:19479: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19512,7 +19525,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:19515: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:19528: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -19523,7 +19536,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:19526: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:19539: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -19536,7 +19549,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:19539: error: cannot find input file: $f" >&5
++ { { echo "$as_me:19552: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -19594,7 +19607,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:19597: $ac_file is unchanged" >&5
++ { echo "$as_me:19610: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: NEWS
+Prereq: 1.4155
+--- ncurses-6.5-20240727+/NEWS 2024-07-27 20:13:00.000000000 +0000
++++ ncurses-6.5-20240810/NEWS 2024-08-10 09:45:21.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4155 2024/07/27 20:13:00 tom Exp $
++-- $Id: NEWS,v 1.4160 2024/08/10 09:45:21 tom Exp $
+ -------------------------------------------------------------------------------
+
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,15 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+
++20240810
++ + modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
++ and used only in the makefile.
++ + modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using
++ DOS/Windows pathname syntax (report by Eli Zaretskii).
++ + improve glob-expressions in configure script
++ + remove unused Get_Menu_Screen() macro from menu.priv.h
++ + update config.guess, config.sub
++
+ 20240727
+ + improve formatting/style of manpages (patches by Branden Robinson).
+ + fixes for compiler warnings/cppcheck.
+Index: VERSION
+--- ncurses-6.5-20240727+/VERSION 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/VERSION 2024-08-10 09:45:21.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.5 20240727
++5:0:10 6.5 20240810
+Index: aclocal.m4
+Prereq: 1.1078
+--- ncurses-6.5-20240727+/aclocal.m4 2024-07-20 23:47:05.000000000 +0000
++++ ncurses-6.5-20240810/aclocal.m4 2024-08-10 15:51:16.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1078 2024/07/20 23:47:05 tom Exp $
++dnl $Id: aclocal.m4,v 1.1087 2024/08/10 15:51:16 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -3213,13 +3213,14 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
++dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39
+ dnl ----------------
+ dnl Check for getopt's variables which are commonly defined in stdlib.h,
+ dnl unistd.h or (nonstandard) in getopt.h
+ AC_DEFUN([CF_GETOPT_HEADER],
+-[
+-AC_HAVE_HEADERS(unistd.h getopt.h)
++[AC_REQUIRE([AC_HEADER_STDC])
++
++AC_CHECK_HEADERS(getopt.h)
+ AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
+ cf_cv_getopt_header=none
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+@@ -3239,7 +3240,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GLOB_FULLPATH version: 1 updated: 2024/07/20 19:45:17
++dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
+ dnl ----------------
+ dnl Use this in case-statements to check for pathname syntax, i.e., absolute
+ dnl pathnames. The "x" is assumed since we provide an alternate form for DOS.
+@@ -3247,16 +3248,16 @@
+ AC_REQUIRE([CF_WITH_SYSTYPE])dnl
+ case "$cf_cv_system_name" in
+ (cygwin*|msys*|mingw32*|mingw64|os2*)
+- GLOB_FULLPATH_ONLY='x/*|x[[a-zA-Z]]:[[\\/]]*'
+- GLOB_FULLPATH_ARGS='x/*\ |x[[a-zA-Z]]:[[\\/]]*\ '
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
+ ;;
+ (*)
+- GLOB_FULLPATH_ONLY='x/*'
+- GLOB_FULLPATH_ARGS='x/*\ '
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+ ;;
+ esac
+-AC_SUBST(GLOB_FULLPATH_ONLY)
+-AC_SUBST(GLOB_FULLPATH_ARGS)
++AC_SUBST(GLOB_FULLPATH_POSIX)
++AC_SUBST(GLOB_FULLPATH_OTHER)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
+@@ -4646,7 +4647,7 @@
+ AC_SUBST(LIB_PREFIX)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_RULES version: 100 updated: 2023/06/03 15:17:30
++dnl CF_LIB_RULES version: 101 updated: 2024/08/03 13:08:58
+ dnl ------------
+ dnl Append definitions and rules for the given models to the subdirectory
+ dnl Makefiles, and the recursion rule for the top-level Makefile. If the
+@@ -4664,6 +4665,7 @@
+ AC_DEFUN([CF_LIB_RULES],
+ [AC_REQUIRE([AC_PROG_FGREP])dnl
+ AC_REQUIRE([CF_MAKE_PHONY])dnl
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
+ cf_prefix=$LIB_PREFIX
+ AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+@@ -5189,7 +5191,7 @@
+ if test "$WITH_CURSES_H" = yes; then
+ cat >>headers.sh <<CF_EOF
+ case \$DST in
+-(/*/include/*)
++($GLOB_FULLPATH_POSIX/include/*)
+ END=\`basename \$DST\`
+ for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
+ do
+@@ -5206,7 +5208,7 @@
+ else
+ cat >>headers.sh <<CF_EOF
+ case \$DST in
+-(/*/include/*)
++($GLOB_FULLPATH_POSIX/include/*)
+ END=\`basename \$DST\`
+ for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
+ do
+@@ -6677,35 +6679,35 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
++dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname. Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+ dnl result begins with 'NONE'. This is necessary to work around autoconf's
+ dnl delayed evaluation of those symbols.
+ AC_DEFUN([CF_PATH_SYNTAX],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++
+ if test "x$prefix" != xNONE; then
+ cf_path_syntax="$prefix"
+ else
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".[$]$1" in
+-(.\[$]\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x[$]$1" in
++(x\[$]\(*\)*|x\'*\'*)
+ ;;
+-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
++(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
+ eval $1="[$]$1"
+- case ".[$]$1" in
+- (.NONE/*)
++ case "x[$]$1" in
++ (xNONE/*)
+ $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+@@ -7094,15 +7096,16 @@
+ AC_SUBST(cf_ada_config_C)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
++dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
+ dnl ---------------
+ dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the
+ dnl misc/tabset install won't work properly. Usually this happens only when
+ dnl using the fallback mkinstalldirs script
+ AC_DEFUN([CF_PROG_INSTALL],
+ [AC_PROG_INSTALL
+-case $INSTALL in
+-(/*)
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+ (*)
+ CF_DIRNAME(cf_dir,$INSTALL)
+@@ -8706,12 +8709,12 @@
+ $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
++dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
+ dnl -----------
+ dnl Check for multibyte support, and if not found, utf8 compatibility library
+ AC_DEFUN([CF_UTF8_LIB],
+ [
+-AC_HAVE_HEADERS(wchar.h)
++AC_CHECK_HEADERS(wchar.h)
+ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+ cf_save_LIBS="$LIBS"
+ AC_TRY_LINK([
+@@ -9658,7 +9661,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -9672,6 +9675,7 @@
+ dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config,
+ dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR.
+ AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
+ case "$PKG_CONFIG" in
+ (no|none|yes)
+@@ -9705,10 +9709,10 @@
+ ;;
+ (x)
+ ;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ PKG_CONFIG_LIBDIR=
+ ;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+ AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+ cf_search_path=
+@@ -9727,7 +9731,15 @@
+ pkg-config \
+ pkgconf
+ do
+- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++ cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++ case "$cf_raw_search_path" in
++ (*\\*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++ ;;
++ (*/*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++ ;;
++ esac
+ test -n "$cf_search_path" && break
+ done
+
+@@ -9947,7 +9959,7 @@
+ [USE_VALGRIND])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_VERSIONED_SYMS version: 13 updated: 2023/12/03 09:24:04
++dnl CF_WITH_VERSIONED_SYMS version: 14 updated: 2024/08/03 12:34:02
+ dnl ----------------------
+ dnl Use this when building shared library with ELF, to markup symbols with the
+ dnl version identifier from the given input file. Generally that identifier is
+@@ -9957,6 +9969,7 @@
+ AC_DEFUN([CF_WITH_VERSIONED_SYMS],
+ [AC_REQUIRE([AC_PROG_FGREP])dnl
+ AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
+ AC_MSG_CHECKING(if versioned-symbols file should be used)
+ AC_ARG_WITH(versioned-syms,
+@@ -9970,7 +9983,7 @@
+ ;;
+ (xno)
+ ;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms)
+ ;;
+ (*)
+Index: config.guess
+--- ncurses-6.5-20240727+/config.guess 2023-12-02 20:31:23.000000000 +0000
++++ ncurses-6.5-20240810/config.guess 2024-07-28 05:41:28.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright 1992-2023 Free Software Foundation, Inc.
++# Copyright 1992-2024 Free Software Foundation, Inc.
+
+ # shellcheck disable=SC2006,SC2268 # see below for rationale
+
+-timestamp='2023-10-19'
++timestamp='2024-07-27'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -60,7 +60,7 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright 1992-2023 Free Software Foundation, Inc.
++Copyright 1992-2024 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -123,7 +123,7 @@
+ dummy=$tmp/dummy
+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+ ,,) echo "int x;" > "$dummy.c"
+- for driver in cc gcc c89 c99 ; do
++ for driver in cc gcc c17 c99 c89 ; do
+ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ CC_FOR_BUILD=$driver
+ break
+@@ -634,7 +634,8 @@
+ sed 's/^ //' << EOF > "$dummy.c"
+ #include <sys/systemcfg.h>
+
+- main()
++ int
++ main ()
+ {
+ if (!__power_pc())
+ exit(1);
+@@ -718,7 +719,8 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+
+- int main ()
++ int
++ main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+@@ -1621,6 +1623,7 @@
+ #endif
+ #endif
+ #endif
++int
+ main ()
+ {
+ #if defined (sony)
+Index: config.sub
+--- ncurses-6.5-20240727+/config.sub 2023-12-27 14:41:27.000000000 +0000
++++ ncurses-6.5-20240810/config.sub 2024-06-03 19:28:43.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-# Copyright 1992-2023 Free Software Foundation, Inc.
++# Copyright 1992-2024 Free Software Foundation, Inc.
+
+-# shellcheck disable=SC2006,SC2268 # see below for rationale
++# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
+
+-timestamp='2023-12-02'
++timestamp='2024-05-27'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -76,7 +76,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright 1992-2023 Free Software Foundation, Inc.
++Copyright 1992-2024 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -120,7 +120,6 @@
+ esac
+
+ # Split fields of configuration type
+-# shellcheck disable=SC2162
+ saved_IFS=$IFS
+ IFS="-" read field1 field2 field3 field4 <<EOF
+ $1
+@@ -142,10 +141,20 @@
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+- nto-qnx* | linux-* | uclinux-uclibc* \
+- | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+- | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+- | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
++ cloudabi*-eabi* \
++ | kfreebsd*-gnu* \
++ | knetbsd*-gnu* \
++ | kopensolaris*-gnu* \
++ | linux-* \
++ | managarm-* \
++ | netbsd*-eabi* \
++ | netbsd*-gnu* \
++ | nto-qnx* \
++ | os2-emx* \
++ | rtmk-nova* \
++ | storm-chaos* \
++ | uclinux-gnu* \
++ | uclinux-uclibc* \
+ | windows-* )
+ basic_machine=$field1
+ basic_os=$maybe_os
+@@ -161,8 +170,12 @@
+ esac
+ ;;
+ *-*)
+- # A lone config we happen to match not fitting any pattern
+ case $field1-$field2 in
++ # Shorthands that happen to contain a single dash
++ convex-c[12] | convex-c3[248])
++ basic_machine=$field2-convex
++ basic_os=
++ ;;
+ decstation-3100)
+ basic_machine=mips-dec
+ basic_os=
+@@ -170,28 +183,88 @@
+ *-*)
+ # Second component is usually, but not always the OS
+ case $field2 in
+- # Prevent following clause from handling this valid os
++ # Do not treat sunos as a manufacturer
+ sun*os*)
+ basic_machine=$field1
+ basic_os=$field2
+ ;;
+- zephyr*)
+- basic_machine=$field1-unknown
+- basic_os=$field2
+- ;;
+ # Manufacturers
+- dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+- | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+- | unicom* | ibm* | next | hp | isi* | apollo | altos* \
+- | convergent* | ncr* | news | 32* | 3600* | 3100* \
+- | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+- | ultra | tti* | harris | dolphin | highlevel | gould \
+- | cbm | ns | masscomp | apple | axis | knuth | cray \
+- | microblaze* | sim | cisco \
+- | oki | wec | wrs | winbond)
++ 3100* \
++ | 32* \
++ | 3300* \
++ | 3600* \
++ | 7300* \
++ | acorn \
++ | altos* \
++ | apollo \
++ | apple \
++ | atari \
++ | att* \
++ | axis \
++ | be \
++ | bull \
++ | cbm \
++ | ccur \
++ | cisco \
++ | commodore \
++ | convergent* \
++ | convex* \
++ | cray \
++ | crds \
++ | dec* \
++ | delta* \
++ | dg \
++ | digital \
++ | dolphin \
++ | encore* \
++ | gould \
++ | harris \
++ | highlevel \
++ | hitachi* \
++ | hp \
++ | ibm* \
++ | intergraph \
++ | isi* \
++ | knuth \
++ | masscomp \
++ | microblaze* \
++ | mips* \
++ | motorola* \
++ | ncr* \
++ | news \
++ | next \
++ | ns \
++ | oki \
++ | omron* \
++ | pc533* \
++ | rebel \
++ | rom68k \
++ | rombug \
++ | semi \
++ | sequent* \
++ | siemens \
++ | sgi* \
++ | siemens \
++ | sim \
++ | sni \
++ | sony* \
++ | stratus \
++ | sun \
++ | sun[234]* \
++ | tektronix \
++ | tti* \
++ | ultra \
++ | unicom* \
++ | wec \
++ | winbond \
++ | wrs)
+ basic_machine=$field1-$field2
+ basic_os=
+ ;;
++ zephyr*)
++ basic_machine=$field1-unknown
++ basic_os=$field2
++ ;;
+ *)
+ basic_machine=$field1
+ basic_os=$field2
+@@ -272,26 +345,6 @@
+ basic_machine=arm-unknown
+ basic_os=cegcc
+ ;;
+- convex-c1)
+- basic_machine=c1-convex
+- basic_os=bsd
+- ;;
+- convex-c2)
+- basic_machine=c2-convex
+- basic_os=bsd
+- ;;
+- convex-c32)
+- basic_machine=c32-convex
+- basic_os=bsd
+- ;;
+- convex-c34)
+- basic_machine=c34-convex
+- basic_os=bsd
+- ;;
+- convex-c38)
+- basic_machine=c38-convex
+- basic_os=bsd
+- ;;
+ cray)
+ basic_machine=j90-cray
+ basic_os=unicos
+@@ -714,15 +767,26 @@
+ vendor=dec
+ basic_os=tops20
+ ;;
+- delta | 3300 | motorola-3300 | motorola-delta \
+- | 3300-motorola | delta-motorola)
++ delta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300)
+ cpu=m68k
+ vendor=motorola
+ ;;
+- dpx2*)
++ # This used to be dpx2*, but that gets the RS6000-based
++ # DPX/20 and the x86-based DPX/2-100 wrong. See
++ # https://oldskool.silicium.org/stations/bull_dpx20.htm
++ # https://www.feb-patrimoine.com/english/bull_dpx2.htm
++ # https://www.feb-patrimoine.com/english/unix_and_bull.htm
++ dpx2 | dpx2[23]00 | dpx2[23]xx)
+ cpu=m68k
+ vendor=bull
+- basic_os=sysv3
++ ;;
++ dpx2100 | dpx21xx)
++ cpu=i386
++ vendor=bull
++ ;;
++ dpx20)
++ cpu=rs6000
++ vendor=bull
+ ;;
+ encore | umax | mmax)
+ cpu=ns32k
+@@ -837,18 +901,6 @@
+ next | m*-next)
+ cpu=m68k
+ vendor=next
+- case $basic_os in
+- openstep*)
+- ;;
+- nextstep*)
+- ;;
+- ns2*)
+- basic_os=nextstep2
+- ;;
+- *)
+- basic_os=nextstep3
+- ;;
+- esac
+ ;;
+ np1)
+ cpu=np1
+@@ -937,7 +989,6 @@
+ ;;
+
+ *-*)
+- # shellcheck disable=SC2162
+ saved_IFS=$IFS
+ IFS="-" read cpu vendor <<EOF
+ $basic_machine
+@@ -972,15 +1023,19 @@
+
+ # Decode basic machines in the full and proper CPU-Company form.
+ case $cpu-$vendor in
+- # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+- # some cases the only manufacturer, in others, it is the most popular.
++ # Here we handle the default manufacturer of certain CPU types in canonical form.
++ # It is in some cases the only manufacturer, in others, it is the most popular.
++ c[12]-convex | c[12]-unknown | c3[248]-convex | c3[248]-unknown)
++ vendor=convex
++ basic_os=${basic_os:-bsd}
++ ;;
+ craynv-unknown)
+ vendor=cray
+ basic_os=${basic_os:-unicosmp}
+ ;;
+ c90-unknown | c90-cray)
+ vendor=cray
+- basic_os=${Basic_os:-unicos}
++ basic_os=${basic_os:-unicos}
+ ;;
+ fx80-unknown)
+ vendor=alliant
+@@ -1026,11 +1081,29 @@
+ vendor=alt
+ basic_os=${basic_os:-linux-gnueabihf}
+ ;;
+- dpx20-unknown | dpx20-bull)
+- cpu=rs6000
+- vendor=bull
++
++ # Normalized CPU+vendor pairs that imply an OS, if not otherwise specified
++ m68k-isi)
++ basic_os=${basic_os:-sysv}
++ ;;
++ m68k-sony)
++ basic_os=${basic_os:-newsos}
++ ;;
++ m68k-tektronix)
++ basic_os=${basic_os:-bsd}
++ ;;
++ m88k-harris)
++ basic_os=${basic_os:-sysv3}
++ ;;
++ i386-bull | m68k-bull)
++ basic_os=${basic_os:-sysv3}
++ ;;
++ rs6000-bull)
+ basic_os=${basic_os:-bosx}
+ ;;
++ mips-sni)
++ basic_os=${basic_os:-sysv4}
++ ;;
+
+ # Here we normalize CPU types irrespective of the vendor
+ amd64-*)
+@@ -1038,7 +1111,7 @@
+ ;;
+ blackfin-*)
+ cpu=bfin
+- basic_os=linux
++ basic_os=${basic_os:-linux}
+ ;;
+ c54x-*)
+ cpu=tic54x
+@@ -1061,7 +1134,7 @@
+ ;;
+ m68knommu-*)
+ cpu=m68k
+- basic_os=linux
++ basic_os=${basic_os:-linux}
+ ;;
+ m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+ cpu=s12z
+@@ -1071,7 +1144,7 @@
+ ;;
+ parisc-*)
+ cpu=hppa
+- basic_os=linux
++ basic_os=${basic_os:-linux}
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ cpu=i586
+@@ -1085,9 +1158,6 @@
+ pentium4-*)
+ cpu=i786
+ ;;
+- pc98-*)
+- cpu=i386
+- ;;
+ ppc-* | ppcbe-*)
+ cpu=powerpc
+ ;;
+@@ -1121,9 +1191,6 @@
+ tx39el-*)
+ cpu=mipstx39el
+ ;;
+- x64-*)
+- cpu=x86_64
+- ;;
+ xscale-* | xscalee[bl]-*)
+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+ ;;
+@@ -1179,90 +1246,227 @@
+ # Recognize the canonical CPU types that are allowed with any
+ # company name.
+ case $cpu in
+- 1750a | 580 \
++ 1750a \
++ | 580 \
++ | [cjt]90 \
+ | a29k \
+- | aarch64 | aarch64_be | aarch64c | arm64ec \
++ | aarch64 \
++ | aarch64_be \
++ | aarch64c \
+ | abacus \
+- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+- | alphapca5[67] | alpha64pca5[67] \
++ | alpha \
++ | alpha64 \
++ | alpha64ev56 \
++ | alpha64ev6[78] \
++ | alpha64ev[4-8] \
++ | alpha64pca5[67] \
++ | alphaev56 \
++ | alphaev6[78] \
++ | alphaev[4-8] \
++ | alphapca5[67] \
+ | am33_2.0 \
+ | amdgcn \
+- | arc | arceb | arc32 | arc64 \
+- | arm | arm[lb]e | arme[lb] | armv* \
+- | avr | avr32 \
++ | arc \
++ | arc32 \
++ | arc64 \
++ | arceb \
++ | arm \
++ | arm64e \
++ | arm64ec \
++ | arm[lb]e \
++ | arme[lb] \
++ | armv* \
+ | asmjs \
++ | avr \
++ | avr32 \
+ | ba \
+- | be32 | be64 \
+- | bfin | bpf | bs2000 \
+- | c[123]* | c30 | [cjt]90 | c4x \
+- | c8051 | clipper | craynv | csky | cydra \
+- | d10v | d30v | dlx | dsp16xx \
+- | e2k | elxsi | epiphany \
+- | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+- | javascript \
+- | h8300 | h8500 \
+- | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | be32 \
++ | be64 \
++ | bfin \
++ | bpf \
++ | bs2000 \
++ | c30 \
++ | c4x \
++ | c8051 \
++ | c[123]* \
++ | clipper \
++ | craynv \
++ | csky \
++ | cydra \
++ | d10v \
++ | d30v \
++ | dlx \
++ | dsp16xx \
++ | e2k \
++ | elxsi \
++ | epiphany \
++ | f30[01] \
++ | f700 \
++ | fido \
++ | fr30 \
++ | frv \
++ | ft32 \
++ | fx80 \
++ | h8300 \
++ | h8500 \
+ | hexagon \
+- | i370 | i*86 | i860 | i960 | ia16 | ia64 \
+- | ip2k | iq2000 \
++ | hppa \
++ | hppa1.[01] \
++ | hppa2.0 \
++ | hppa2.0[nw] \
++ | hppa64 \
++ | i*86 \
++ | i370 \
++ | i860 \
++ | i960 \
++ | ia16 \
++ | ia64 \
++ | ip2k \
++ | iq2000 \
++ | javascript \
+ | k1om \
+ | kvx \
+- | le32 | le64 \
++ | le32 \
++ | le64 \
+ | lm32 \
+- | loongarch32 | loongarch64 \
+- | m32c | m32r | m32rle \
+- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+- | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+- | m88110 | m88k | maxq | mb | mcore | mep | metag \
+- | microblaze | microblazeel \
++ | loongarch32 \
++ | loongarch64 \
++ | m32c \
++ | m32r \
++ | m32rle \
++ | m5200 \
++ | m68000 \
++ | m680[012346]0 \
++ | m6811 \
++ | m6812 \
++ | m68360 \
++ | m683?2 \
++ | m68hc11 \
++ | m68hc12 \
++ | m68hcs12x \
++ | m68k \
++ | m88110 \
++ | m88k \
++ | maxq \
++ | mb \
++ | mcore \
++ | mep \
++ | metag \
++ | microblaze \
++ | microblazeel \
+ | mips* \
+ | mmix \
+- | mn10200 | mn10300 \
++ | mn10200 \
++ | mn10300 \
+ | moxie \
+- | mt \
+ | msp430 \
++ | mt \
+ | nanomips* \
+- | nds32 | nds32le | nds32be \
++ | nds32 \
++ | nds32be \
++ | nds32le \
+ | nfp \
+- | nios | nios2 | nios2eb | nios2el \
+- | none | np1 | ns16k | ns32k | nvptx \
++ | nios \
++ | nios2 \
++ | nios2eb \
++ | nios2el \
++ | none \
++ | np1 \
++ | ns16k \
++ | ns32k \
++ | nvptx \
+ | open8 \
+ | or1k* \
+ | or32 \
+ | orion \
++ | pdp10 \
++ | pdp11 \
+ | picochip \
+- | pdp10 | pdp11 | pj | pjl | pn | power \
+- | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
++ | pj \
++ | pjl \
++ | pn \
++ | power \
++ | powerpc \
++ | powerpc64 \
++ | powerpc64le \
++ | powerpcle \
++ | powerpcspe \
+ | pru \
+ | pyramid \
+- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+- | rl78 | romp | rs6000 | rx \
+- | s390 | s390x \
++ | riscv \
++ | riscv32 \
++ | riscv32be \
++ | riscv64 \
++ | riscv64be \
++ | rl78 \
++ | romp \
++ | rs6000 \
++ | rx \
++ | s390 \
++ | s390x \
+ | score \
+- | sh | shl \
+- | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+- | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
++ | sh \
++ | sh64 \
++ | sh64le \
++ | sh[12345][lb]e \
++ | sh[1234] \
++ | sh[1234]e[lb] \
++ | sh[23]e \
++ | sh[23]ele \
++ | sh[24]a \
++ | sh[24]ae[lb] \
++ | sh[lb]e \
++ | she[lb] \
++ | shl \
++ | sparc \
++ | sparc64 \
++ | sparc64b \
++ | sparc64v \
++ | sparc86x \
++ | sparclet \
+ | sparclite \
+- | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
++ | sparcv8 \
++ | sparcv9 \
++ | sparcv9b \
++ | sparcv9v \
+ | spu \
++ | sv1 \
++ | sx* \
+ | tahoe \
+ | thumbv7* \
+- | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
++ | tic30 \
++ | tic4x \
++ | tic54x \
++ | tic55x \
++ | tic6x \
++ | tic80 \
+ | tron \
+ | ubicom32 \
+- | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
++ | v70 \
++ | v810 \
++ | v850 \
++ | v850e \
++ | v850e1 \
++ | v850e2 \
++ | v850e2v3 \
++ | v850es \
+ | vax \
+ | vc4 \
+ | visium \
+ | w65 \
+- | wasm32 | wasm64 \
++ | wasm32 \
++ | wasm64 \
+ | we32k \
+- | x86 | x86_64 | xc16x | xgate | xps100 \
+- | xstormy16 | xtensa* \
++ | x86 \
++ | x86_64 \
++ | xc16x \
++ | xgate \
++ | xps100 \
++ | xstormy16 \
++ | xtensa* \
+ | ymp \
+- | z8k | z80)
++ | z80 \
++ | z8k)
+ ;;
+
+ *)
+@@ -1307,7 +1511,6 @@
+ os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+ ;;
+ *-*)
+- # shellcheck disable=SC2162
+ saved_IFS=$IFS
+ IFS="-" read kernel os <<EOF
+ $basic_os
+@@ -1354,6 +1557,23 @@
+ unixware*)
+ os=sysv4.2uw
+ ;;
++ # The marketing names for NeXT's operating systems were
++ # NeXTSTEP, NeXTSTEP 2, OpenSTEP 3, OpenSTEP 4. 'openstep' is
++ # mapped to 'openstep3', but 'openstep1' and 'openstep2' are
++ # mapped to 'nextstep' and 'nextstep2', consistent with the
++ # treatment of SunOS/Solaris.
++ ns | ns1 | nextstep | nextstep1 | openstep1)
++ os=nextstep
++ ;;
++ ns2 | nextstep2 | openstep2)
++ os=nextstep2
++ ;;
++ ns3 | nextstep3 | openstep | openstep3)
++ os=openstep3
++ ;;
++ ns4 | nextstep4 | openstep4)
++ os=openstep4
++ ;;
+ # es1800 is here to avoid being matched by es* (a different OS)
+ es1800*)
+ os=ose
+@@ -1424,6 +1644,7 @@
+ ;;
+ utek*)
+ os=bsd
++ vendor=`echo "$vendor" | sed -e 's|^unknown$|tektronix|'`
+ ;;
+ dynix*)
+ os=bsd
+@@ -1440,21 +1661,25 @@
+ 386bsd)
+ os=bsd
+ ;;
+- ctix* | uts*)
++ ctix*)
+ os=sysv
++ vendor=`echo "$vendor" | sed -e 's|^unknown$|convergent|'`
+ ;;
+- nova*)
+- os=rtmk-nova
++ uts*)
++ os=sysv
+ ;;
+- ns2)
+- os=nextstep2
++ nova*)
++ kernel=rtmk
++ os=nova
+ ;;
+ # Preserve the version number of sinix5.
+ sinix5.*)
+ os=`echo "$os" | sed -e 's|sinix|sysv|'`
++ vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
+ ;;
+ sinix*)
+ os=sysv4
++ vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
+ ;;
+ tpf*)
+ os=tpf
+@@ -1595,6 +1820,14 @@
+ os=
+ obj=elf
+ ;;
++ # The -sgi and -siemens entries must be before the mips- entry
++ # or we get the wrong os.
++ *-sgi)
++ os=irix
++ ;;
++ *-siemens)
++ os=sysv4
++ ;;
+ mips*-cisco)
+ os=
+ obj=elf
+@@ -1607,7 +1840,8 @@
+ os=
+ obj=coff
+ ;;
+- *-tti) # must be before sparc entry or we get the wrong os.
++ # This must be before the sparc-* entry or we get the wrong os.
++ *-tti)
+ os=sysv3
+ ;;
+ sparc-* | *-sun)
+@@ -1639,7 +1873,7 @@
+ os=hpux
+ ;;
+ *-hitachi)
+- os=hiux
++ os=hiuxwe2
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=sysv
+@@ -1683,12 +1917,6 @@
+ *-encore)
+ os=bsd
+ ;;
+- *-sgi)
+- os=irix
+- ;;
+- *-siemens)
+- os=sysv4
+- ;;
+ *-masscomp)
+ os=rtu
+ ;;
+@@ -1735,40 +1963,193 @@
+ ghcjs)
+ ;;
+ # Now accept the basic system types.
+- # The portable systems comes first.
+ # Each alternative MUST end in a * to match a version number.
+- gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+- | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+- | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+- | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
+- | hiux* | abug | nacl* | netware* | windows* \
+- | os9* | macos* | osx* | ios* | tvos* | watchos* \
+- | mpw* | magic* | mmixware* | mon960* | lnews* \
+- | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+- | aos* | aros* | cloudabi* | sortix* | twizzler* \
+- | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+- | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+- | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+- | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+- | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+- | bosx* | nextstep* | cxux* | oabi* \
+- | ptx* | ecoff* | winnt* | domain* | vsta* \
+- | udi* | lites* | ieee* | go32* | aux* | hcos* \
+- | chorusrdb* | cegcc* | glidix* | serenity* \
+- | cygwin* | msys* | moss* | proelf* | rtems* \
+- | midipix* | mingw32* | mingw64* | mint* \
+- | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+- | interix* | uwin* | mks* | rhapsody* | darwin* \
+- | openstep* | oskit* | conix* | pw32* | nonstopux* \
+- | storm-chaos* | tops10* | tenex* | tops20* | its* \
+- | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+- | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+- | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+- | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+- | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+- | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+- | fiwix* | mlibc* | cos* | mbr* | ironclad* )
++ abug \
++ | aix* \
++ | amdhsa* \
++ | amigados* \
++ | amigaos* \
++ | android* \
++ | aof* \
++ | aos* \
++ | aros* \
++ | atheos* \
++ | auroraux* \
++ | aux* \
++ | beos* \
++ | bitrig* \
++ | bme* \
++ | bosx* \
++ | bsd* \
++ | cegcc* \
++ | chorusos* \
++ | chorusrdb* \
++ | clix* \
++ | cloudabi* \
++ | cnk* \
++ | conix* \
++ | cos* \
++ | cxux* \
++ | cygwin* \
++ | darwin* \
++ | dgux* \
++ | dicos* \
++ | dnix* \
++ | domain* \
++ | dragonfly* \
++ | drops* \
++ | ebmon* \
++ | ecoff* \
++ | ekkobsd* \
++ | emscripten* \
++ | emx* \
++ | es* \
++ | fiwix* \
++ | freebsd* \
++ | fuchsia* \
++ | genix* \
++ | genode* \
++ | glidix* \
++ | gnu* \
++ | go32* \
++ | haiku* \
++ | hcos* \
++ | hiux* \
++ | hms* \
++ | hpux* \
++ | ieee* \
++ | interix* \
++ | ios* \
++ | iris* \
++ | irix* \
++ | ironclad* \
++ | isc* \
++ | its* \
++ | l4re* \
++ | libertybsd* \
++ | lites* \
++ | lnews* \
++ | luna* \
++ | lynxos* \
++ | mach* \
++ | macos* \
++ | magic* \
++ | mbr* \
++ | midipix* \
++ | midnightbsd* \
++ | mingw32* \
++ | mingw64* \
++ | minix* \
++ | mint* \
++ | mirbsd* \
++ | mks* \
++ | mlibc* \
++ | mmixware* \
++ | mon960* \
++ | morphos* \
++ | moss* \
++ | moxiebox* \
++ | mpeix* \
++ | mpw* \
++ | msdos* \
++ | msys* \
++ | mvs* \
++ | nacl* \
++ | netbsd* \
++ | netware* \
++ | newsos* \
++ | nextstep* \
++ | nindy* \
++ | nonstopux* \
++ | nova* \
++ | nsk* \
++ | nucleus* \
++ | nx6 \
++ | nx7 \
++ | oabi* \
++ | ohos* \
++ | onefs* \
++ | openbsd* \
++ | openedition* \
++ | openstep* \
++ | os108* \
++ | os2* \
++ | os400* \
++ | os68k* \
++ | os9* \
++ | ose* \
++ | osf* \
++ | oskit* \
++ | osx* \
++ | palmos* \
++ | phoenix* \
++ | plan9* \
++ | powermax* \
++ | powerunix* \
++ | proelf* \
++ | psos* \
++ | psp* \
++ | ptx* \
++ | pw32* \
++ | qnx* \
++ | rdos* \
++ | redox* \
++ | rhapsody* \
++ | riscix* \
++ | riscos* \
++ | rtems* \
++ | rtmk* \
++ | rtu* \
++ | scout* \
++ | secbsd* \
++ | sei* \
++ | serenity* \
++ | sim* \
++ | skyos* \
++ | solaris* \
++ | solidbsd* \
++ | sortix* \
++ | storm-chaos* \
++ | sunos \
++ | sunos[34]* \
++ | superux* \
++ | syllable* \
++ | sym* \
++ | sysv* \
++ | tenex* \
++ | tirtos* \
++ | toppers* \
++ | tops10* \
++ | tops20* \
++ | tpf* \
++ | tvos* \
++ | twizzler* \
++ | uclinux* \
++ | udi* \
++ | udk* \
++ | ultrix* \
++ | unicos* \
++ | uniplus* \
++ | unleashed* \
++ | unos* \
++ | uwin* \
++ | uxpv* \
++ | v88r* \
++ |*vms* \
++ | vos* \
++ | vsta* \
++ | vxsim* \
++ | vxworks* \
++ | wasi* \
++ | watchos* \
++ | wince* \
++ | windiss* \
++ | windows* \
++ | winnt* \
++ | xenix* \
++ | xray* \
++ | zephyr* \
++ | zvmoe* )
+ ;;
+ # This one is extra strict with allowed versions
+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+@@ -1829,9 +2210,9 @@
+ case $kernel-$os-$obj in
+ linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+ | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+- | linux-relibc*- | linux-uclibc*- )
++ | linux-relibc*- | linux-uclibc*- | linux-ohos*- )
+ ;;
+- uclinux-uclibc*- )
++ uclinux-uclibc*- | uclinux-gnu*- )
+ ;;
+ managarm-mlibc*- | managarm-kernel*- )
+ ;;
+@@ -1856,7 +2237,7 @@
+ echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
+ exit 1
+ ;;
+- kfreebsd*-gnu*- | kopensolaris*-gnu*-)
++ kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
+ ;;
+ vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
+ ;;
+@@ -1864,6 +2245,8 @@
+ ;;
+ os2-emx-)
+ ;;
++ rtmk-nova-)
++ ;;
+ *-eabi*- | *-gnueabi*-)
+ ;;
+ none--*)
+@@ -1890,7 +2273,7 @@
+ *-riscix*)
+ vendor=acorn
+ ;;
+- *-sunos*)
++ *-sunos* | *-solaris*)
+ vendor=sun
+ ;;
+ *-cnk* | *-aix*)
+Index: configure
+--- ncurses-6.5-20240727+/configure 2024-07-20 23:48:24.000000000 +0000
++++ ncurses-6.5-20240810/configure 2024-08-10 15:51:41.000000000 +0000
+@@ -4088,6 +4088,17 @@
+ echo "$as_me: error: No awk program found" >&2;}
+ { (exit 1); exit 1; }; }
+
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
++ ;;
++(*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++ ;;
++esac
++
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -4100,7 +4111,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:4103: checking for a BSD compatible install" >&5
++echo "$as_me:4114: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -4149,7 +4160,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:4152: result: $INSTALL" >&5
++echo "$as_me:4163: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4160,8 +4171,8 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-case $INSTALL in
+-(/*)
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+ (*)
+ cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
+@@ -4174,7 +4185,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:4177: checking for $ac_word" >&5
++echo "$as_me:4188: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LINT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4189,7 +4200,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4192: found $ac_dir/$ac_word" >&5
++echo "$as_me:4203: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4197,10 +4208,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+- echo "$as_me:4200: result: $LINT" >&5
++ echo "$as_me:4211: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+- echo "$as_me:4203: result: no" >&5
++ echo "$as_me:4214: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4213,18 +4224,18 @@
+ ;;
+ esac
+
+-echo "$as_me:4216: checking whether ln -s works" >&5
++echo "$as_me:4227: 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:4220: result: yes" >&5
++ echo "$as_me:4231: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:4223: result: no, using $LN_S" >&5
++ echo "$as_me:4234: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+
+-echo "$as_me:4227: checking if $LN_S -f options work" >&5
++echo "$as_me:4238: 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
+@@ -4236,12 +4247,12 @@
+ cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4239: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4250: 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:4244: checking for long file names" >&5
++echo "$as_me:4255: 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
+@@ -4280,7 +4291,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4283: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4294: 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
+
+@@ -4299,7 +4310,7 @@
+ withval="$with_config_suffix"
+ case "x$withval" in
+ (xyes|xno)
+- { echo "$as_me:4302: WARNING: expected a value for config-suffix option" >&5
++ { echo "$as_me:4313: 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"
+@@ -4309,7 +4320,7 @@
+
+ # If we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:4312: checking if you want to use pkg-config" >&5
++echo "$as_me:4323: 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.
+@@ -4319,7 +4330,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:4322: result: $cf_pkg_config" >&5
++echo "$as_me:4333: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -4331,7 +4342,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:4334: checking for $ac_word" >&5
++echo "$as_me:4345: 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
+@@ -4348,7 +4359,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:4351: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4362: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4359,10 +4370,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:4362: result: $PKG_CONFIG" >&5
++ echo "$as_me:4373: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:4365: result: no" >&5
++ echo "$as_me:4376: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4371,7 +4382,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:4374: checking for $ac_word" >&5
++echo "$as_me:4385: 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
+@@ -4388,7 +4399,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:4391: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4402: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4400,10 +4411,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:4403: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:4414: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:4406: result: no" >&5
++ echo "$as_me:4417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4427,43 +4438,41 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$PKG_CONFIG" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$PKG_CONFIG" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval PKG_CONFIG="$PKG_CONFIG"
+- case ".$PKG_CONFIG" in
+- (.NONE/*)
++ case "x$PKG_CONFIG" in
++ (xNONE/*)
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4449: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:4458: 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:4456: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:4465: 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:4462: checking for pkg-config library directory" >&5
++ echo "$as_me:4471: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:4466: 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
+ ;;
+ esac
+@@ -4490,27 +4499,27 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:4493: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4502: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (x)
+ ;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ PKG_CONFIG_LIBDIR=
+ ;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:4504: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4513: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:4509: result: auto" >&5
++ echo "$as_me:4518: 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:4513: checking for search-list" >&5
++ echo "$as_me:4522: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -4521,7 +4530,15 @@
+ pkg-config \
+ pkgconf
+ do
+- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++ cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++ case "$cf_raw_search_path" in
++ (*\\*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++ ;;
++ (*/*)
++ cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++ ;;
++ esac
+ test -n "$cf_search_path" && break
+ done
+
+@@ -4537,11 +4554,11 @@
+ "`
+ fi
+
+- echo "$as_me:4540: result: $cf_search_path" >&5
++ echo "$as_me:4557: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:4544: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:4561: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4549,7 +4566,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:4552: checking for first directory" >&5
++ echo "$as_me:4569: 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
+@@ -4560,7 +4577,7 @@
+ break
+ fi
+ done
+- echo "$as_me:4563: result: $cf_pkg_config_path" >&5
++ echo "$as_me:4580: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4570,7 +4587,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:4573: checking for workaround" >&5
++ echo "$as_me:4590: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -4593,17 +4610,17 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:4596: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4613: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+ if test "x$PKG_CONFIG" != xnone
+ then
+- echo "$as_me:4603: checking if we should install .pc files for $PKG_CONFIG" >&5
++ echo "$as_me:4620: 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:4606: checking if we should install .pc files" >&5
++ echo "$as_me:4623: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+
+@@ -4614,7 +4631,7 @@
+ else
+ enable_pc_files=no
+ fi;
+-echo "$as_me:4617: result: $enable_pc_files" >&5
++echo "$as_me:4634: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+
+ if test "x$enable_pc_files" != xno
+@@ -4622,7 +4639,7 @@
+ MAKE_PC_FILES=
+ case "x$PKG_CONFIG_LIBDIR" in
+ (xno|xnone|xyes|x)
+- { echo "$as_me:4625: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++ { echo "$as_me:4642: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ ;;
+ (*)
+@@ -4634,26 +4651,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_pkg_config_libdir" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_pkg_config_libdir" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_pkg_config_libdir="$cf_pkg_config_libdir"
+- case ".$cf_pkg_config_libdir" in
+- (.NONE/*)
++ case "x$cf_pkg_config_libdir" in
++ (xNONE/*)
+ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4656: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++ { { echo "$as_me:4671: 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; }; }
+ ;;
+@@ -4667,7 +4682,7 @@
+
+ if test -z "$MAKE_PC_FILES"
+ then
+- echo "$as_me:4670: checking for suffix to add to pkg-config files" >&5
++ echo "$as_me:4685: 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.
+@@ -4682,13 +4697,13 @@
+ esac
+ fi;
+ test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+- echo "$as_me:4685: result: $PC_MODULE_SUFFIX" >&5
++ echo "$as_me:4700: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+
+ fi
+
+-echo "$as_me:4691: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4706: 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.
+@@ -4698,11 +4713,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:4701: result: $enable_mixedcase" >&5
++echo "$as_me:4716: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:4705: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4720: 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
+@@ -4729,7 +4744,7 @@
+ fi
+
+ fi
+-echo "$as_me:4732: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4747: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4748,7 +4763,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4751: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4766: 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
+@@ -4768,16 +4783,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:4771: result: yes" >&5
++ echo "$as_me:4786: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:4775: result: no" >&5
++ echo "$as_me:4790: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:4780: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4795: 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
+@@ -4832,7 +4847,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:4835: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4850: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4843,7 +4858,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:4846: checking for $ac_word" >&5
++echo "$as_me:4861: 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
+@@ -4858,7 +4873,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4861: found $ac_dir/$ac_word" >&5
++echo "$as_me:4876: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4866,10 +4881,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:4869: result: $CTAGS" >&5
++ echo "$as_me:4884: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:4872: result: no" >&5
++ echo "$as_me:4887: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4880,7 +4895,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:4883: checking for $ac_word" >&5
++echo "$as_me:4898: 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
+@@ -4895,7 +4910,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4898: found $ac_dir/$ac_word" >&5
++echo "$as_me:4913: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4903,10 +4918,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4906: result: $ETAGS" >&5
++ echo "$as_me:4921: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4909: result: no" >&5
++ echo "$as_me:4924: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4915,7 +4930,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:4918: checking for $ac_word" >&5
++echo "$as_me:4933: 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
+@@ -4930,7 +4945,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:4933: found $ac_dir/$ac_word" >&5
++echo "$as_me:4948: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4939,17 +4954,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4942: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4957: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4945: result: no" >&5
++ echo "$as_me:4960: 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:4952: checking for $ac_word" >&5
++echo "$as_me:4967: 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
+@@ -4964,7 +4979,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:4967: found $ac_dir/$ac_word" >&5
++echo "$as_me:4982: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4973,10 +4988,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4976: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4991: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4979: result: no" >&5
++ echo "$as_me:4994: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4996,7 +5011,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:4999: checking for makeflags variable" >&5
++echo "$as_me:5014: 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
+@@ -5026,7 +5041,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -5034,13 +5049,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:5037: result: $cf_cv_makeflags" >&5
++echo "$as_me:5052: 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:5043: checking for $ac_word" >&5
++echo "$as_me:5058: 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
+@@ -5055,7 +5070,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:5058: found $ac_dir/$ac_word" >&5
++echo "$as_me:5073: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5063,10 +5078,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:5066: result: $RANLIB" >&5
++ echo "$as_me:5081: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:5069: result: no" >&5
++ echo "$as_me:5084: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5075,7 +5090,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:5078: checking for $ac_word" >&5
++echo "$as_me:5093: 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
+@@ -5090,7 +5105,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:5093: found $ac_dir/$ac_word" >&5
++echo "$as_me:5108: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5099,10 +5114,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:5102: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:5117: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:5105: result: no" >&5
++ echo "$as_me:5120: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5114,7 +5129,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:5117: checking for $ac_word" >&5
++echo "$as_me:5132: 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
+@@ -5129,7 +5144,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:5132: found $ac_dir/$ac_word" >&5
++echo "$as_me:5147: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5137,10 +5152,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:5140: result: $LD" >&5
++ echo "$as_me:5155: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:5143: result: no" >&5
++ echo "$as_me:5158: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5149,7 +5164,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:5152: checking for $ac_word" >&5
++echo "$as_me:5167: 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
+@@ -5164,7 +5179,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:5167: found $ac_dir/$ac_word" >&5
++echo "$as_me:5182: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5173,10 +5188,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:5176: result: $ac_ct_LD" >&5
++ echo "$as_me:5191: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:5179: result: no" >&5
++ echo "$as_me:5194: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5188,7 +5203,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:5191: checking for $ac_word" >&5
++echo "$as_me:5206: 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
+@@ -5203,7 +5218,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:5206: found $ac_dir/$ac_word" >&5
++echo "$as_me:5221: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5211,10 +5226,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5214: result: $AR" >&5
++ echo "$as_me:5229: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5217: result: no" >&5
++ echo "$as_me:5232: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5223,7 +5238,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:5226: checking for $ac_word" >&5
++echo "$as_me:5241: 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
+@@ -5238,7 +5253,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:5241: found $ac_dir/$ac_word" >&5
++echo "$as_me:5256: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5247,10 +5262,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5250: result: $ac_ct_AR" >&5
++ echo "$as_me:5265: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5253: result: no" >&5
++ echo "$as_me:5268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5262,7 +5277,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:5265: checking for $ac_word" >&5
++echo "$as_me:5280: 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
+@@ -5277,7 +5292,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:5280: found $ac_dir/$ac_word" >&5
++echo "$as_me:5295: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5285,10 +5300,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+- echo "$as_me:5288: result: $NM" >&5
++ echo "$as_me:5303: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+- echo "$as_me:5291: result: no" >&5
++ echo "$as_me:5306: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5297,7 +5312,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:5300: checking for $ac_word" >&5
++echo "$as_me:5315: 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
+@@ -5312,7 +5327,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:5315: found $ac_dir/$ac_word" >&5
++echo "$as_me:5330: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5321,10 +5336,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+- echo "$as_me:5324: result: $ac_ct_NM" >&5
++ echo "$as_me:5339: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+- echo "$as_me:5327: result: no" >&5
++ echo "$as_me:5342: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5336,7 +5351,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:5339: checking for $ac_word" >&5
++echo "$as_me:5354: 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
+@@ -5351,7 +5366,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:5354: found $ac_dir/$ac_word" >&5
++echo "$as_me:5369: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5359,10 +5374,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5362: result: $AR" >&5
++ echo "$as_me:5377: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5365: result: no" >&5
++ echo "$as_me:5380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5371,7 +5386,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:5374: checking for $ac_word" >&5
++echo "$as_me:5389: 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
+@@ -5386,7 +5401,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:5389: found $ac_dir/$ac_word" >&5
++echo "$as_me:5404: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5395,10 +5410,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5398: result: $ac_ct_AR" >&5
++ echo "$as_me:5413: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5401: result: no" >&5
++ echo "$as_me:5416: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5407,7 +5422,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:5410: checking for options to update archives" >&5
++echo "$as_me:5425: 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
+@@ -5444,13 +5459,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 5447 "configure"
++#line 5462 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:5450: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:5465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5453: \$? = $ac_status" >&5
++ echo "$as_me:5468: \$? = $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
+@@ -5461,7 +5476,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -5471,7 +5486,7 @@
+ esac
+
+ fi
+-echo "$as_me:5474: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5489: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -5482,7 +5497,7 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+-echo "$as_me:5485: checking for an installation directory prefix" >&5
++echo "$as_me:5500: 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.
+@@ -5495,7 +5510,7 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:5498: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5513: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
+ ###############################################################################
+@@ -5530,7 +5545,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:5533: checking for $ac_word" >&5
++echo "$as_me:5548: 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
+@@ -5545,7 +5560,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:5548: found $ac_dir/$ac_word" >&5
++echo "$as_me:5563: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5553,10 +5568,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:5556: result: $BUILD_CC" >&5
++ echo "$as_me:5571: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:5559: result: no" >&5
++ echo "$as_me:5574: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5565,12 +5580,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:5568: checking for native build C compiler" >&5
++ echo "$as_me:5583: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:5570: result: $BUILD_CC" >&5
++ echo "$as_me:5585: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:5573: checking for native build C preprocessor" >&5
++ echo "$as_me:5588: 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.
+@@ -5580,10 +5595,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:5583: result: $BUILD_CPP" >&5
++ echo "$as_me:5598: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:5586: checking for native build C flags" >&5
++ echo "$as_me:5601: 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.
+@@ -5591,10 +5606,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:5594: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:5609: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:5597: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:5612: 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.
+@@ -5602,10 +5617,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:5605: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:5620: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:5608: checking for native build linker-flags" >&5
++ echo "$as_me:5623: 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.
+@@ -5613,10 +5628,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:5616: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:5631: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:5619: checking for native build linker-libraries" >&5
++ echo "$as_me:5634: 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.
+@@ -5624,7 +5639,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:5627: result: $BUILD_LIBS" >&5
++ echo "$as_me:5642: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -5633,7 +5648,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:5636: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:5651: 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
+@@ -5647,7 +5662,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5650 "configure"
++#line 5665 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -5657,15 +5672,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5675: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5663: \$? = $ac_status" >&5
++ echo "$as_me:5678: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5665: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5680: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5668: \$? = $ac_status" >&5
++ echo "$as_me:5683: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -5680,12 +5695,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:5683: result: $cf_ok_build_cc" >&5
++ echo "$as_me:5698: 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:5688: error: Cross-build requires two compilers.
++ { { echo "$as_me:5703: 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;}
+@@ -5710,7 +5725,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:5713: checking if libtool -version-number should be used" >&5
++echo "$as_me:5728: 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.
+@@ -5727,7 +5742,7 @@
+ cf_libtool_version=yes
+
+ fi;
+-echo "$as_me:5730: result: $cf_libtool_version" >&5
++echo "$as_me:5745: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+
+ if test "$cf_libtool_version" = yes ; then
+@@ -5736,25 +5751,25 @@
+ LIBTOOL_VERSION="-version-info"
+ case "x$VERSION" in
+ (x)
+- { echo "$as_me:5739: WARNING: VERSION was not set" >&5
++ { echo "$as_me:5754: 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}:5746: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5761: 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}:5753: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5768: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:5757: WARNING: unexpected VERSION value: $VERSION" >&5
++ { echo "$as_me:5772: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ ;;
+ esac
+@@ -5776,7 +5791,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+
+-echo "$as_me:5779: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5794: 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.
+@@ -5786,7 +5801,7 @@
+ else
+ with_libtool=no
+ fi;
+-echo "$as_me:5789: result: $with_libtool" >&5
++echo "$as_me:5804: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+
+@@ -5798,26 +5813,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$with_libtool" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$with_libtool" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+- ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval with_libtool="$with_libtool"
+- case ".$with_libtool" in
+- (.NONE/*)
++ case "x$with_libtool" in
++ (xNONE/*)
+ with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:5820: error: expected a pathname, not \"$with_libtool\"" >&5
++ { { echo "$as_me:5833: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -5830,7 +5843,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:5833: checking for $ac_word" >&5
++echo "$as_me:5846: 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
+@@ -5845,7 +5858,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:5848: found $ac_dir/$ac_word" >&5
++echo "$as_me:5861: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5853,10 +5866,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5856: result: $LIBTOOL" >&5
++ echo "$as_me:5869: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5859: result: no" >&5
++ echo "$as_me:5872: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5869,7 +5882,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:5872: checking for $ac_word" >&5
++echo "$as_me:5885: 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
+@@ -5884,7 +5897,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:5887: found $ac_dir/$ac_word" >&5
++echo "$as_me:5900: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5892,10 +5905,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:5895: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:5908: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:5898: result: no" >&5
++ echo "$as_me:5911: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5926,7 +5939,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:5929: checking for $ac_word" >&5
++echo "$as_me:5942: 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
+@@ -5941,7 +5954,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:5944: found $ac_dir/$ac_word" >&5
++echo "$as_me:5957: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5949,10 +5962,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5952: result: $LIBTOOL" >&5
++ echo "$as_me:5965: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5955: result: no" >&5
++ echo "$as_me:5968: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5965,7 +5978,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:5968: checking for $ac_word" >&5
++echo "$as_me:5981: 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
+@@ -5980,7 +5993,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:5983: found $ac_dir/$ac_word" >&5
++echo "$as_me:5996: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5988,10 +6001,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:5991: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:6004: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:5994: result: no" >&5
++ echo "$as_me:6007: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6013,7 +6026,7 @@
+ fi
+ fi
+ if test -z "$LIBTOOL" ; then
+- { { echo "$as_me:6016: error: Cannot find libtool" >&5
++ { { echo "$as_me:6029: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6029,7 +6042,7 @@
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+- echo "$as_me:6032: checking version of $LIBTOOL" >&5
++ echo "$as_me:6045: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6040,7 +6053,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+- echo "$as_me:6043: result: $cf_cv_libtool_version" >&5
++ echo "$as_me:6056: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+
+ if test -n "$cf_cv_libtool_version"
+@@ -6050,19 +6063,19 @@
+ (*...GNU-libtool...*)
+ ;;
+ (*)
+- { { echo "$as_me:6053: error: This is not GNU libtool" >&5
++ { { echo "$as_me:6066: 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:6059: error: No version found for $LIBTOOL" >&5
++ { { echo "$as_me:6072: 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:6065: error: GNU libtool has not been found" >&5
++ { { echo "$as_me:6078: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6098,7 +6111,7 @@
+
+ else
+
+-echo "$as_me:6101: checking if you want to build shared libraries" >&5
++echo "$as_me:6114: 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.
+@@ -6108,11 +6121,11 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:6111: result: $with_shared" >&5
++echo "$as_me:6124: 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:6115: checking if you want to build static libraries" >&5
++echo "$as_me:6128: 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.
+@@ -6122,11 +6135,11 @@
+ else
+ with_normal=yes
+ fi;
+-echo "$as_me:6125: result: $with_normal" >&5
++echo "$as_me:6138: 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:6129: checking if you want to build debug libraries" >&5
++echo "$as_me:6142: 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.
+@@ -6136,11 +6149,11 @@
+ else
+ with_debug=yes
+ fi;
+-echo "$as_me:6139: result: $with_debug" >&5
++echo "$as_me:6152: 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:6143: checking if you want to build profiling libraries" >&5
++echo "$as_me:6156: 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.
+@@ -6150,7 +6163,7 @@
+ else
+ with_profile=no
+ fi;
+-echo "$as_me:6153: result: $with_profile" >&5
++echo "$as_me:6166: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+
+@@ -6158,7 +6171,7 @@
+
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6161: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6174: 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.
+@@ -6168,26 +6181,26 @@
+ else
+ with_shared_cxx=no
+ fi;
+-echo "$as_me:6171: result: $with_shared_cxx" >&5
++echo "$as_me:6184: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+
+ ###############################################################################
+
+-echo "$as_me:6178: checking for specified models" >&5
++echo "$as_me:6191: 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:6182: result: $cf_list_models" >&5
++echo "$as_me:6195: 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:6187: checking for default model" >&5
++echo "$as_me:6200: 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:6190: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6203: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6201,7 +6214,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+
+-echo "$as_me:6204: checking if you want to have a library-prefix" >&5
++echo "$as_me:6217: 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.
+@@ -6211,7 +6224,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:6214: result: $with_lib_prefix" >&5
++echo "$as_me:6227: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -6242,24 +6255,24 @@
+
+ LIB_SUFFIX=
+
+- echo "$as_me:6245: checking for PATH separator" >&5
++ echo "$as_me:6258: 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:6252: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:6265: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+ # headers needed for checks...
+-echo "$as_me:6256: checking for ANSI C header files" >&5
++echo "$as_me:6269: 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 6262 "configure"
++#line 6275 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -6267,13 +6280,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:6270: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6283: \"$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:6276: \$? = $ac_status" >&5
++ echo "$as_me:6289: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6295,7 +6308,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 6298 "configure"
++#line 6311 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6313,7 +6326,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 6316 "configure"
++#line 6329 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6334,7 +6347,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6337 "configure"
++#line 6350 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6360,15 +6373,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6376: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6366: \$? = $ac_status" >&5
++ echo "$as_me:6379: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6368: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6381: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6371: \$? = $ac_status" >&5
++ echo "$as_me:6384: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6381,7 +6394,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6384: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6397: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6397,28 +6410,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6400: checking for $ac_header" >&5
++echo "$as_me:6413: 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 6406 "configure"
++#line 6419 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6412: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6425: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6415: \$? = $ac_status" >&5
++ echo "$as_me:6428: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6418: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6431: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6421: \$? = $ac_status" >&5
++ echo "$as_me:6434: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6428,7 +6441,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6431: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6444: 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
+@@ -6438,13 +6451,13 @@
+ fi
+ done
+
+-echo "$as_me:6441: checking whether exit is declared" >&5
++echo "$as_me:6454: 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 6447 "configure"
++#line 6460 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6459,16 +6472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6465: \$? = $ac_status" >&5
++ echo "$as_me:6478: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6468: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6481: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6471: \$? = $ac_status" >&5
++ echo "$as_me:6484: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6478,19 +6491,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6481: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6494: 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:6487: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6500: 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 6493 "configure"
++#line 6506 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -6505,16 +6518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6511: \$? = $ac_status" >&5
++ echo "$as_me:6524: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6514: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6527: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6517: \$? = $ac_status" >&5
++ echo "$as_me:6530: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6524,7 +6537,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6527: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6540: 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
+@@ -6537,7 +6550,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:6540: checking for opendir in -ldir" >&5
++ echo "$as_me:6553: 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
+@@ -6545,7 +6558,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6548 "configure"
++#line 6561 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6564,16 +6577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6570: \$? = $ac_status" >&5
++ echo "$as_me:6583: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6573: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6586: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6576: \$? = $ac_status" >&5
++ echo "$as_me:6589: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -6584,14 +6597,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6587: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6600: 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:6594: checking for opendir in -lx" >&5
++ echo "$as_me:6607: 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
+@@ -6599,7 +6612,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6602 "configure"
++#line 6615 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6618,16 +6631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6624: \$? = $ac_status" >&5
++ echo "$as_me:6637: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6627: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6640: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6630: \$? = $ac_status" >&5
++ echo "$as_me:6643: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -6638,7 +6651,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6641: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6654: 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"
+@@ -6648,7 +6661,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:6651: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6664: 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.
+@@ -6658,10 +6671,10 @@
+ else
+ with_termlib=no
+ fi;
+-echo "$as_me:6661: result: $with_termlib" >&5
++echo "$as_me:6674: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+
+-echo "$as_me:6664: checking if you want to build a separate tic library" >&5
++echo "$as_me:6677: 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.
+@@ -6671,7 +6684,7 @@
+ else
+ with_ticlib=no
+ fi;
+-echo "$as_me:6674: result: $with_ticlib" >&5
++echo "$as_me:6687: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6684,7 +6697,7 @@
+ test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+
+-echo "$as_me:6687: checking for default loader flags" >&5
++echo "$as_me:6700: 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='' ;;
+@@ -6693,13 +6706,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:6696: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6709: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+
+ case "$DFT_LWR_MODEL" in
+ (shared)
+
+-echo "$as_me:6702: checking if rpath option should be used" >&5
++echo "$as_me:6715: 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.
+@@ -6709,10 +6722,10 @@
+ else
+ cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6712: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6725: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+
+-echo "$as_me:6715: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6728: 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.
+@@ -6722,7 +6735,7 @@
+ else
+ cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6725: result: $cf_cv_do_relink" >&5
++echo "$as_me:6738: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ ;;
+ esac
+@@ -6733,7 +6746,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:6736: checking for an rpath option" >&5
++ echo "$as_me:6749: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -6764,12 +6777,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:6767: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:6780: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:6772: checking if we need a space after rpath option" >&5
++ echo "$as_me:6785: 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"
+
+@@ -6790,7 +6803,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6793 "configure"
++#line 6806 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -6802,16 +6815,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6808: \$? = $ac_status" >&5
++ echo "$as_me:6821: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6811: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6824: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6814: \$? = $ac_status" >&5
++ echo "$as_me:6827: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -6821,7 +6834,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:6824: result: $cf_rpath_space" >&5
++ echo "$as_me:6837: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -6843,7 +6856,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:6846: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:6859: 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.
+@@ -6858,9 +6871,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:6861: result: $withval" >&5
++ echo "$as_me:6874: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:6863: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:6876: 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; }; }
+ ;;
+@@ -6869,7 +6882,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:6872: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:6885: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -6892,14 +6905,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:6895: checking which $CC option to use" >&5
++ echo "$as_me:6908: 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 6902 "configure"
++#line 6915 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6911,16 +6924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6917: \$? = $ac_status" >&5
++ echo "$as_me:6930: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6920: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6933: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6923: \$? = $ac_status" >&5
++ echo "$as_me:6936: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -6929,7 +6942,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:6932: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:6945: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -7000,7 +7013,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:7003: checking if ld -search_paths_first works" >&5
++ echo "$as_me:7016: 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
+@@ -7009,7 +7022,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7012 "configure"
++#line 7025 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -7021,16 +7034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7027: \$? = $ac_status" >&5
++ echo "$as_me:7040: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7030: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7043: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7033: \$? = $ac_status" >&5
++ echo "$as_me:7046: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7041,7 +7054,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7044: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7057: 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"
+@@ -7391,7 +7404,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7394 "configure"
++#line 7407 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7403,16 +7416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7409: \$? = $ac_status" >&5
++ echo "$as_me:7422: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7412: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7425: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7415: \$? = $ac_status" >&5
++ echo "$as_me:7428: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -7449,7 +7462,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:7452: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:7465: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -7459,7 +7472,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 7462 "${as_me:-configure}"
++#line 7475 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -7471,18 +7484,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:7474: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:7487: 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:7476: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7479: \$? = $ac_status" >&5
++ echo "$as_me:7492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:7481: result: yes" >&5
++ echo "$as_me:7494: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:7485: result: no" >&5
++ echo "$as_me:7498: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -7497,17 +7510,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:7500: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7513: 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}:7504: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7517: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ for model in $cf_list_models ; do
+ case "$model" in
+ (libtool)
+
+-echo "$as_me:7510: checking for additional libtool options" >&5
++echo "$as_me:7523: 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.
+@@ -7517,7 +7530,7 @@
+ else
+ with_libtool_opts=no
+ fi;
+-echo "$as_me:7520: result: $with_libtool_opts" >&5
++echo "$as_me:7533: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+
+ case .$with_libtool_opts in
+@@ -7528,7 +7541,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7531: checking if exported-symbols file should be used" >&5
++echo "$as_me:7544: 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.
+@@ -7543,7 +7556,7 @@
+ with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+
+ fi
+-echo "$as_me:7546: result: $with_export_syms" >&5
++echo "$as_me:7559: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7554,15 +7567,15 @@
+ ;;
+ (shared)
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+- { { echo "$as_me:7557: error: Shared libraries are not supported in this version" >&5
++ { { echo "$as_me:7570: 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:7562: checking if current CFLAGS link properly" >&5
++ echo "$as_me:7575: 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 7565 "configure"
++#line 7578 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7574,16 +7587,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7590: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7580: \$? = $ac_status" >&5
++ echo "$as_me:7593: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7583: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7596: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7586: \$? = $ac_status" >&5
++ echo "$as_me:7599: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cflags_work=yes
+ else
+@@ -7592,18 +7605,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7595: result: $cf_cflags_work" >&5
++ echo "$as_me:7608: 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}:7601: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7614: testing try to work around by appending shared-options ..." 1>&5
+
+ CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ fi
+
+-echo "$as_me:7606: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7619: 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.
+@@ -7620,19 +7633,19 @@
+ ;;
+ (xno)
+ ;;
+-(x/*)
+- test -f "$with_versioned_syms" || { { echo "$as_me:7624: error: expected a filename: $with_versioned_syms" >&5
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
++ test -f "$with_versioned_syms" || { { echo "$as_me:7637: 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:7629: error: expected a filename: $with_versioned_syms" >&5
++ test -f "$with_versioned_syms" || { { echo "$as_me:7642: 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:7635: result: $with_versioned_syms" >&5
++echo "$as_me:7648: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+
+ RESULTING_SYMS=
+@@ -7648,7 +7661,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}:7651: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7664: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*-dy\ *)
+@@ -7656,11 +7669,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}:7659: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7672: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:7663: WARNING: this system does not support versioned-symbols" >&5
++ { echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ ;;
+ esac
+@@ -7672,7 +7685,7 @@
+ # symbols.
+ if test "x$VERSIONED_SYMS" != "x"
+ then
+- echo "$as_me:7675: checking if wildcards can be used to selectively omit symbols" >&5
++ echo "$as_me:7688: 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
+
+@@ -7709,7 +7722,7 @@
+ } submodule_1.0;
+ EOF
+ cat >conftest.$ac_ext <<EOF
+-#line 7712 "configure"
++#line 7725 "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; }
+@@ -7740,7 +7753,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:7743: result: $WILDCARD_SYMS" >&5
++ echo "$as_me:7756: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ rm -f conftest.*
+ fi
+@@ -7753,7 +7766,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+
+-echo "$as_me:7756: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7769: 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.
+@@ -7763,27 +7776,27 @@
+ else
+ with_gpm=maybe
+ fi;
+-echo "$as_me:7766: result: $with_gpm" >&5
++echo "$as_me:7779: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7770: checking for gpm.h" >&5
++ echo "$as_me:7783: 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 7776 "configure"
++#line 7789 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:7780: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7793: \"$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:7786: \$? = $ac_status" >&5
++ echo "$as_me:7799: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7802,7 +7815,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7805: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7818: 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
+
+@@ -7813,7 +7826,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}:7816: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7829: testing assuming we really have GPM library ..." 1>&5
+
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7821,7 +7834,7 @@
+
+ with_gpm=yes
+ else
+- echo "$as_me:7824: checking for Gpm_Open in -lgpm" >&5
++ echo "$as_me:7837: 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
+@@ -7829,7 +7842,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7832 "configure"
++#line 7845 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7848,16 +7861,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7864: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7854: \$? = $ac_status" >&5
++ echo "$as_me:7867: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7870: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7860: \$? = $ac_status" >&5
++ echo "$as_me:7873: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7868,18 +7881,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7871: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7884: 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:7878: WARNING: Cannot link with GPM library" >&5
++ { echo "$as_me:7891: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ with_gpm=no
+ else
+- { { echo "$as_me:7882: error: Cannot link with GPM library" >&5
++ { { echo "$as_me:7895: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7890,7 +7903,7 @@
+
+ else
+
+- test "$with_gpm" != maybe && { echo "$as_me:7893: WARNING: Cannot find GPM header" >&5
++ test "$with_gpm" != maybe && { echo "$as_me:7906: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ with_gpm=no
+
+@@ -7899,7 +7912,7 @@
+ fi
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7902: checking if you want to load GPM dynamically" >&5
++ echo "$as_me:7915: 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.
+@@ -7909,18 +7922,18 @@
+ else
+ with_dlsym=yes
+ fi;
+- echo "$as_me:7912: result: $with_dlsym" >&5
++ echo "$as_me:7925: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ if test "x$with_dlsym" = xyes ; then
+
+ cf_have_dlsym=no
+-echo "$as_me:7917: checking for dlsym" >&5
++echo "$as_me:7930: 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 7923 "configure"
++#line 7936 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7951,16 +7964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7957: \$? = $ac_status" >&5
++ echo "$as_me:7970: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7973: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7963: \$? = $ac_status" >&5
++ echo "$as_me:7976: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_dlsym=yes
+ else
+@@ -7970,14 +7983,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7973: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7986: 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:7980: checking for dlsym in -ldl" >&5
++echo "$as_me:7993: 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
+@@ -7985,7 +7998,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7988 "configure"
++#line 8001 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8004,16 +8017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8020: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8010: \$? = $ac_status" >&5
++ echo "$as_me:8023: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8013: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8026: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8016: \$? = $ac_status" >&5
++ echo "$as_me:8029: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8024,7 +8037,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8027: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8040: 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
+
+@@ -8053,10 +8066,10 @@
+ LIBS="$cf_add_libs"
+ }
+
+- echo "$as_me:8056: checking whether able to link to dl*() functions" >&5
++ echo "$as_me:8069: 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 8059 "configure"
++#line 8072 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -8074,16 +8087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8090: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8080: \$? = $ac_status" >&5
++ echo "$as_me:8093: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8083: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8096: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8086: \$? = $ac_status" >&5
++ echo "$as_me:8099: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cat >>confdefs.h <<\EOF
+@@ -8094,15 +8107,15 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { { echo "$as_me:8097: error: Cannot link test program for libdl" >&5
++ { { echo "$as_me:8110: 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:8102: result: ok" >&5
++ echo "$as_me:8115: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+- { { echo "$as_me:8105: error: Cannot find dlsym function" >&5
++ { { echo "$as_me:8118: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8110,12 +8123,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}:8113: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8126: testing assuming soname for gpm is $with_gpm ..." 1>&5
+
+ cf_cv_gpm_soname="$with_gpm"
+ else
+
+-echo "$as_me:8118: checking for soname of gpm library" >&5
++echo "$as_me:8131: 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
+@@ -8149,15 +8162,15 @@
+ done
+ LIBS="$cf_add_libs"
+
+- if { (eval echo "$as_me:8152: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8155: \$? = $ac_status" >&5
++ echo "$as_me:8168: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8160: \$? = $ac_status" >&5
++ echo "$as_me:8173: \$? = $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
+@@ -8168,7 +8181,7 @@
+ fi
+
+ fi
+-echo "$as_me:8171: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8184: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+
+ fi
+@@ -8236,7 +8249,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+
+-echo "$as_me:8239: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8252: 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
+@@ -8244,7 +8257,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8247 "configure"
++#line 8260 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8263,16 +8276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8269: \$? = $ac_status" >&5
++ echo "$as_me:8282: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8272: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8285: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8275: \$? = $ac_status" >&5
++ echo "$as_me:8288: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8283,11 +8296,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8286: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8299: 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:8290: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8303: 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
+@@ -8311,15 +8324,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:8314: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8327: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8317: \$? = $ac_status" >&5
++ echo "$as_me:8330: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8332: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8322: \$? = $ac_status" >&5
++ echo "$as_me:8335: \$? = $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
+@@ -8331,11 +8344,11 @@
+ fi
+
+ fi
+-echo "$as_me:8334: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8347: 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:8338: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++ { echo "$as_me:8351: 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
+
+@@ -8343,7 +8356,7 @@
+
+ fi
+
+-echo "$as_me:8346: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8359: 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.
+@@ -8352,7 +8365,7 @@
+
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8355: result: $with_pcre2" >&5
++echo "$as_me:8368: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+
+ if test "x$with_pcre2" != xno ; then
+@@ -8363,17 +8376,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}:8366: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8379: 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}:8372: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8385: 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}:8376: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8389: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8497,7 +8510,7 @@
+ fi
+
+ done
+- cf_with_pcre2_ok=yes || { { echo "$as_me:8500: error: Cannot find PCRE2 library" >&5
++ cf_with_pcre2_ok=yes || { { echo "$as_me:8513: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -8510,7 +8523,7 @@
+ (*pcre2-posix*|*pcreposix*)
+ ;;
+ (*)
+- echo "$as_me:8513: checking for regcomp in -lpcre2-posix" >&5
++ echo "$as_me:8526: 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
+@@ -8518,7 +8531,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8521 "configure"
++#line 8534 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8537,16 +8550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8553: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8543: \$? = $ac_status" >&5
++ echo "$as_me:8556: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8546: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8559: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8549: \$? = $ac_status" >&5
++ echo "$as_me:8562: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8557,7 +8570,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8560: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8573: 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
+
+@@ -8578,7 +8591,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- echo "$as_me:8581: checking for regcomp in -lpcreposix" >&5
++ echo "$as_me:8594: 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
+@@ -8586,7 +8599,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8589 "configure"
++#line 8602 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8605,16 +8618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8611: \$? = $ac_status" >&5
++ echo "$as_me:8624: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8614: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8627: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8617: \$? = $ac_status" >&5
++ echo "$as_me:8630: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8625,7 +8638,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8628: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8641: 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
+
+@@ -8646,7 +8659,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- { { echo "$as_me:8649: error: Cannot find PCRE2 POSIX library" >&5
++ { { echo "$as_me:8662: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8661,23 +8674,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:8664: checking for $ac_header" >&5
++echo "$as_me:8677: 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 8670 "configure"
++#line 8683 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8674: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8687: \"$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:8680: \$? = $ac_status" >&5
++ echo "$as_me:8693: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8696,7 +8709,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8699: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8712: 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
+@@ -8709,13 +8722,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:8712: checking for $ac_func" >&5
++echo "$as_me:8725: 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 8718 "configure"
++#line 8731 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8746,16 +8759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8762: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8752: \$? = $ac_status" >&5
++ echo "$as_me:8765: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8755: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8768: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8758: \$? = $ac_status" >&5
++ echo "$as_me:8771: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -8765,7 +8778,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8768: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8781: 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
+@@ -8779,7 +8792,7 @@
+
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:8782: checking if you want to use sysmouse" >&5
++echo "$as_me:8795: 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.
+@@ -8791,7 +8804,7 @@
+ fi;
+ if test "$cf_with_sysmouse" != no ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8794 "configure"
++#line 8807 "configure"
+ #include "confdefs.h"
+
+ #include <osreldate.h>
+@@ -8814,16 +8827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8817: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8830: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8820: \$? = $ac_status" >&5
++ echo "$as_me:8833: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8823: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8826: \$? = $ac_status" >&5
++ echo "$as_me:8839: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_with_sysmouse=yes
+ else
+@@ -8833,7 +8846,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8836: result: $cf_with_sysmouse" >&5
++echo "$as_me:8849: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8843,7 +8856,7 @@
+ fi
+
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8846: checking if you want to disable library suffixes" >&5
++echo "$as_me:8859: 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.
+@@ -8860,13 +8873,13 @@
+ disable_lib_suffixes=no
+
+ fi;
+-echo "$as_me:8863: result: $disable_lib_suffixes" >&5
++echo "$as_me:8876: 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:8869: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8882: 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.
+@@ -8884,22 +8897,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:8887: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8900: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:8892: checking for updated LDFLAGS" >&5
++echo "$as_me:8905: 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:8895: result: maybe" >&5
++ echo "$as_me:8908: 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:8902: checking for $ac_word" >&5
++echo "$as_me:8915: 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
+@@ -8914,7 +8927,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:8917: found $ac_dir/$ac_word" >&5
++echo "$as_me:8930: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8922,10 +8935,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:8925: result: $cf_ldd_prog" >&5
++ echo "$as_me:8938: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:8928: result: no" >&5
++ echo "$as_me:8941: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8939,7 +8952,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8942 "configure"
++#line 8955 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8951,16 +8964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8957: \$? = $ac_status" >&5
++ echo "$as_me:8970: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8973: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8963: \$? = $ac_status" >&5
++ echo "$as_me:8976: \$? = $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`
+@@ -8988,7 +9001,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -9000,11 +9013,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9003: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9016: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9007: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9020: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9041,7 +9054,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9044: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9057: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9054,11 +9067,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9057: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9070: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9061: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9074: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9095,7 +9108,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9098: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9111: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9108,14 +9121,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9111: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9124: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9128: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:9118: result: no" >&5
++ echo "$as_me:9131: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9129,7 +9142,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+- echo "$as_me:9132: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++ echo "$as_me:9145: 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.
+@@ -9146,7 +9159,7 @@
+ disable_pkg_ldflags=no
+
+ fi;
+- echo "$as_me:9149: result: $disable_pkg_ldflags" >&5
++ echo "$as_me:9162: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9154,7 +9167,7 @@
+ ###############################################################################
+
+ ### use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9157: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9170: 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=
+
+@@ -9173,11 +9186,11 @@
+ esac
+
+ fi;
+-echo "$as_me:9176: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9189: 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:9180: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9193: 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.
+@@ -9187,10 +9200,10 @@
+ else
+ if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9190: result: $with_overwrite" >&5
++echo "$as_me:9203: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+
+-echo "$as_me:9193: checking if external terminfo-database is used" >&5
++echo "$as_me:9206: 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.
+@@ -9200,7 +9213,7 @@
+ else
+ use_database=yes
+ fi;
+-echo "$as_me:9203: result: $use_database" >&5
++echo "$as_me:9216: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+
+ case "$host_os" in
+@@ -9216,7 +9229,7 @@
+ if test "$use_database" != no ; then
+ NCURSES_USE_DATABASE=1
+
+- echo "$as_me:9219: checking which terminfo source-file will be installed" >&5
++ echo "$as_me:9232: 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.
+@@ -9224,10 +9237,10 @@
+ withval="$with_database"
+ TERMINFO_SRC=$withval
+ fi;
+- echo "$as_me:9227: result: $TERMINFO_SRC" >&5
++ echo "$as_me:9240: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+
+- echo "$as_me:9230: checking whether to use hashed database instead of directory/tree" >&5
++ echo "$as_me:9243: 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.
+@@ -9237,13 +9250,13 @@
+ else
+ with_hashed_db=no
+ fi;
+- echo "$as_me:9240: result: $with_hashed_db" >&5
++ echo "$as_me:9253: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ with_hashed_db=no
+ fi
+
+-echo "$as_me:9246: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9259: 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.
+@@ -9253,7 +9266,7 @@
+ else
+ with_fallback=
+ fi;
+-echo "$as_me:9256: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9269: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+
+ case ".$with_fallback" in
+@@ -9261,7 +9274,7 @@
+ FALLBACK_LIST=
+ ;;
+ (.yes)
+- { echo "$as_me:9264: WARNING: expected a list of terminal descriptions" >&5
++ { echo "$as_me:9277: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ ;;
+ (*)
+@@ -9277,7 +9290,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:9280: checking for $ac_word" >&5
++echo "$as_me:9293: 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
+@@ -9292,7 +9305,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:9295: found $ac_dir/$ac_word" >&5
++echo "$as_me:9308: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9300,10 +9313,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+- echo "$as_me:9303: result: $TIC" >&5
++ echo "$as_me:9316: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9306: result: no" >&5
++ echo "$as_me:9319: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9312,7 +9325,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:9315: checking for $ac_word" >&5
++echo "$as_me:9328: 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
+@@ -9327,7 +9340,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:9330: found $ac_dir/$ac_word" >&5
++echo "$as_me:9343: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9335,10 +9348,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+- echo "$as_me:9338: result: $ac_ct_TIC" >&5
++ echo "$as_me:9351: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+- echo "$as_me:9341: result: no" >&5
++ echo "$as_me:9354: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9350,7 +9363,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:9353: checking for $ac_word" >&5
++echo "$as_me:9366: 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
+@@ -9365,7 +9378,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:9368: found $ac_dir/$ac_word" >&5
++echo "$as_me:9381: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9373,10 +9386,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9376: result: $INFOCMP" >&5
++ echo "$as_me:9389: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9379: result: no" >&5
++ echo "$as_me:9392: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9385,7 +9398,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:9388: checking for $ac_word" >&5
++echo "$as_me:9401: 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
+@@ -9400,7 +9413,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:9403: found $ac_dir/$ac_word" >&5
++echo "$as_me:9416: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9408,10 +9421,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+- echo "$as_me:9411: result: $ac_ct_INFOCMP" >&5
++ echo "$as_me:9424: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+- echo "$as_me:9414: result: no" >&5
++ echo "$as_me:9427: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9426,10 +9439,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:9429: checking for tic program for fallbacks" >&5
++ echo "$as_me:9442: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ TIC=$withval
+- echo "$as_me:9432: result: $TIC" >&5
++ echo "$as_me:9445: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9438,26 +9451,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$TIC" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$TIC" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval TIC="$TIC"
+- case ".$TIC" in
+- (.NONE/*)
++ case "x$TIC" in
++ (xNONE/*)
+ TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9460: error: expected a pathname, not \"$TIC\"" >&5
++ { { echo "$as_me:9471: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9470,7 +9481,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:9473: checking for $ac_word" >&5
++echo "$as_me:9484: 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
+@@ -9487,7 +9498,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:9490: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9501: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9498,10 +9509,10 @@
+ TIC=$ac_cv_path_TIC
+
+ if test -n "$TIC"; then
+- echo "$as_me:9501: result: $TIC" >&5
++ echo "$as_me:9512: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9504: result: no" >&5
++ echo "$as_me:9515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9523,22 +9534,20 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_temp" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_temp" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_temp="$cf_temp"
+- case ".$cf_temp" in
+- (.NONE/*)
++ case "x$cf_temp" in
++ (xNONE/*)
+ cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+@@ -9560,7 +9569,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9563: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9572: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -9575,7 +9584,7 @@
+
+ if test -z "$TIC"
+ then
+- { echo "$as_me:9578: WARNING: no tic program found for fallbacks" >&5
++ { echo "$as_me:9587: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ fi
+
+@@ -9584,10 +9593,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:9587: checking for infocmp program for fallbacks" >&5
++ echo "$as_me:9596: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ INFOCMP=$withval
+- echo "$as_me:9590: result: $INFOCMP" >&5
++ echo "$as_me:9599: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9596,26 +9605,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$INFOCMP" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$INFOCMP" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+- ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval INFOCMP="$INFOCMP"
+- case ".$INFOCMP" in
+- (.NONE/*)
++ case "x$INFOCMP" in
++ (xNONE/*)
+ INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9618: error: expected a pathname, not \"$INFOCMP\"" >&5
++ { { echo "$as_me:9625: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9628,7 +9635,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:9631: checking for $ac_word" >&5
++echo "$as_me:9638: 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
+@@ -9645,7 +9652,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:9648: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9655: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9656,10 +9663,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9659: result: $INFOCMP" >&5
++ echo "$as_me:9666: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9662: result: no" >&5
++ echo "$as_me:9669: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9681,22 +9688,20 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_temp" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_temp" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_temp="$cf_temp"
+- case ".$cf_temp" in
+- (.NONE/*)
++ case "x$cf_temp" in
++ (xNONE/*)
+ cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+@@ -9718,7 +9723,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9721: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9726: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -9733,7 +9738,7 @@
+
+ if test -z "$INFOCMP"
+ then
+- { echo "$as_me:9736: WARNING: no infocmp program found for fallbacks" >&5
++ { echo "$as_me:9741: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ fi
+
+@@ -9743,7 +9748,7 @@
+ test -z "$INFOCMP" && FALLBACK_LIST=
+ if test -z "$FALLBACK_LIST"
+ then
+- { echo "$as_me:9746: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++ { echo "$as_me:9751: 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
+@@ -9751,7 +9756,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+
+-echo "$as_me:9754: checking if you want modern xterm or antique" >&5
++echo "$as_me:9759: 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.
+@@ -9765,7 +9770,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*) with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9768: result: $with_xterm_new" >&5
++echo "$as_me:9773: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+
+@@ -9778,7 +9783,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9781: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9786: 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.
+@@ -9802,13 +9807,13 @@
+ with_xterm_kbs=$withval
+ ;;
+ esac
+-echo "$as_me:9805: result: $with_xterm_kbs" >&5
++echo "$as_me:9810: 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:9811: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++ { echo "$as_me:9816: 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
+
+@@ -9818,7 +9823,7 @@
+ MAKE_TERMINFO="#"
+ else
+
+-echo "$as_me:9821: checking for list of terminfo directories" >&5
++echo "$as_me:9826: 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.
+@@ -9839,26 +9844,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_src_path" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_src_path" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_src_path="$cf_src_path"
+- case ".$cf_src_path" in
+- (.NONE/*)
++ case "x$cf_src_path" in
++ (xNONE/*)
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9861: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:9864: 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; }; }
+ ;;
+@@ -9881,7 +9884,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9884: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9887: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9890,13 +9893,13 @@
+
+ case "x$TERMINFO" in
+ x???:*)
+- { echo "$as_me:9893: WARNING: ignoring non-directory/file TERMINFO value" >&5
++ { echo "$as_me:9896: 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:9899: checking for default terminfo directory" >&5
++echo "$as_me:9902: 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.
+@@ -9913,26 +9916,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+- ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9935: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:9936: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9941,7 +9942,7 @@
+ fi
+ eval TERMINFO="$withval"
+
+-echo "$as_me:9944: result: $TERMINFO" >&5
++echo "$as_me:9945: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -9952,7 +9953,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:9955: checking if big-core option selected" >&5
++echo "$as_me:9956: 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.
+@@ -9964,7 +9965,7 @@
+ with_big_core=no
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9967 "configure"
++#line 9968 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -9978,15 +9979,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9984: \$? = $ac_status" >&5
++ echo "$as_me:9985: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9986: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9987: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9989: \$? = $ac_status" >&5
++ echo "$as_me:9990: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_big_core=yes
+ else
+@@ -9998,7 +9999,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10001: result: $with_big_core" >&5
++echo "$as_me:10002: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10008,7 +10009,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:10011: checking if big-strings option selected" >&5
++echo "$as_me:10012: 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.
+@@ -10032,14 +10033,14 @@
+ esac
+
+ fi;
+-echo "$as_me:10035: result: $with_big_strings" >&5
++echo "$as_me:10036: 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:10042: checking if you want termcap-fallback support" >&5
++echo "$as_me:10043: 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.
+@@ -10049,14 +10050,14 @@
+ else
+ with_termcap=no
+ fi;
+-echo "$as_me:10052: result: $with_termcap" >&5
++echo "$as_me:10053: 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:10059: error: You have disabled the database w/o specifying fallbacks" >&5
++ { { echo "$as_me:10060: 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
+@@ -10069,13 +10070,13 @@
+ else
+
+ if test "$with_ticlib" != no ; then
+- { { echo "$as_me:10072: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++ { { echo "$as_me:10073: 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:10078: checking for list of termcap files" >&5
++ echo "$as_me:10079: 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.
+@@ -10096,26 +10097,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_src_path" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_src_path" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_src_path="$cf_src_path"
+- case ".$cf_src_path" in
+- (.NONE/*)
++ case "x$cf_src_path" in
++ (xNONE/*)
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:10118: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:10117: 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; }; }
+ ;;
+@@ -10138,7 +10137,7 @@
+ ;;
+ esac
+
+- echo "$as_me:10141: result: $TERMPATH" >&5
++ echo "$as_me:10140: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -10146,7 +10145,7 @@
+ EOF
+
+ ### use option --enable-getcap to use a hacked getcap for reading termcaps
+- echo "$as_me:10149: checking if fast termcap-loader is needed" >&5
++ echo "$as_me:10148: 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.
+@@ -10156,14 +10155,14 @@
+ else
+ with_getcap=no
+ fi;
+- echo "$as_me:10159: result: $with_getcap" >&5
++ echo "$as_me:10158: 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:10166: checking if translated termcaps will be cached in ~/.terminfo" >&5
++ echo "$as_me:10165: 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.
+@@ -10173,7 +10172,7 @@
+ else
+ with_getcap_cache=no
+ fi;
+- echo "$as_me:10176: result: $with_getcap_cache" >&5
++ echo "$as_me:10175: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10183,7 +10182,7 @@
+ fi
+
+ ### Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10186: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10185: 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.
+@@ -10193,14 +10192,14 @@
+ else
+ with_home_terminfo=yes
+ fi;
+-echo "$as_me:10196: result: $with_home_terminfo" >&5
++echo "$as_me:10195: 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:10203: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10202: 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.
+@@ -10210,14 +10209,14 @@
+ else
+ with_root_environ=yes
+ fi;
+-echo "$as_me:10213: result: $with_root_environ" >&5
++echo "$as_me:10212: 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:10220: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10219: 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.
+@@ -10227,14 +10226,14 @@
+ else
+ with_root_access=yes
+ fi;
+-echo "$as_me:10230: result: $with_root_access" >&5
++echo "$as_me:10229: 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:10237: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10236: 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.
+@@ -10244,7 +10243,7 @@
+ else
+ with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10247: result: $with_setuid_environ" >&5
++echo "$as_me:10246: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10259,23 +10258,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10262: checking for $ac_header" >&5
++echo "$as_me:10261: 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 10268 "configure"
++#line 10267 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10272: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10271: \"$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:10278: \$? = $ac_status" >&5
++ echo "$as_me:10277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10294,7 +10293,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10296: 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
+@@ -10309,13 +10308,13 @@
+ unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10312: checking for $ac_func" >&5
++echo "$as_me:10311: 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 10318 "configure"
++#line 10317 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10346,16 +10345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10352: \$? = $ac_status" >&5
++ echo "$as_me:10351: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10355: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10354: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10358: \$? = $ac_status" >&5
++ echo "$as_me:10357: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10365,7 +10364,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10368: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10367: 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
+@@ -10382,13 +10381,13 @@
+ symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10385: checking for $ac_func" >&5
++echo "$as_me:10384: 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 10391 "configure"
++#line 10390 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10419,16 +10418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10425: \$? = $ac_status" >&5
++ echo "$as_me:10424: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10428: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10427: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10431: \$? = $ac_status" >&5
++ echo "$as_me:10430: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10438,7 +10437,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10441: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10440: 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
+@@ -10449,7 +10448,7 @@
+ done
+
+ else
+- echo "$as_me:10452: checking if link/symlink functions work" >&5
++ echo "$as_me:10451: 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
+@@ -10462,7 +10461,7 @@
+ eval 'ac_cv_func_'$cf_func'=error'
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10465 "configure"
++#line 10464 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10496,15 +10495,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10498: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10502: \$? = $ac_status" >&5
++ echo "$as_me:10501: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10503: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10507: \$? = $ac_status" >&5
++ echo "$as_me:10506: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10522,7 +10521,7 @@
+ test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+
+ fi
+-echo "$as_me:10525: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10524: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ test "$ac_cv_func_link" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10542,7 +10541,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:10545: checking if tic should use symbolic links" >&5
++ echo "$as_me:10544: 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.
+@@ -10552,21 +10551,21 @@
+ else
+ with_symlinks=no
+ fi;
+- echo "$as_me:10555: result: $with_symlinks" >&5
++ echo "$as_me:10554: 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:10562: checking if tic should use hard links" >&5
++ echo "$as_me:10561: 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:10569: result: $with_links" >&5
++ echo "$as_me:10568: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+
+@@ -10582,7 +10581,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:10585: checking if you want broken-linker support code" >&5
++echo "$as_me:10584: 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.
+@@ -10592,7 +10591,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:10595: result: $with_broken_linker" >&5
++echo "$as_me:10594: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -10606,7 +10605,7 @@
+ fi
+
+ ### use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10609: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10608: 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.
+@@ -10616,7 +10615,7 @@
+ else
+ with_bsdpad=no
+ fi;
+-echo "$as_me:10619: result: $with_bsdpad" >&5
++echo "$as_me:10618: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10635,14 +10634,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+
+-echo "$as_me:10638: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10637: 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 10645 "configure"
++#line 10644 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10661,16 +10660,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10667: \$? = $ac_status" >&5
++ echo "$as_me:10666: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10670: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10669: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10673: \$? = $ac_status" >&5
++ echo "$as_me:10672: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -10681,7 +10680,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10684: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10683: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10723,14 +10722,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:10726: checking if this is the GNU C library" >&5
++echo "$as_me:10725: 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 10733 "configure"
++#line 10732 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10749,16 +10748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10755: \$? = $ac_status" >&5
++ echo "$as_me:10754: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10758: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10757: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10761: \$? = $ac_status" >&5
++ echo "$as_me:10760: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -10769,7 +10768,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10772: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10771: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10777,7 +10776,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:10780: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:10779: 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
+@@ -10789,7 +10788,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10792 "configure"
++#line 10791 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10808,16 +10807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10814: \$? = $ac_status" >&5
++ echo "$as_me:10813: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10817: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10816: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10820: \$? = $ac_status" >&5
++ echo "$as_me:10819: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -10829,12 +10828,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:10832: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10831: 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:10837: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:10836: 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
+@@ -10939,7 +10938,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10942 "configure"
++#line 10941 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -10959,16 +10958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10965: \$? = $ac_status" >&5
++ echo "$as_me:10964: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10968: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10971: \$? = $ac_status" >&5
++ echo "$as_me:10970: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10979,7 +10978,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10982: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10981: 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
+@@ -10988,14 +10987,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:10991: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:10990: 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 10998 "configure"
++#line 10997 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11010,16 +11009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11016: \$? = $ac_status" >&5
++ echo "$as_me:11015: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11019: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11018: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11022: \$? = $ac_status" >&5
++ echo "$as_me:11021: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11126,7 +11125,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11129 "configure"
++#line 11128 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11141,16 +11140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11147: \$? = $ac_status" >&5
++ echo "$as_me:11146: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11150: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11153: \$? = $ac_status" >&5
++ echo "$as_me:11152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11165,12 +11164,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11168: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11167: 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:11173: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:11172: 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
+@@ -11180,7 +11179,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11183 "configure"
++#line 11182 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11195,16 +11194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11201: \$? = $ac_status" >&5
++ echo "$as_me:11200: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11204: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11203: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11207: \$? = $ac_status" >&5
++ echo "$as_me:11206: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -11215,7 +11214,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11218: result: $cf_cv_default_source" >&5
++echo "$as_me:11217: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -11252,16 +11251,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11255: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11254: 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}:11261: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11260: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11264 "configure"
++#line 11263 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11276,16 +11275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11282: \$? = $ac_status" >&5
++ echo "$as_me:11281: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11285: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11288: \$? = $ac_status" >&5
++ echo "$as_me:11287: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11306,7 +11305,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11309 "configure"
++#line 11308 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11321,16 +11320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11327: \$? = $ac_status" >&5
++ echo "$as_me:11326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11330: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11333: \$? = $ac_status" >&5
++ echo "$as_me:11332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11341,7 +11340,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11349,10 +11348,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11352: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11351: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11355 "configure"
++#line 11354 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11367,16 +11366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11369: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11373: \$? = $ac_status" >&5
++ echo "$as_me:11372: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11376: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11375: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11379: \$? = $ac_status" >&5
++ echo "$as_me:11378: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11392,7 +11391,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11395: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11394: 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
+@@ -11509,7 +11508,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:11512: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:11511: 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
+@@ -11541,14 +11540,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:11544: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11543: 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 11551 "configure"
++#line 11550 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11566,16 +11565,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11572: \$? = $ac_status" >&5
++ echo "$as_me:11571: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11575: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11574: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11578: \$? = $ac_status" >&5
++ echo "$as_me:11577: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11587,7 +11586,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11590 "configure"
++#line 11589 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11605,16 +11604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11607: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11611: \$? = $ac_status" >&5
++ echo "$as_me:11610: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11614: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11613: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11617: \$? = $ac_status" >&5
++ echo "$as_me:11616: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11629,7 +11628,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11632: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11631: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11789,16 +11788,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11792: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11791: 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}:11798: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11797: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11801 "configure"
++#line 11800 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11813,16 +11812,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11815: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11819: \$? = $ac_status" >&5
++ echo "$as_me:11818: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11822: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11821: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11825: \$? = $ac_status" >&5
++ echo "$as_me:11824: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11843,7 +11842,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11846 "configure"
++#line 11845 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11858,16 +11857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11864: \$? = $ac_status" >&5
++ echo "$as_me:11863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11867: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11870: \$? = $ac_status" >&5
++ echo "$as_me:11869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11878,7 +11877,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11886,10 +11885,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11889: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11888: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11892 "configure"
++#line 11891 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11904,16 +11903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11906: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11910: \$? = $ac_status" >&5
++ echo "$as_me:11909: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11913: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11912: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11916: \$? = $ac_status" >&5
++ echo "$as_me:11915: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11929,7 +11928,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11932: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11931: 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
+@@ -12042,10 +12041,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}:12045: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12044: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12048 "configure"
++#line 12047 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12063,23 +12062,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12065: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12069: \$? = $ac_status" >&5
++ echo "$as_me:12068: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12072: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12071: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12075: \$? = $ac_status" >&5
++ echo "$as_me:12074: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:12082: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:12081: 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
+@@ -12102,7 +12101,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}:12105: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12104: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -12114,7 +12113,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}:12117: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12116: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12202,7 +12201,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12204: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12212,7 +12211,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:12215: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12214: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12222,7 +12221,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}:12225: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12224: 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"
+@@ -12234,10 +12233,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:12237: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:12236: 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 12240 "configure"
++#line 12239 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12252,16 +12251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12254: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12258: \$? = $ac_status" >&5
++ echo "$as_me:12257: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12261: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12260: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12264: \$? = $ac_status" >&5
++ echo "$as_me:12263: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12270,12 +12269,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12273: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:12272: 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 12278 "configure"
++#line 12277 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12290,16 +12289,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12293: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12296: \$? = $ac_status" >&5
++ echo "$as_me:12295: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12299: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12298: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12302: \$? = $ac_status" >&5
++ echo "$as_me:12301: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12310,19 +12309,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:12313: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:12312: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:12318: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12317: 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 12325 "configure"
++#line 12324 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12340,16 +12339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12346: \$? = $ac_status" >&5
++ echo "$as_me:12345: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12349: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12348: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12352: \$? = $ac_status" >&5
++ echo "$as_me:12351: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12361,7 +12360,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12364 "configure"
++#line 12363 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12379,16 +12378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12385: \$? = $ac_status" >&5
++ echo "$as_me:12384: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12388: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12387: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12391: \$? = $ac_status" >&5
++ echo "$as_me:12390: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12403,7 +12402,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12406: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12405: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12554,14 +12553,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:12557: checking if SIGWINCH is defined" >&5
++echo "$as_me:12556: 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 12564 "configure"
++#line 12563 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -12576,23 +12575,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12582: \$? = $ac_status" >&5
++ echo "$as_me:12581: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12585: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12584: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12588: \$? = $ac_status" >&5
++ echo "$as_me:12587: \$? = $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 12595 "configure"
++#line 12594 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12610,16 +12609,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12612: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12616: \$? = $ac_status" >&5
++ echo "$as_me:12615: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12619: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12618: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12622: \$? = $ac_status" >&5
++ echo "$as_me:12621: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -12633,11 +12632,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12636: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12635: 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:12640: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12639: 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
+@@ -12648,7 +12647,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12651 "configure"
++#line 12650 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12670,16 +12669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12676: \$? = $ac_status" >&5
++ echo "$as_me:12675: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12679: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12682: \$? = $ac_status" >&5
++ echo "$as_me:12681: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -12693,7 +12692,7 @@
+ done
+
+ fi
+-echo "$as_me:12696: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12695: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12703,13 +12702,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:12706: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12705: 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 12712 "configure"
++#line 12711 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12723,16 +12722,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12729: \$? = $ac_status" >&5
++ echo "$as_me:12728: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12732: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12731: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12735: \$? = $ac_status" >&5
++ echo "$as_me:12734: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -12743,7 +12742,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12746: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12745: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -12757,7 +12756,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+
+-echo "$as_me:12760: checking if you want wide-character code" >&5
++echo "$as_me:12759: 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.
+@@ -12767,7 +12766,7 @@
+ else
+ with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12770: result: $with_widec" >&5
++echo "$as_me:12769: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12789,7 +12788,7 @@
+ (*_XOPEN_SOURCE=*)
+ ;;
+ (*)
+- { echo "$as_me:12792: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++ { echo "$as_me:12791: 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"
+@@ -12802,23 +12801,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12805: checking for $ac_header" >&5
++echo "$as_me:12804: 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 12811 "configure"
++#line 12810 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12815: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12814: \"$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:12821: \$? = $ac_status" >&5
++ echo "$as_me:12820: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12837,7 +12836,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12840: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12839: 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
+@@ -12847,14 +12846,14 @@
+ fi
+ done
+
+-echo "$as_me:12850: checking if wchar.h can be used as is" >&5
++echo "$as_me:12849: 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 12857 "configure"
++#line 12856 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12876,16 +12875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12882: \$? = $ac_status" >&5
++ echo "$as_me:12881: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12885: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12888: \$? = $ac_status" >&5
++ echo "$as_me:12887: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_h_okay=yes
+ else
+@@ -12895,16 +12894,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12898: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12897: 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:12904: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12903: 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 12907 "configure"
++#line 12906 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12920,16 +12919,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12926: \$? = $ac_status" >&5
++ echo "$as_me:12925: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12929: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12928: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12932: \$? = $ac_status" >&5
++ echo "$as_me:12931: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -12938,16 +12937,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12941: result: $cf_result" >&5
++echo "$as_me:12940: 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:12947: checking checking for compatible value versus " >&5
++ echo "$as_me:12946: 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 12950 "configure"
++#line 12949 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12963,16 +12962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12965: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12969: \$? = $ac_status" >&5
++ echo "$as_me:12968: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12972: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12971: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12975: \$? = $ac_status" >&5
++ echo "$as_me:12974: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -12981,7 +12980,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12984: result: $cf_result" >&5
++ echo "$as_me:12983: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = no ; then
+ # perhaps we can override it - try...
+@@ -12991,7 +12990,7 @@
+
+ fi
+
+-echo "$as_me:12994: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12993: 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
+@@ -13062,7 +13061,7 @@
+ cf_cv_wcwidth_graphics=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13065 "configure"
++#line 13064 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13107,15 +13106,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13113: \$? = $ac_status" >&5
++ echo "$as_me:13112: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:13115: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13114: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13118: \$? = $ac_status" >&5
++ echo "$as_me:13117: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wcwidth_graphics=yes
+ else
+@@ -13128,7 +13127,7 @@
+ fi
+
+ fi
+-echo "$as_me:13131: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13130: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+
+ test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13139,13 +13138,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:13142: checking for $ac_func" >&5
++echo "$as_me:13141: 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 13148 "configure"
++#line 13147 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13176,16 +13175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13179: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13182: \$? = $ac_status" >&5
++ echo "$as_me:13181: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13185: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13184: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13188: \$? = $ac_status" >&5
++ echo "$as_me:13187: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13195,7 +13194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13198: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13197: 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
+@@ -13210,23 +13209,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13213: checking for $ac_header" >&5
++echo "$as_me:13212: 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 13219 "configure"
++#line 13218 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13222: \"$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:13229: \$? = $ac_status" >&5
++ echo "$as_me:13228: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13245,7 +13244,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13247: 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
+@@ -13255,7 +13254,7 @@
+ fi
+ done
+
+-echo "$as_me:13258: checking for multibyte character support" >&5
++echo "$as_me:13257: 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
+@@ -13263,7 +13262,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13266 "configure"
++#line 13265 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13280,16 +13279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13282: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13286: \$? = $ac_status" >&5
++ echo "$as_me:13285: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13289: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13288: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13292: \$? = $ac_status" >&5
++ echo "$as_me:13291: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -13301,12 +13300,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:13304: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13309 "configure"
++#line 13308 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13319,16 +13318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13325: \$? = $ac_status" >&5
++ echo "$as_me:13324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13328: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13331: \$? = $ac_status" >&5
++ echo "$as_me:13330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13342,7 +13341,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13345 "configure"
++#line 13344 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13355,16 +13354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13358: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13361: \$? = $ac_status" >&5
++ echo "$as_me:13360: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13364: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13363: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13367: \$? = $ac_status" >&5
++ echo "$as_me:13366: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13381,9 +13380,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:13384: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13383: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:13386: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13474,7 +13473,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}:13477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -13482,7 +13481,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13485 "configure"
++#line 13484 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13495,21 +13494,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13498: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13501: \$? = $ac_status" >&5
++ echo "$as_me:13500: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13503: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13507: \$? = $ac_status" >&5
++ echo "$as_me:13506: \$? = $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}:13512: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13511: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13527,7 +13526,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:13530: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13529: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -13602,13 +13601,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}:13605: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13604: 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 13611 "configure"
++#line 13610 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13621,21 +13620,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13627: \$? = $ac_status" >&5
++ echo "$as_me:13626: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13630: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13629: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13633: \$? = $ac_status" >&5
++ echo "$as_me:13632: \$? = $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}:13638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13637: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -13677,7 +13676,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13680: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13679: 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
+@@ -13715,7 +13714,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13718 "configure"
++#line 13717 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13727,16 +13726,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13729: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13733: \$? = $ac_status" >&5
++ echo "$as_me:13732: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13736: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13735: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13739: \$? = $ac_status" >&5
++ echo "$as_me:13738: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13753,7 +13752,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}:13756: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13755: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -13789,7 +13788,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}:13792: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13791: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -13821,14 +13820,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13824: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13823: 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 13831 "configure"
++#line 13830 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13846,23 +13845,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13849: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13848: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13852: \$? = $ac_status" >&5
++ echo "$as_me:13851: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13855: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13854: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13858: \$? = $ac_status" >&5
++ echo "$as_me:13857: \$? = $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 13865 "configure"
++#line 13864 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13881,16 +13880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13883: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13887: \$? = $ac_status" >&5
++ echo "$as_me:13886: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13890: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13889: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13893: \$? = $ac_status" >&5
++ echo "$as_me:13892: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -13902,7 +13901,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13905: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13904: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13920,14 +13919,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13923: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13922: 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 13930 "configure"
++#line 13929 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13945,23 +13944,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13948: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13951: \$? = $ac_status" >&5
++ echo "$as_me:13950: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13954: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13953: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13957: \$? = $ac_status" >&5
++ echo "$as_me:13956: \$? = $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 13964 "configure"
++#line 13963 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13980,16 +13979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13986: \$? = $ac_status" >&5
++ echo "$as_me:13985: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13989: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13988: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13992: \$? = $ac_status" >&5
++ echo "$as_me:13991: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -14001,7 +14000,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14004: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14003: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14024,14 +14023,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14027: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14026: 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 14034 "configure"
++#line 14033 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14049,23 +14048,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14055: \$? = $ac_status" >&5
++ echo "$as_me:14054: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14058: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14057: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14061: \$? = $ac_status" >&5
++ echo "$as_me:14060: \$? = $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 14068 "configure"
++#line 14067 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14084,16 +14083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14090: \$? = $ac_status" >&5
++ echo "$as_me:14089: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14093: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14092: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14096: \$? = $ac_status" >&5
++ echo "$as_me:14095: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -14105,7 +14104,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14108: result: $cf_cv_wint_t" >&5
++echo "$as_me:14107: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14137,7 +14136,7 @@
+ fi
+
+ ### use option --disable-lp64 to allow long chtype
+-echo "$as_me:14140: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14139: 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.
+@@ -14147,7 +14146,7 @@
+ else
+ with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14150: result: $with_lp64" >&5
++echo "$as_me:14149: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+
+ if test "x$with_lp64" = xyes ; then
+@@ -14163,7 +14162,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14166: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:14165: 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
+@@ -14175,7 +14174,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 14178 "configure"
++#line 14177 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14195,16 +14194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14197: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14201: \$? = $ac_status" >&5
++ echo "$as_me:14200: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14204: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14203: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14207: \$? = $ac_status" >&5
++ echo "$as_me:14206: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14214,16 +14213,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14216: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14220: \$? = $ac_status" >&5
++ echo "$as_me:14219: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14223: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14222: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14226: \$? = $ac_status" >&5
++ echo "$as_me:14225: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14237,13 +14236,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:14240: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14239: 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:14246: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:14245: 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
+@@ -14251,7 +14250,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14254 "configure"
++#line 14253 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14271,16 +14270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14277: \$? = $ac_status" >&5
++ echo "$as_me:14276: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14279: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14283: \$? = $ac_status" >&5
++ echo "$as_me:14282: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14289,7 +14288,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14292 "configure"
++#line 14291 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -14310,16 +14309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14316: \$? = $ac_status" >&5
++ echo "$as_me:14315: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14319: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14318: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14322: \$? = $ac_status" >&5
++ echo "$as_me:14321: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14330,7 +14329,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14333: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14332: 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
+
+@@ -14340,7 +14339,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:14343: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:14342: 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
+@@ -14348,7 +14347,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14351 "configure"
++#line 14350 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14368,16 +14367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14374: \$? = $ac_status" >&5
++ echo "$as_me:14373: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14377: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14376: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14380: \$? = $ac_status" >&5
++ echo "$as_me:14379: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14386,7 +14385,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14389 "configure"
++#line 14388 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -14407,16 +14406,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14410: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14409: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14413: \$? = $ac_status" >&5
++ echo "$as_me:14412: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14416: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14415: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14419: \$? = $ac_status" >&5
++ echo "$as_me:14418: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -14427,7 +14426,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14430: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14429: 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
+
+@@ -14440,7 +14439,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:14443: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:14442: 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
+@@ -14448,7 +14447,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14451 "configure"
++#line 14450 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14463,16 +14462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14469: \$? = $ac_status" >&5
++ echo "$as_me:14468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14472: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14475: \$? = $ac_status" >&5
++ echo "$as_me:14474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14481,7 +14480,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14484 "configure"
++#line 14483 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -14497,16 +14496,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14503: \$? = $ac_status" >&5
++ echo "$as_me:14502: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14506: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14505: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14509: \$? = $ac_status" >&5
++ echo "$as_me:14508: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -14517,7 +14516,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14520: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14519: 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
+
+@@ -14531,13 +14530,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:14534: checking for fseeko" >&5
++echo "$as_me:14533: 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 14540 "configure"
++#line 14539 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14551,16 +14550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14557: \$? = $ac_status" >&5
++ echo "$as_me:14556: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14560: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14559: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14563: \$? = $ac_status" >&5
++ echo "$as_me:14562: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -14570,7 +14569,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14573: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14572: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -14609,14 +14608,14 @@
+
+ fi
+
+- echo "$as_me:14612: checking whether to use struct dirent64" >&5
++ echo "$as_me:14611: 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 14619 "configure"
++#line 14618 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14643,16 +14642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14645: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14649: \$? = $ac_status" >&5
++ echo "$as_me:14648: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14651: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14655: \$? = $ac_status" >&5
++ echo "$as_me:14654: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -14663,7 +14662,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14666: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14665: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14673,7 +14672,7 @@
+ fi
+
+ ### use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14676: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14675: 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.
+@@ -14683,14 +14682,14 @@
+ else
+ with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14686: result: $with_tparm_varargs" >&5
++echo "$as_me:14685: 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:14693: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14692: 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.
+@@ -14700,14 +14699,14 @@
+ else
+ with_tic_depends=yes
+ fi;
+-echo "$as_me:14703: result: $with_tic_depends" >&5
++echo "$as_me:14702: 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:14710: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14709: 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.
+@@ -14719,15 +14718,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ NCURSES_WATTR_MACROS=0
+- echo "$as_me:14722: result: no" >&5
++ echo "$as_me:14721: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ NCURSES_WATTR_MACROS=1
+- echo "$as_me:14726: result: yes" >&5
++ echo "$as_me:14725: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+
+-echo "$as_me:14730: checking for X11 rgb file" >&5
++echo "$as_me:14729: 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.
+@@ -14772,26 +14771,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_path" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_path" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_path="$cf_path"
+- case ".$cf_path" in
+- (.NONE/*)
++ case "x$cf_path" in
++ (xNONE/*)
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:14794: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14799,7 +14796,7 @@
+
+ fi
+
+-echo "$as_me:14802: result: $RGB_PATH" >&5
++echo "$as_me:14799: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -14814,7 +14811,7 @@
+
+ ### use option --with-bool to override bool's type
+
+-echo "$as_me:14817: checking for type of bool" >&5
++echo "$as_me:14814: 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.
+@@ -14824,17 +14821,17 @@
+ else
+ NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14827: result: $NCURSES_BOOL" >&5
++echo "$as_me:14824: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+- { { echo "$as_me:14831: error: expected a type name for bool" >&5
++ { { echo "$as_me:14828: 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:14837: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14834: 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.
+@@ -14846,16 +14843,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+- { echo "$as_me:14849: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++ { echo "$as_me:14846: 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:14853: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14850: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+
+ ### use option --with-chtype to override chtype's type
+
+-echo "$as_me:14858: checking for type of chtype" >&5
++echo "$as_me:14855: 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.
+@@ -14865,11 +14862,11 @@
+ else
+ NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14868: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+- { { echo "$as_me:14872: error: expected a type name for chtype" >&5
++ { { echo "$as_me:14869: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14877,7 +14874,7 @@
+
+ ### use option --with-ospeed to override ospeed's type
+
+-echo "$as_me:14880: checking for type of ospeed" >&5
++echo "$as_me:14877: 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.
+@@ -14887,11 +14884,11 @@
+ else
+ NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14890: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+- { { echo "$as_me:14894: error: expected a type name for ospeed" >&5
++ { { echo "$as_me:14891: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14899,7 +14896,7 @@
+
+ ### use option --with-mmask-t to override mmask_t's type
+
+-echo "$as_me:14902: checking for type of mmask-t" >&5
++echo "$as_me:14899: 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.
+@@ -14909,18 +14906,18 @@
+ else
+ NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14912: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+- { { echo "$as_me:14916: error: expected a type name for mmask-t" >&5
++ { { echo "$as_me:14913: 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:14923: checking for size CCHARW_MAX" >&5
++echo "$as_me:14920: 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.
+@@ -14930,16 +14927,16 @@
+ else
+ NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14933: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+
+-echo "$as_me:14936: checking for signed char" >&5
++echo "$as_me:14933: 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 14942 "configure"
++#line 14939 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14954,16 +14951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14960: \$? = $ac_status" >&5
++ echo "$as_me:14957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14963: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14960: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14966: \$? = $ac_status" >&5
++ echo "$as_me:14963: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -14973,10 +14970,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14976: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:14979: checking size of signed char" >&5
++echo "$as_me:14976: 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
+@@ -14985,7 +14982,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14988 "configure"
++#line 14985 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14997,21 +14994,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15003: \$? = $ac_status" >&5
++ echo "$as_me:15000: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15006: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15009: \$? = $ac_status" >&5
++ echo "$as_me:15006: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15014 "configure"
++#line 15011 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15023,16 +15020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15029: \$? = $ac_status" >&5
++ echo "$as_me:15026: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15032: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15029: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15035: \$? = $ac_status" >&5
++ echo "$as_me:15032: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -15048,7 +15045,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15051 "configure"
++#line 15048 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15060,16 +15057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15066: \$? = $ac_status" >&5
++ echo "$as_me:15063: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15069: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15072: \$? = $ac_status" >&5
++ echo "$as_me:15069: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -15085,7 +15082,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 15088 "configure"
++#line 15085 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15097,16 +15094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15103: \$? = $ac_status" >&5
++ echo "$as_me:15100: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15106: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15109: \$? = $ac_status" >&5
++ echo "$as_me:15106: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -15119,12 +15116,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:15122: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:15119: 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 15127 "configure"
++#line 15124 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15140,15 +15137,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15146: \$? = $ac_status" >&5
++ echo "$as_me:15143: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:15148: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15145: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15151: \$? = $ac_status" >&5
++ echo "$as_me:15148: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15164,7 +15161,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15167: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15164: 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
+@@ -15175,7 +15172,7 @@
+ else
+ NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:15178: checking whether to use signed chars for Boolean array in term.h" >&5
++echo "$as_me:15175: 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.
+@@ -15185,13 +15182,13 @@
+ else
+ with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15188: result: $with_signed_char" >&5
++echo "$as_me:15185: 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:15194: checking for type of tparm-arg" >&5
++echo "$as_me:15191: 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.
+@@ -15201,18 +15198,18 @@
+ else
+ NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15204: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+- { { echo "$as_me:15208: error: expected a type name for tparm-arg" >&5
++ { { echo "$as_me:15205: 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:15215: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15212: 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.
+@@ -15222,7 +15219,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15225: result: $with_rcs_ids" >&5
++echo "$as_me:15222: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15231,7 +15228,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:15234: checking format of man-pages" >&5
++echo "$as_me:15231: 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.
+@@ -15322,10 +15319,10 @@
+ ;;
+ esac
+
+-echo "$as_me:15325: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+- { echo "$as_me:15328: WARNING: Unexpected manpage-format $cf_unknown" >&5
++ { echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+
+@@ -15366,7 +15363,7 @@
+ esac
+ done
+
+-echo "$as_me:15369: checking for manpage renaming" >&5
++echo "$as_me:15366: 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.
+@@ -15395,15 +15392,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ :
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+- { { echo "$as_me:15398: error: not a filename: $MANPAGE_RENAMES" >&5
++ { { echo "$as_me:15395: 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:15403: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+
+-echo "$as_me:15406: checking if manpage aliases will be installed" >&5
++echo "$as_me:15403: 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.
+@@ -15414,7 +15411,7 @@
+ MANPAGE_ALIASES=yes
+ fi;
+
+-echo "$as_me:15417: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+
+ case "x$LN_S" in
+@@ -15428,7 +15425,7 @@
+
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15431: checking if manpage symlinks should be used" >&5
++echo "$as_me:15428: 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.
+@@ -15441,17 +15438,17 @@
+
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+- { echo "$as_me:15444: WARNING: cannot make symlinks" >&5
++ { echo "$as_me:15441: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ MANPAGE_SYMLINKS=no
+ fi
+ fi
+
+-echo "$as_me:15450: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+
+-echo "$as_me:15454: checking for manpage tbl" >&5
++echo "$as_me:15451: 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.
+@@ -15462,7 +15459,7 @@
+ MANPAGE_TBL=no
+ fi;
+
+-echo "$as_me:15465: result: $MANPAGE_TBL" >&5
++echo "$as_me:15462: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+
+ if test "$prefix" = "NONE" ; then
+@@ -15780,7 +15777,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15783: checking if you want to build with function extensions" >&5
++echo "$as_me:15780: 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.
+@@ -15790,7 +15787,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15793: result: $with_ext_funcs" >&5
++echo "$as_me:15790: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15847,7 +15844,7 @@
+ GENERATED_EXT_FUNCS=
+ fi
+
+-echo "$as_me:15850: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15847: 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.
+@@ -15857,7 +15854,7 @@
+ else
+ with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15860: result: $with_sp_funcs" >&5
++echo "$as_me:15857: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ NCURSES_SP_FUNCS=1
+@@ -15876,7 +15873,7 @@
+ GENERATED_SP_FUNCS=
+ fi
+
+-echo "$as_me:15879: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15876: 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.
+@@ -15886,7 +15883,7 @@
+ else
+ with_term_driver=no
+ fi;
+-echo "$as_me:15889: result: $with_term_driver" >&5
++echo "$as_me:15886: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+
+@@ -15895,19 +15892,19 @@
+ EOF
+
+ if test "x$with_termlib" != xno ; then
+- { { echo "$as_me:15898: error: The term-driver option conflicts with the termlib option" >&5
++ { { echo "$as_me:15895: 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:15903: error: The term-driver option relies upon sp-funcs" >&5
++ { { echo "$as_me:15900: 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:15910: checking for extended use of const keyword" >&5
++echo "$as_me:15907: 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.
+@@ -15917,7 +15914,7 @@
+ else
+ with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15920: result: $with_ext_const" >&5
++echo "$as_me:15917: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15925,7 +15922,7 @@
+ fi
+
+ ### use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15928: checking if you want to use extended colors" >&5
++echo "$as_me:15925: 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.
+@@ -15935,12 +15932,12 @@
+ else
+ with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15938: result: $with_ext_colors" >&5
++echo "$as_me:15935: 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:15943: WARNING: This option applies only to wide-character library" >&5
++ { echo "$as_me:15940: 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)
+@@ -15951,7 +15948,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:15954: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -15979,7 +15976,7 @@
+ fi
+
+ ### use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15982: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15979: 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.
+@@ -15989,7 +15986,7 @@
+ else
+ with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15992: result: $with_ext_mouse" >&5
++echo "$as_me:15989: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+
+@@ -15999,7 +15996,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:16002: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16016,7 +16013,7 @@
+ fi
+
+ ### use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16019: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16016: 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.
+@@ -16026,7 +16023,7 @@
+ else
+ with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16029: result: $with_ext_putwin" >&5
++echo "$as_me:16026: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+
+@@ -16036,7 +16033,7 @@
+
+ fi
+
+-echo "$as_me:16039: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16036: 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.
+@@ -16046,7 +16043,7 @@
+ else
+ with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16049: result: $with_no_padding" >&5
++echo "$as_me:16046: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16054,7 +16051,7 @@
+ EOF
+
+ ### use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16057: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16054: 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.
+@@ -16064,7 +16061,7 @@
+ else
+ with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16067: result: $with_sigwinch" >&5
++echo "$as_me:16064: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16079,7 +16076,7 @@
+ fi
+
+ ### use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16082: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16079: 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.
+@@ -16089,7 +16086,7 @@
+ else
+ with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16092: result: $with_tcap_names" >&5
++echo "$as_me:16089: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16103,7 +16100,7 @@
+
+ ##############################################################################
+
+-echo "$as_me:16106: checking if you want to link with the pthread library" >&5
++echo "$as_me:16103: 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.
+@@ -16113,27 +16110,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:16116: result: $with_pthread" >&5
++echo "$as_me:16113: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:16120: checking for pthread.h" >&5
++ echo "$as_me:16117: 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 16126 "configure"
++#line 16123 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:16130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16127: \"$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:16136: \$? = $ac_status" >&5
++ echo "$as_me:16133: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16152,7 +16149,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16155: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16152: 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
+
+@@ -16162,7 +16159,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:16165: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:16162: 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"
+
+@@ -16183,7 +16180,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16186 "configure"
++#line 16183 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -16200,16 +16197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16206: \$? = $ac_status" >&5
++ echo "$as_me:16203: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16209: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16206: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16212: \$? = $ac_status" >&5
++ echo "$as_me:16209: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -16219,7 +16216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:16222: result: $with_pthread" >&5
++ echo "$as_me:16219: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -16247,7 +16244,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:16250: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -16257,13 +16254,13 @@
+ fi
+
+ if test "x$with_pthread" != xno; then
+- echo "$as_me:16260: checking for pthread_kill" >&5
++ echo "$as_me:16257: 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 16266 "configure"
++#line 16263 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16294,16 +16291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16300: \$? = $ac_status" >&5
++ echo "$as_me:16297: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16303: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16300: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16306: \$? = $ac_status" >&5
++ echo "$as_me:16303: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_pthread_kill=yes
+ else
+@@ -16313,11 +16310,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16316: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16313: 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:16320: checking if you want to allow EINTR in wgetch with pthreads" >&5
++ echo "$as_me:16317: 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.
+@@ -16327,7 +16324,7 @@
+ else
+ use_pthreads_eintr=no
+ fi;
+- echo "$as_me:16330: result: $use_pthreads_eintr" >&5
++ echo "$as_me:16327: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ if test "x$use_pthreads_eintr" = xyes ; then
+
+@@ -16338,7 +16335,7 @@
+ fi
+ fi
+
+- echo "$as_me:16341: checking if you want to use weak-symbols for pthreads" >&5
++ echo "$as_me:16338: 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.
+@@ -16348,18 +16345,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+- echo "$as_me:16351: result: $use_weak_symbols" >&5
++ echo "$as_me:16348: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "x$use_weak_symbols" = xyes ; then
+
+-echo "$as_me:16355: checking if $CC supports weak symbols" >&5
++echo "$as_me:16352: 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 16362 "configure"
++#line 16359 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16385,16 +16382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16391: \$? = $ac_status" >&5
++ echo "$as_me:16388: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16394: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16391: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16397: \$? = $ac_status" >&5
++ echo "$as_me:16394: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -16405,7 +16402,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16408: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -16455,7 +16452,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:16458: checking if you want reentrant code" >&5
++echo "$as_me:16455: 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.
+@@ -16465,7 +16462,7 @@
+ else
+ with_reentrant=no
+ fi;
+-echo "$as_me:16468: result: $with_reentrant" >&5
++echo "$as_me:16465: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ cf_cv_enable_reentrant=1
+@@ -16554,7 +16551,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:16557: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16566,7 +16563,7 @@
+ NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+
+-echo "$as_me:16569: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16566: 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.
+@@ -16588,16 +16585,16 @@
+ test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16591: result: $enable_opaque_curses" >&5
++echo "$as_me:16588: 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:16596: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16593: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:16600: checking whether form library structures should be opaque" >&5
++echo "$as_me:16597: 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.
+@@ -16614,10 +16611,10 @@
+ enable_opaque_form=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16617: result: $enable_opaque_form" >&5
++echo "$as_me:16614: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+
+-echo "$as_me:16620: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16617: 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.
+@@ -16634,10 +16631,10 @@
+ enable_opaque_menu=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16637: result: $enable_opaque_menu" >&5
++echo "$as_me:16634: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+
+-echo "$as_me:16640: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16637: 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.
+@@ -16654,7 +16651,7 @@
+ enable_opaque_panel=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16657: result: $enable_opaque_panel" >&5
++echo "$as_me:16654: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+
+ NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16664,7 +16661,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:16667: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:16664: 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.
+@@ -16674,7 +16671,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:16677: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -16687,7 +16684,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:16690: checking if you want all development code" >&5
++echo "$as_me:16687: 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.
+@@ -16697,11 +16694,11 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:16700: result: $with_develop" >&5
++echo "$as_me:16697: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ### use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16704: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16701: 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.
+@@ -16711,7 +16708,7 @@
+ else
+ enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16714: result: $enable_check_size" >&5
++echo "$as_me:16711: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16719,7 +16716,7 @@
+ EOF
+
+ ### use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16722: checking if you want hard-tabs code" >&5
++echo "$as_me:16719: 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.
+@@ -16729,7 +16726,7 @@
+ else
+ enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16732: result: $enable_hard_tabs" >&5
++echo "$as_me:16729: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16737,7 +16734,7 @@
+ EOF
+
+ ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16740: checking if you want limited support for xmc" >&5
++echo "$as_me:16737: 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.
+@@ -16747,7 +16744,7 @@
+ else
+ enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16750: result: $enable_xmc_glitch" >&5
++echo "$as_me:16747: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16757,7 +16754,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+
+-echo "$as_me:16760: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16757: 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.
+@@ -16767,7 +16764,7 @@
+ else
+ with_assumed_color=yes
+ fi;
+-echo "$as_me:16770: result: $with_assumed_color" >&5
++echo "$as_me:16767: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16775,7 +16772,7 @@
+ EOF
+
+ ### use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16778: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16775: 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.
+@@ -16785,7 +16782,7 @@
+ else
+ with_hashmap=yes
+ fi;
+-echo "$as_me:16788: result: $with_hashmap" >&5
++echo "$as_me:16785: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16793,7 +16790,7 @@
+ EOF
+
+ ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16796: checking if you want colorfgbg code" >&5
++echo "$as_me:16793: 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.
+@@ -16803,7 +16800,7 @@
+ else
+ with_colorfgbg=no
+ fi;
+-echo "$as_me:16806: result: $with_colorfgbg" >&5
++echo "$as_me:16803: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16811,7 +16808,7 @@
+ EOF
+
+ ### use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16814: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16811: 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.
+@@ -16821,14 +16818,14 @@
+ else
+ cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16824: result: $cf_with_fvisibility" >&5
++echo "$as_me:16821: 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:16831: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16828: 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
+@@ -16837,7 +16834,7 @@
+ cf_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16840 "configure"
++#line 16837 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16853,16 +16850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16859: \$? = $ac_status" >&5
++ echo "$as_me:16856: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16862: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16865: \$? = $ac_status" >&5
++ echo "$as_me:16862: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden=yes
+ else
+@@ -16874,7 +16871,7 @@
+ CFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:16877: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+
+ if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16989,7 +16986,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:16992: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16989: 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
+@@ -16998,7 +16995,7 @@
+ cf_save_cflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17001 "configure"
++#line 16998 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17014,16 +17011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17020: \$? = $ac_status" >&5
++ echo "$as_me:17017: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17023: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17020: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17026: \$? = $ac_status" >&5
++ echo "$as_me:17023: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17035,7 +17032,7 @@
+ CXXFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:17038: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+
+ if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17158,7 +17155,7 @@
+ fi
+
+ ### use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17161: checking if you want interop bindings" >&5
++echo "$as_me:17158: 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.
+@@ -17168,13 +17165,13 @@
+ else
+ with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17171: result: $with_exp_interop" >&5
++echo "$as_me:17168: 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:17177: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17174: 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.
+@@ -17184,13 +17181,13 @@
+ else
+ with_safe_sprintf=no
+ fi;
+-echo "$as_me:17187: result: $with_safe_sprintf" >&5
++echo "$as_me:17184: 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:17193: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17190: 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.
+@@ -17200,7 +17197,7 @@
+ else
+ with_scroll_hints=yes
+ fi;
+-echo "$as_me:17203: result: $with_scroll_hints" >&5
++echo "$as_me:17200: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17209,7 +17206,7 @@
+
+ fi
+
+-echo "$as_me:17212: checking if you want wgetch-events code" >&5
++echo "$as_me:17209: 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.
+@@ -17219,7 +17216,7 @@
+ else
+ with_wgetch_events=no
+ fi;
+-echo "$as_me:17222: result: $with_wgetch_events" >&5
++echo "$as_me:17219: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+
+@@ -17234,7 +17231,7 @@
+
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+- echo "$as_me:17237: checking if you want experimental-Windows driver" >&5
++ echo "$as_me:17234: 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.
+@@ -17244,7 +17241,7 @@
+ else
+ with_exp_win32=no
+ fi;
+- echo "$as_me:17247: result: $with_exp_win32" >&5
++ echo "$as_me:17244: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ if test "x$with_exp_win32" = xyes
+ then
+@@ -17270,7 +17267,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:17273: checking if you want to see long compiling messages" >&5
++echo "$as_me:17270: 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.
+@@ -17304,7 +17301,7 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:17307: result: $enableval" >&5
++echo "$as_me:17304: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ if test "x$enable_echo" = xyes; then
+@@ -17317,7 +17314,7 @@
+
+ # --disable-stripping is used for debugging
+
+-echo "$as_me:17320: checking if you want to install stripped executables" >&5
++echo "$as_me:17317: 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.
+@@ -17334,7 +17331,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:17337: result: $enable_stripping" >&5
++echo "$as_me:17334: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -17345,7 +17342,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:17348: checking if install accepts -p option" >&5
++echo "$as_me:17345: 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
+@@ -17376,10 +17373,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:17379: result: $cf_cv_install_p" >&5
++echo "$as_me:17376: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:17382: checking if install needs to be told about ownership" >&5
++echo "$as_me:17379: 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)
+@@ -17390,7 +17387,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17393: result: $with_install_o" >&5
++echo "$as_me:17390: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17401,7 +17398,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:17404: checking if you want to specify strip-program" >&5
++ echo "$as_me:17401: 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.
+@@ -17411,11 +17408,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:17414: result: $with_strip_program" >&5
++ echo "$as_me:17411: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:17418: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:17415: 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
+@@ -17436,11 +17433,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:17439: result: $check_install_strip" >&5
++ echo "$as_me:17436: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:17443: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:17440: 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
+ ;;
+@@ -17455,7 +17452,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:17458: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -17481,7 +17478,7 @@
+
+ ### use option --enable-warnings to turn on all gcc warnings
+
+-echo "$as_me:17484: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17481: 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.
+@@ -17498,17 +17495,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:17501: result: $enable_stdnoreturn" >&5
++echo "$as_me:17498: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17505: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17502: 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 17511 "configure"
++#line 17508 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17524,16 +17521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17530: \$? = $ac_status" >&5
++ echo "$as_me:17527: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17533: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17530: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17536: \$? = $ac_status" >&5
++ echo "$as_me:17533: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -17544,7 +17541,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17547: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -17600,16 +17597,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17603: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17608: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17612: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17648,16 +17645,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17651: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17656: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17660: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17696,23 +17693,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17699: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17704: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17708: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:17715: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17712: 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.
+@@ -17729,7 +17726,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:17732: result: $enable_warnings" >&5
++echo "$as_me:17729: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17753,7 +17750,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17756 "configure"
++#line 17753 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17768,26 +17765,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17774: \$? = $ac_status" >&5
++ echo "$as_me:17771: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17774: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17780: \$? = $ac_status" >&5
++ echo "$as_me:17777: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:17783: checking for X11/Xt const-feature" >&5
++echo "$as_me:17780: 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 17790 "configure"
++#line 17787 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -17805,16 +17802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17808: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17811: \$? = $ac_status" >&5
++ echo "$as_me:17808: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17814: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17811: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17817: \$? = $ac_status" >&5
++ echo "$as_me:17814: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -17829,7 +17826,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17832: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17858,7 +17855,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17861 "${as_me:-configure}"
++#line 17858 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -17874,7 +17871,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:17877: checking for $CC warning options..." >&5
++ { echo "$as_me:17874: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17890,12 +17887,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17896: \$? = $ac_status" >&5
++ echo "$as_me:17893: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17898: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -17903,7 +17900,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:17906: checking for $CC warning options..." >&5
++ { echo "$as_me:17903: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -17926,12 +17923,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:17929: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17932: \$? = $ac_status" >&5
++ echo "$as_me:17929: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -17939,7 +17936,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17942: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17949,7 +17946,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17952: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17982,10 +17979,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:17985: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17988 "${as_me:-configure}"
++#line 17985 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18035,12 +18032,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18041: \$? = $ac_status" >&5
++ echo "$as_me:18038: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18043: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -18112,12 +18109,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:18115: checking if this is really Intel C++ compiler" >&5
++ echo "$as_me:18112: 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 18120 "configure"
++#line 18117 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18134,16 +18131,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18140: \$? = $ac_status" >&5
++ echo "$as_me:18137: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18143: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18146: \$? = $ac_status" >&5
++ echo "$as_me:18143: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18154,7 +18151,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:18157: result: $INTEL_CPLUSPLUS" >&5
++ echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ ;;
+ esac
+@@ -18163,11 +18160,11 @@
+ CLANG_CPLUSPLUS=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:18166: checking if this is really Clang C++ compiler" >&5
++ echo "$as_me:18163: 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 18170 "configure"
++#line 18167 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18184,16 +18181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18190: \$? = $ac_status" >&5
++ echo "$as_me:18187: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18193: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18190: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18196: \$? = $ac_status" >&5
++ echo "$as_me:18193: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_CPLUSPLUS=yes
+
+@@ -18203,7 +18200,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:18206: result: $CLANG_CPLUSPLUS" >&5
++ echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+
+@@ -18212,30 +18209,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:18215: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:18212: 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:18222: checking version of $CC" >&5
++ echo "$as_me:18219: 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:18226: result: $CLANG_VERSION" >&5
++ echo "$as_me:18223: 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:18233: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:18230: 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 18238 "configure"
++#line 18235 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -18249,16 +18246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18255: \$? = $ac_status" >&5
++ echo "$as_me:18252: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18258: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18255: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18261: \$? = $ac_status" >&5
++ echo "$as_me:18258: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -18269,13 +18266,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18272: result: $cf_clang_optok" >&5
++ echo "$as_me:18269: 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}:18278: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18292,7 +18289,7 @@
+ ac_main_return="return"
+
+ cat > conftest.$ac_ext <<EOF
+-#line 18295 "configure"
++#line 18292 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -18310,7 +18307,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+
+- { echo "$as_me:18313: checking for $CC warning options..." >&5
++ { echo "$as_me:18310: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-Wall"
+@@ -18327,12 +18324,12 @@
+ wd981
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+- if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18333: \$? = $ac_status" >&5
++ echo "$as_me:18330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18335: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ fi
+@@ -18341,7 +18338,7 @@
+
+ elif test "$GXX" = yes
+ then
+- { echo "$as_me:18344: checking for $CXX warning options..." >&5
++ { echo "$as_me:18341: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-W -Wall"
+@@ -18371,16 +18368,16 @@
+ Wundef $cf_gxx_extra_warnings Wno-unused
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+- if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18377: \$? = $ac_status" >&5
++ echo "$as_me:18374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18379: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ else
+- test -n "$verbose" && echo "$as_me:18383: result: ... no -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ fi
+ done
+@@ -18398,7 +18395,7 @@
+ fi
+ fi
+
+-echo "$as_me:18401: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18398: 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.
+@@ -18408,7 +18405,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:18411: result: $enable_string_hacks" >&5
++echo "$as_me:18408: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18417,15 +18414,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:18420: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:18417: 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:18422: checking for strlcat" >&5
++ echo "$as_me:18419: 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 18428 "configure"
++#line 18425 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18456,16 +18453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18462: \$? = $ac_status" >&5
++ echo "$as_me:18459: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18465: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18462: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18468: \$? = $ac_status" >&5
++ echo "$as_me:18465: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -18475,7 +18472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18478: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -18485,7 +18482,7 @@
+
+ else
+
+- echo "$as_me:18488: checking for strlcat in -lbsd" >&5
++ echo "$as_me:18485: 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
+@@ -18493,7 +18490,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18496 "configure"
++#line 18493 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18512,16 +18509,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18518: \$? = $ac_status" >&5
++ echo "$as_me:18515: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18521: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18518: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18524: \$? = $ac_status" >&5
++ echo "$as_me:18521: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18532,7 +18529,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18535: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18532: 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
+
+@@ -18555,23 +18552,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18558: checking for $ac_header" >&5
++echo "$as_me:18555: 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 18564 "configure"
++#line 18561 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18565: \"$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:18574: \$? = $ac_status" >&5
++ echo "$as_me:18571: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18590,7 +18587,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18593: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18590: 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
+@@ -18611,13 +18608,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18614: checking for $ac_func" >&5
++echo "$as_me:18611: 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 18620 "configure"
++#line 18617 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18648,16 +18645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18654: \$? = $ac_status" >&5
++ echo "$as_me:18651: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18657: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18654: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18660: \$? = $ac_status" >&5
++ echo "$as_me:18657: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -18667,7 +18664,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18670: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18667: 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
+@@ -18680,7 +18677,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:18683: checking if you want to enable runtime assertions" >&5
++echo "$as_me:18680: 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.
+@@ -18690,7 +18687,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:18693: result: $with_assertions" >&5
++echo "$as_me:18690: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18706,7 +18703,7 @@
+
+ ### use option --disable-leaks to suppress "permanent" leaks, for testing
+
+-echo "$as_me:18709: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18706: 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.
+@@ -18728,7 +18725,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:18731: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -18842,23 +18839,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:18845: checking for dmalloc.h" >&5
++ echo "$as_me:18842: 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 18851 "configure"
++#line 18848 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18855: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18852: \"$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:18861: \$? = $ac_status" >&5
++ echo "$as_me:18858: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18877,11 +18874,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18880: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18877: 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:18884: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18881: 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
+@@ -18889,7 +18886,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18892 "configure"
++#line 18889 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18908,16 +18905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18914: \$? = $ac_status" >&5
++ echo "$as_me:18911: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18917: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18920: \$? = $ac_status" >&5
++ echo "$as_me:18917: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18928,7 +18925,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18931: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18928: 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
+@@ -18943,7 +18940,7 @@
+
+ fi
+
+-echo "$as_me:18946: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18943: 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.
+@@ -18965,7 +18962,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:18968: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19079,23 +19076,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:19082: checking for dbmalloc.h" >&5
++ echo "$as_me:19079: 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 19088 "configure"
++#line 19085 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:19092: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19089: \"$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:19098: \$? = $ac_status" >&5
++ echo "$as_me:19095: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19114,11 +19111,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19117: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19114: 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:19121: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19118: 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
+@@ -19126,7 +19123,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19129 "configure"
++#line 19126 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19145,16 +19142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19151: \$? = $ac_status" >&5
++ echo "$as_me:19148: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19154: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19157: \$? = $ac_status" >&5
++ echo "$as_me:19154: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19165,7 +19162,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19168: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19165: 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
+@@ -19180,7 +19177,7 @@
+
+ fi
+
+-echo "$as_me:19183: checking if you want to use valgrind for testing" >&5
++echo "$as_me:19180: 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.
+@@ -19202,7 +19199,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:19205: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19315,7 +19312,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19318: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19315: 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.
+@@ -19326,7 +19323,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:19329: result: $with_no_leaks" >&5
++echo "$as_me:19326: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -19378,7 +19375,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19381: checking whether to add trace feature to all models" >&5
++echo "$as_me:19378: 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.
+@@ -19388,7 +19385,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19391: result: $cf_with_trace" >&5
++echo "$as_me:19388: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19408,7 +19405,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:19411: checking if we want to use GNAT projects" >&5
++echo "$as_me:19408: 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.
+@@ -19425,7 +19422,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:19428: result: $enable_gnat_projects" >&5
++echo "$as_me:19425: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -19438,14 +19435,14 @@
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ fi
+
+-echo "$as_me:19441: checking if ssp library is needed" >&5
++echo "$as_me:19438: 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 19448 "configure"
++#line 19445 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19462,16 +19459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19468: \$? = $ac_status" >&5
++ echo "$as_me:19465: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19474: \$? = $ac_status" >&5
++ echo "$as_me:19471: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -19481,7 +19478,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19484 "configure"
++#line 19481 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19498,16 +19495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19504: \$? = $ac_status" >&5
++ echo "$as_me:19501: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19507: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19510: \$? = $ac_status" >&5
++ echo "$as_me:19507: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -19521,7 +19518,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19524: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19550,14 +19547,14 @@
+ ;;
+ esac
+
+-echo "$as_me:19553: checking if -lm needed for math functions" >&5
++echo "$as_me:19550: 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 19560 "configure"
++#line 19557 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19573,16 +19570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19579: \$? = $ac_status" >&5
++ echo "$as_me:19576: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19582: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19579: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19585: \$? = $ac_status" >&5
++ echo "$as_me:19582: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -19592,7 +19589,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19595: result: $cf_cv_need_libm" >&5
++echo "$as_me:19592: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -19600,14 +19597,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:19603: checking if -lm is available for math functions" >&5
++ echo "$as_me:19600: 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 19610 "configure"
++#line 19607 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19623,16 +19620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19629: \$? = $ac_status" >&5
++ echo "$as_me:19626: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19632: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19629: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19635: \$? = $ac_status" >&5
++ echo "$as_me:19632: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -19642,7 +19639,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19645: result: $cf_cv_have_libm" >&5
++echo "$as_me:19642: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -19664,13 +19661,13 @@
+ fi
+
+ ### Checks for header files.
+-echo "$as_me:19667: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19664: 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 19673 "configure"
++#line 19670 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19686,16 +19683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19692: \$? = $ac_status" >&5
++ echo "$as_me:19689: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19695: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19692: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19698: \$? = $ac_status" >&5
++ echo "$as_me:19695: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -19705,7 +19702,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19708: result: $ac_cv_header_time" >&5
++echo "$as_me:19705: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -19720,7 +19717,7 @@
+ case "$host_os" in
+ (mingw*)
+ # -lsystre -ltre -lintl -liconv
+- echo "$as_me:19723: checking for regcomp in -lsystre" >&5
++ echo "$as_me:19720: 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
+@@ -19728,7 +19725,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19731 "configure"
++#line 19728 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19747,16 +19744,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19753: \$? = $ac_status" >&5
++ echo "$as_me:19750: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19756: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19753: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19759: \$? = $ac_status" >&5
++ echo "$as_me:19756: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19767,11 +19764,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19770: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19767: 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:19774: checking for libiconv_open in -liconv" >&5
++ echo "$as_me:19771: 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
+@@ -19779,7 +19776,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19782 "configure"
++#line 19779 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19798,16 +19795,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19804: \$? = $ac_status" >&5
++ echo "$as_me:19801: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19807: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19804: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19810: \$? = $ac_status" >&5
++ echo "$as_me:19807: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19818,7 +19815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19821: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19818: 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
+
+@@ -19840,7 +19837,7 @@
+
+ fi
+
+- echo "$as_me:19843: checking for libintl_gettext in -lintl" >&5
++ echo "$as_me:19840: 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
+@@ -19848,7 +19845,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19851 "configure"
++#line 19848 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19867,16 +19864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19873: \$? = $ac_status" >&5
++ echo "$as_me:19870: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19876: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19873: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19879: \$? = $ac_status" >&5
++ echo "$as_me:19876: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19887,7 +19884,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19890: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19887: 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
+
+@@ -19909,7 +19906,7 @@
+
+ fi
+
+- echo "$as_me:19912: checking for tre_regcomp in -ltre" >&5
++ echo "$as_me:19909: 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
+@@ -19917,7 +19914,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19920 "configure"
++#line 19917 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19936,16 +19933,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19942: \$? = $ac_status" >&5
++ echo "$as_me:19939: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19945: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19942: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19948: \$? = $ac_status" >&5
++ echo "$as_me:19945: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19956,7 +19953,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19959: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19956: 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
+
+@@ -19998,7 +19995,7 @@
+
+ else
+
+- echo "$as_me:20001: checking for regcomp in -lgnurx" >&5
++ echo "$as_me:19998: 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
+@@ -20006,7 +20003,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20009 "configure"
++#line 20006 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20025,16 +20022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20031: \$? = $ac_status" >&5
++ echo "$as_me:20028: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20034: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20031: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20037: \$? = $ac_status" >&5
++ echo "$as_me:20034: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20045,7 +20042,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20048: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20045: 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
+
+@@ -20073,13 +20070,13 @@
+ ;;
+ (*)
+ cf_regex_libs="regex re"
+- echo "$as_me:20076: checking for regcomp" >&5
++ echo "$as_me:20073: 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 20082 "configure"
++#line 20079 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20110,16 +20107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20116: \$? = $ac_status" >&5
++ echo "$as_me:20113: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20119: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20116: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20122: \$? = $ac_status" >&5
++ echo "$as_me:20119: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_regcomp=yes
+ else
+@@ -20129,7 +20126,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20132: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20129: 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
+@@ -20138,7 +20135,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:20141: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20138: 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
+@@ -20146,7 +20143,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20149 "configure"
++#line 20146 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20165,16 +20162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20171: \$? = $ac_status" >&5
++ echo "$as_me:20168: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20174: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20171: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20177: \$? = $ac_status" >&5
++ echo "$as_me:20174: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -20185,7 +20182,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20188: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20185: 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
+
+@@ -20217,13 +20214,13 @@
+ esac
+
+ if test "$cf_regex_func" = no ; then
+- echo "$as_me:20220: checking for compile" >&5
++ echo "$as_me:20217: 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 20226 "configure"
++#line 20223 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20254,16 +20251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20260: \$? = $ac_status" >&5
++ echo "$as_me:20257: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20263: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20266: \$? = $ac_status" >&5
++ echo "$as_me:20263: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_compile=yes
+ else
+@@ -20273,13 +20270,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20276: result: $ac_cv_func_compile" >&5
++echo "$as_me:20273: 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:20282: checking for compile in -lgen" >&5
++ echo "$as_me:20279: 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
+@@ -20287,7 +20284,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20290 "configure"
++#line 20287 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20306,16 +20303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20312: \$? = $ac_status" >&5
++ echo "$as_me:20309: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20315: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20312: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20318: \$? = $ac_status" >&5
++ echo "$as_me:20315: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gen_compile=yes
+ else
+@@ -20326,7 +20323,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20329: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20326: 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
+
+@@ -20354,11 +20351,11 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- { echo "$as_me:20357: WARNING: cannot find regular expression library" >&5
++ { echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+
+-echo "$as_me:20361: checking for regular-expression headers" >&5
++echo "$as_me:20358: 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
+@@ -20370,7 +20367,7 @@
+ for cf_regex_hdr in regexp.h regexpr.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20373 "configure"
++#line 20370 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20387,16 +20384,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20393: \$? = $ac_status" >&5
++ echo "$as_me:20390: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20396: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20393: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20399: \$? = $ac_status" >&5
++ echo "$as_me:20396: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20413,7 +20410,7 @@
+ for cf_regex_hdr in regex.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20416 "configure"
++#line 20413 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -20433,16 +20430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20439: \$? = $ac_status" >&5
++ echo "$as_me:20436: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20442: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20445: \$? = $ac_status" >&5
++ echo "$as_me:20442: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20458,11 +20455,11 @@
+ esac
+
+ fi
+-echo "$as_me:20461: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+
+ case "$cf_cv_regex_hdrs" in
+- (no) { echo "$as_me:20465: WARNING: no regular expression header found" >&5
++ (no) { echo "$as_me:20462: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ (regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20500,23 +20497,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20503: checking for $ac_header" >&5
++echo "$as_me:20500: 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 20509 "configure"
++#line 20506 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20510: \"$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:20519: \$? = $ac_status" >&5
++ echo "$as_me:20516: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20535,7 +20532,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20535: 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
+@@ -20545,26 +20542,26 @@
+ fi
+ done
+
+-for ac_header in unistd.h getopt.h
++for ac_header in getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20551: checking for $ac_header" >&5
++echo "$as_me:20548: 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 20557 "configure"
++#line 20554 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20561: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20558: \"$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:20567: \$? = $ac_status" >&5
++ echo "$as_me:20564: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20583,7 +20580,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20586: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20583: 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
+@@ -20593,7 +20590,7 @@
+ fi
+ done
+
+-echo "$as_me:20596: checking for header declaring getopt variables" >&5
++echo "$as_me:20593: 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
+@@ -20603,7 +20600,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20606 "configure"
++#line 20603 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20616,16 +20613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20622: \$? = $ac_status" >&5
++ echo "$as_me:20619: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20625: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20622: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20628: \$? = $ac_status" >&5
++ echo "$as_me:20625: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -20637,7 +20634,7 @@
+ done
+
+ fi
+-echo "$as_me:20640: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -20654,14 +20651,14 @@
+
+ fi
+
+-echo "$as_me:20657: checking if external environ is declared" >&5
++echo "$as_me:20654: 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 20664 "configure"
++#line 20661 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20674,16 +20671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20680: \$? = $ac_status" >&5
++ echo "$as_me:20677: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20683: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20680: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20686: \$? = $ac_status" >&5
++ echo "$as_me:20683: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_environ=yes
+ else
+@@ -20694,7 +20691,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20697: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20709,14 +20706,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:20712: checking if external environ exists" >&5
++echo "$as_me:20709: 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 20719 "configure"
++#line 20716 "configure"
+ #include "confdefs.h"
+
+ #undef environ
+@@ -20731,16 +20728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20737: \$? = $ac_status" >&5
++ echo "$as_me:20734: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20740: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20743: \$? = $ac_status" >&5
++ echo "$as_me:20740: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_environ=yes
+ else
+@@ -20751,7 +20748,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20754: result: $cf_cv_have_environ" >&5
++echo "$as_me:20751: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20764,13 +20761,13 @@
+
+ fi
+
+-echo "$as_me:20767: checking for getenv" >&5
++echo "$as_me:20764: 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 20773 "configure"
++#line 20770 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20801,16 +20798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20807: \$? = $ac_status" >&5
++ echo "$as_me:20804: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20810: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20807: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20813: \$? = $ac_status" >&5
++ echo "$as_me:20810: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_getenv=yes
+ else
+@@ -20820,19 +20817,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20823: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20820: 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:20829: checking for $ac_func" >&5
++echo "$as_me:20826: 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 20835 "configure"
++#line 20832 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20863,16 +20860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20869: \$? = $ac_status" >&5
++ echo "$as_me:20866: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20872: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20875: \$? = $ac_status" >&5
++ echo "$as_me:20872: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -20882,7 +20879,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20885: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20882: 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
+@@ -20892,7 +20889,7 @@
+ fi
+ done
+
+-echo "$as_me:20895: checking if getenv returns consistent values" >&5
++echo "$as_me:20892: 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
+@@ -20902,7 +20899,7 @@
+ cf_cv_consistent_getenv=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20905 "configure"
++#line 20902 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21007,15 +21004,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21013: \$? = $ac_status" >&5
++ echo "$as_me:21010: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21015: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21012: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21018: \$? = $ac_status" >&5
++ echo "$as_me:21015: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_consistent_getenv=yes
+ else
+@@ -21028,7 +21025,7 @@
+ fi
+
+ fi
+-echo "$as_me:21031: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21043,18 +21040,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ test "x$cf_with_trace" = xyes
+ then
+- { echo "$as_me:21046: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++ { echo "$as_me:21043: 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:21050: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21047: 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 21057 "configure"
++#line 21054 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21074,16 +21071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21080: \$? = $ac_status" >&5
++ echo "$as_me:21077: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21083: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21086: \$? = $ac_status" >&5
++ echo "$as_me:21083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -21095,7 +21092,7 @@
+
+ fi
+
+-echo "$as_me:21098: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21095: 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
+@@ -21110,13 +21107,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:21113: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21110: 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 21119 "configure"
++#line 21116 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21178,16 +21175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21181: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21184: \$? = $ac_status" >&5
++ echo "$as_me:21181: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21187: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21184: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21190: \$? = $ac_status" >&5
++ echo "$as_me:21187: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -21197,7 +21194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21200: result: $ac_cv_c_const" >&5
++echo "$as_me:21197: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -21207,7 +21204,7 @@
+
+ fi
+
+-echo "$as_me:21210: checking for inline" >&5
++echo "$as_me:21207: 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
+@@ -21215,7 +21212,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21218 "configure"
++#line 21215 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21224,16 +21221,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21230: \$? = $ac_status" >&5
++ echo "$as_me:21227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21233: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21236: \$? = $ac_status" >&5
++ echo "$as_me:21233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21244,7 +21241,7 @@
+ done
+
+ fi
+-echo "$as_me:21247: result: $ac_cv_c_inline" >&5
++echo "$as_me:21244: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -21270,7 +21267,7 @@
+ :
+ elif test "$GCC" = yes
+ then
+- echo "$as_me:21273: checking if $CC supports options to tune inlining" >&5
++ echo "$as_me:21270: 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
+@@ -21279,7 +21276,7 @@
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21282 "configure"
++#line 21279 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21291,16 +21288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21297: \$? = $ac_status" >&5
++ echo "$as_me:21294: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21300: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21297: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21303: \$? = $ac_status" >&5
++ echo "$as_me:21300: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gcc_inline=yes
+ else
+@@ -21312,7 +21309,7 @@
+ CFLAGS=$cf_save_CFLAGS
+
+ fi
+-echo "$as_me:21315: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+@@ -21418,7 +21415,7 @@
+ fi
+ fi
+
+-echo "$as_me:21421: checking for signal global datatype" >&5
++echo "$as_me:21418: 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
+@@ -21430,7 +21427,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21433 "configure"
++#line 21430 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21454,16 +21451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21457: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21460: \$? = $ac_status" >&5
++ echo "$as_me:21457: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21463: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21460: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21466: \$? = $ac_status" >&5
++ echo "$as_me:21463: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21477,7 +21474,7 @@
+
+ fi
+
+-echo "$as_me:21480: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21477: 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
+@@ -21486,7 +21483,7 @@
+
+ if test "$NCURSES_CHTYPE" = auto ; then
+
+-echo "$as_me:21489: checking for type of chtype" >&5
++echo "$as_me:21486: 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
+@@ -21496,7 +21493,7 @@
+ cf_cv_typeof_chtype=long
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21499 "configure"
++#line 21496 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21531,15 +21528,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21537: \$? = $ac_status" >&5
++ echo "$as_me:21534: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21539: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21536: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21542: \$? = $ac_status" >&5
++ echo "$as_me:21539: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21554,7 +21551,7 @@
+
+ fi
+
+-echo "$as_me:21557: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -21566,14 +21563,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+
+-echo "$as_me:21569: checking if unsigned literals are legal" >&5
++echo "$as_me:21566: 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 21576 "configure"
++#line 21573 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21585,16 +21582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21591: \$? = $ac_status" >&5
++ echo "$as_me:21588: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21594: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21597: \$? = $ac_status" >&5
++ echo "$as_me:21594: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unsigned_literals=yes
+ else
+@@ -21606,7 +21603,7 @@
+
+ fi
+
+-echo "$as_me:21609: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+
+ cf_cv_1UL="1"
+@@ -21622,14 +21619,14 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:21625: checking if external errno is declared" >&5
++echo "$as_me:21622: 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 21632 "configure"
++#line 21629 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21643,16 +21640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21649: \$? = $ac_status" >&5
++ echo "$as_me:21646: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21655: \$? = $ac_status" >&5
++ echo "$as_me:21652: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_errno=yes
+ else
+@@ -21663,7 +21660,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21666: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21678,14 +21675,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:21681: checking if external errno exists" >&5
++echo "$as_me:21678: 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 21688 "configure"
++#line 21685 "configure"
+ #include "confdefs.h"
+
+ #undef errno
+@@ -21700,16 +21697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21706: \$? = $ac_status" >&5
++ echo "$as_me:21703: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21709: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21706: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21712: \$? = $ac_status" >&5
++ echo "$as_me:21709: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_errno=yes
+ else
+@@ -21720,7 +21717,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21723: result: $cf_cv_have_errno" >&5
++echo "$as_me:21720: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21733,7 +21730,7 @@
+
+ fi
+
+-echo "$as_me:21736: checking if data-only library module links" >&5
++echo "$as_me:21733: 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
+@@ -21741,20 +21738,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 21744 "configure"
++#line 21741 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:21747: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21750: \$? = $ac_status" >&5
++ echo "$as_me:21747: \$? = $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 21757 "configure"
++#line 21754 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -21771,10 +21768,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21777: \$? = $ac_status" >&5
++ echo "$as_me:21774: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21787,7 +21784,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21790 "configure"
++#line 21787 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -21798,15 +21795,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21804: \$? = $ac_status" >&5
++ echo "$as_me:21801: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21806: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21809: \$? = $ac_status" >&5
++ echo "$as_me:21806: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -21821,7 +21818,7 @@
+
+ fi
+
+-echo "$as_me:21824: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21836,13 +21833,13 @@
+ ### Checks for library functions.
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:21839: checking for clock_gettime" >&5
++echo "$as_me:21836: 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 21845 "configure"
++#line 21842 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21873,16 +21870,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21879: \$? = $ac_status" >&5
++ echo "$as_me:21876: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21882: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21879: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21885: \$? = $ac_status" >&5
++ echo "$as_me:21882: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -21892,12 +21889,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21895: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21892: 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:21900: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:21897: 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
+@@ -21905,7 +21902,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21908 "configure"
++#line 21905 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21924,16 +21921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21930: \$? = $ac_status" >&5
++ echo "$as_me:21927: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21933: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21936: \$? = $ac_status" >&5
++ echo "$as_me:21933: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21944,7 +21941,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21947: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21944: 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"
+@@ -21956,14 +21953,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21959: checking if clock_gettime links" >&5
++echo "$as_me:21956: 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 21966 "configure"
++#line 21963 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21981,16 +21978,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21987: \$? = $ac_status" >&5
++ echo "$as_me:21984: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21990: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21987: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21993: \$? = $ac_status" >&5
++ echo "$as_me:21990: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -22001,7 +21998,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22004: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -22015,13 +22012,13 @@
+ EOF
+
+ else
+-echo "$as_me:22018: checking for gettimeofday" >&5
++echo "$as_me:22015: 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 22024 "configure"
++#line 22021 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22052,16 +22049,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22058: \$? = $ac_status" >&5
++ echo "$as_me:22055: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22061: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22058: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22064: \$? = $ac_status" >&5
++ echo "$as_me:22061: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -22071,7 +22068,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22074: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -22081,7 +22078,7 @@
+
+ else
+
+-echo "$as_me:22084: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22081: 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
+@@ -22089,7 +22086,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22092 "configure"
++#line 22089 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22108,16 +22105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22114: \$? = $ac_status" >&5
++ echo "$as_me:22111: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22117: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22120: \$? = $ac_status" >&5
++ echo "$as_me:22117: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22128,7 +22125,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22131: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22128: 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
+
+@@ -22187,13 +22184,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22190: checking for $ac_func" >&5
++echo "$as_me:22187: 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 22196 "configure"
++#line 22193 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22224,16 +22221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22230: \$? = $ac_status" >&5
++ echo "$as_me:22227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22233: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22236: \$? = $ac_status" >&5
++ echo "$as_me:22233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -22243,7 +22240,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22246: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22243: 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
+@@ -22253,14 +22250,14 @@
+ fi
+ done
+
+-echo "$as_me:22256: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:22253: 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 22263 "configure"
++#line 22260 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -22275,16 +22272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22281: \$? = $ac_status" >&5
++ echo "$as_me:22278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22284: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22287: \$? = $ac_status" >&5
++ echo "$as_me:22284: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_PATH_TTYS=yes
+ else
+@@ -22294,7 +22291,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22297: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+
+ if test $cf_cv_PATH_TTYS = no
+@@ -22316,7 +22313,7 @@
+
+ if test $cf_cv_PATH_TTYS != no
+ then
+- echo "$as_me:22319: checking if _PATH_TTYS file exists" >&5
++ echo "$as_me:22316: 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
+@@ -22326,7 +22323,7 @@
+ cf_cv_have_PATH_TTYS=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22329 "configure"
++#line 22326 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22339,15 +22336,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22345: \$? = $ac_status" >&5
++ echo "$as_me:22342: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22347: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22350: \$? = $ac_status" >&5
++ echo "$as_me:22347: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22359,7 +22356,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22362: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22359: 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
+@@ -22371,14 +22368,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+
+- echo "$as_me:22374: checking for getttynam" >&5
++ echo "$as_me:22371: 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 22381 "configure"
++#line 22378 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -22390,16 +22387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22393: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22396: \$? = $ac_status" >&5
++ echo "$as_me:22393: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22399: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22396: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22402: \$? = $ac_status" >&5
++ echo "$as_me:22399: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_getttynam=yes
+ else
+@@ -22409,7 +22406,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22412: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22409: 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
+@@ -22419,7 +22416,7 @@
+
+ if test "x$ac_cv_func_getopt" = xno && \
+ test "x$cf_with_progs$cf_with_tests" != xnono; then
+- { { echo "$as_me:22422: error: getopt is required for building programs" >&5
++ { { echo "$as_me:22419: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -22428,7 +22425,7 @@
+ then
+ if test "x$ac_cv_func_vsnprintf" = xyes
+ then
+- { echo "$as_me:22431: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++ { echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ else
+
+@@ -22441,14 +22438,14 @@
+
+ if test "x$with_getcap" = "xyes" ; then
+
+-echo "$as_me:22444: checking for terminal-capability database functions" >&5
++echo "$as_me:22441: 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 22451 "configure"
++#line 22448 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22468,16 +22465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22471: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22474: \$? = $ac_status" >&5
++ echo "$as_me:22471: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22477: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22480: \$? = $ac_status" >&5
++ echo "$as_me:22477: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent=yes
+ else
+@@ -22488,7 +22485,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22491: result: $cf_cv_cgetent" >&5
++echo "$as_me:22488: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+
+ if test "$cf_cv_cgetent" = yes
+@@ -22498,14 +22495,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+
+-echo "$as_me:22501: checking if cgetent uses const parameter" >&5
++echo "$as_me:22498: 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 22508 "configure"
++#line 22505 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22528,16 +22525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22534: \$? = $ac_status" >&5
++ echo "$as_me:22531: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22537: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22540: \$? = $ac_status" >&5
++ echo "$as_me:22537: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent_const=yes
+ else
+@@ -22548,7 +22545,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22551: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ if test "$cf_cv_cgetent_const" = yes
+ then
+@@ -22562,14 +22559,14 @@
+
+ fi
+
+-echo "$as_me:22565: checking for isascii" >&5
++echo "$as_me:22562: 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 22572 "configure"
++#line 22569 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -22581,16 +22578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22587: \$? = $ac_status" >&5
++ echo "$as_me:22584: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22590: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22587: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22593: \$? = $ac_status" >&5
++ echo "$as_me:22590: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_isascii=yes
+ else
+@@ -22601,7 +22598,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22604: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22609,10 +22606,10 @@
+ EOF
+
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22612: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22609: 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 22615 "configure"
++#line 22612 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22626,16 +22623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22632: \$? = $ac_status" >&5
++ echo "$as_me:22629: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22635: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22632: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22638: \$? = $ac_status" >&5
++ echo "$as_me:22635: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=no
+ else
+@@ -22643,7 +22640,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22646 "configure"
++#line 22643 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22658,16 +22655,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22664: \$? = $ac_status" >&5
++ echo "$as_me:22661: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22667: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22664: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22670: \$? = $ac_status" >&5
++ echo "$as_me:22667: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=yes
+
+@@ -22683,11 +22680,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22686: result: $sigact_bad" >&5
++echo "$as_me:22683: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+
+-echo "$as_me:22690: checking if nanosleep really works" >&5
++echo "$as_me:22687: 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
+@@ -22697,7 +22694,7 @@
+ cf_cv_func_nanosleep=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22700 "configure"
++#line 22697 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22723,15 +22720,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22729: \$? = $ac_status" >&5
++ echo "$as_me:22726: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22731: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22734: \$? = $ac_status" >&5
++ echo "$as_me:22731: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_nanosleep=yes
+ else
+@@ -22743,7 +22740,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22746: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22760,23 +22757,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22763: checking for $ac_header" >&5
++echo "$as_me:22760: 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 22769 "configure"
++#line 22766 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22770: \"$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:22779: \$? = $ac_status" >&5
++ echo "$as_me:22776: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22795,7 +22792,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22798: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22795: 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
+@@ -22812,10 +22809,10 @@
+ (*) termios_bad=maybe ;;
+ esac
+ if test "$termios_bad" = maybe ; then
+- echo "$as_me:22815: checking whether termios.h needs _POSIX_SOURCE" >&5
++ echo "$as_me:22812: 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 22818 "configure"
++#line 22815 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22827,16 +22824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22833: \$? = $ac_status" >&5
++ echo "$as_me:22830: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22836: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22833: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22839: \$? = $ac_status" >&5
++ echo "$as_me:22836: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=no
+ else
+@@ -22844,7 +22841,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22847 "configure"
++#line 22844 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22858,16 +22855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22864: \$? = $ac_status" >&5
++ echo "$as_me:22861: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22867: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22870: \$? = $ac_status" >&5
++ echo "$as_me:22867: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=unknown
+ else
+@@ -22883,19 +22880,19 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:22886: result: $termios_bad" >&5
++ echo "$as_me:22883: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ fi
+ fi
+
+-echo "$as_me:22891: checking for tcgetattr" >&5
++echo "$as_me:22888: 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 22898 "configure"
++#line 22895 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22923,16 +22920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22929: \$? = $ac_status" >&5
++ echo "$as_me:22926: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22932: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22929: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22935: \$? = $ac_status" >&5
++ echo "$as_me:22932: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_tcgetattr=yes
+ else
+@@ -22942,21 +22939,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22945: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22942: 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:22952: checking for vsscanf function or workaround" >&5
++echo "$as_me:22949: 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 22959 "configure"
++#line 22956 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -22982,16 +22979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22988: \$? = $ac_status" >&5
++ echo "$as_me:22985: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22991: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22988: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22994: \$? = $ac_status" >&5
++ echo "$as_me:22991: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22999,7 +22996,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23002 "configure"
++#line 22999 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23021,16 +23018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23027: \$? = $ac_status" >&5
++ echo "$as_me:23024: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23030: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23027: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23033: \$? = $ac_status" >&5
++ echo "$as_me:23030: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23038,7 +23035,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23041 "configure"
++#line 23038 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23060,16 +23057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23063: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23066: \$? = $ac_status" >&5
++ echo "$as_me:23063: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23069: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23072: \$? = $ac_status" >&5
++ echo "$as_me:23069: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=_doscan
+ else
+@@ -23084,7 +23081,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23087: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+
+ case "$cf_cv_func_vsscanf" in
+@@ -23110,23 +23107,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23113: checking for $ac_header" >&5
++echo "$as_me:23110: 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 23119 "configure"
++#line 23116 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23123: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23120: \"$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:23129: \$? = $ac_status" >&5
++ echo "$as_me:23126: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23145,7 +23142,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23148: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23145: 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
+@@ -23155,7 +23152,7 @@
+ fi
+ done
+
+-echo "$as_me:23158: checking for working mkstemp" >&5
++echo "$as_me:23155: 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
+@@ -23166,7 +23163,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23169 "configure"
++#line 23166 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23201,15 +23198,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23207: \$? = $ac_status" >&5
++ echo "$as_me:23204: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23209: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23206: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23212: \$? = $ac_status" >&5
++ echo "$as_me:23209: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -23224,16 +23221,16 @@
+ fi
+
+ fi
+-echo "$as_me:23227: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23224: 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:23230: checking for mkstemp" >&5
++ echo "$as_me:23227: 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 23236 "configure"
++#line 23233 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23264,16 +23261,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23270: \$? = $ac_status" >&5
++ echo "$as_me:23267: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23273: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23270: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23276: \$? = $ac_status" >&5
++ echo "$as_me:23273: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -23283,7 +23280,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23286: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -23304,21 +23301,21 @@
+ fi
+
+ if test "x$cross_compiling" = xyes ; then
+- { echo "$as_me:23307: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++ { echo "$as_me:23304: 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:23310: checking whether setvbuf arguments are reversed" >&5
++ echo "$as_me:23307: 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:23316: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:23313: 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 23321 "configure"
++#line 23318 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23335,15 +23332,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23341: \$? = $ac_status" >&5
++ echo "$as_me:23338: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23343: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23340: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23346: \$? = $ac_status" >&5
++ echo "$as_me:23343: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23356,7 +23353,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23359: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23356: 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
+
+@@ -23367,13 +23364,13 @@
+ fi
+
+ fi
+-echo "$as_me:23370: checking for intptr_t" >&5
++echo "$as_me:23367: 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 23376 "configure"
++#line 23373 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23388,16 +23385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23391: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23394: \$? = $ac_status" >&5
++ echo "$as_me:23391: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23397: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23400: \$? = $ac_status" >&5
++ echo "$as_me:23397: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_intptr_t=yes
+ else
+@@ -23407,7 +23404,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23410: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23407: 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
+ :
+@@ -23419,13 +23416,13 @@
+
+ fi
+
+-echo "$as_me:23422: checking for ssize_t" >&5
++echo "$as_me:23419: 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 23428 "configure"
++#line 23425 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23440,16 +23437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23443: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23446: \$? = $ac_status" >&5
++ echo "$as_me:23443: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23449: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23446: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23452: \$? = $ac_status" >&5
++ echo "$as_me:23449: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_ssize_t=yes
+ else
+@@ -23459,7 +23456,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23462: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23459: 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
+ :
+@@ -23471,14 +23468,14 @@
+
+ fi
+
+-echo "$as_me:23474: checking for type sigaction_t" >&5
++echo "$as_me:23471: 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 23481 "configure"
++#line 23478 "configure"
+ #include "confdefs.h"
+
+ #include <signal.h>
+@@ -23491,16 +23488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23494: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23497: \$? = $ac_status" >&5
++ echo "$as_me:23494: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23500: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23497: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23503: \$? = $ac_status" >&5
++ echo "$as_me:23500: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_type_sigaction=yes
+ else
+@@ -23511,14 +23508,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:23514: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23511: 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:23521: checking declaration of size-change" >&5
++echo "$as_me:23518: 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
+@@ -23539,7 +23536,7 @@
+
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23542 "configure"
++#line 23539 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -23589,16 +23586,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23595: \$? = $ac_status" >&5
++ echo "$as_me:23592: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23598: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23595: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23601: \$? = $ac_status" >&5
++ echo "$as_me:23598: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sizechange=yes
+ else
+@@ -23617,7 +23614,7 @@
+ done
+
+ fi
+-echo "$as_me:23620: result: $cf_cv_sizechange" >&5
++echo "$as_me:23617: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+
+@@ -23635,13 +23632,13 @@
+ esac
+ fi
+
+-echo "$as_me:23638: checking for memmove" >&5
++echo "$as_me:23635: 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 23644 "configure"
++#line 23641 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23672,16 +23669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23678: \$? = $ac_status" >&5
++ echo "$as_me:23675: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23681: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23678: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23684: \$? = $ac_status" >&5
++ echo "$as_me:23681: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_memmove=yes
+ else
+@@ -23691,19 +23688,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23694: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23691: 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:23700: checking for bcopy" >&5
++echo "$as_me:23697: 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 23706 "configure"
++#line 23703 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23734,16 +23731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23740: \$? = $ac_status" >&5
++ echo "$as_me:23737: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23743: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23746: \$? = $ac_status" >&5
++ echo "$as_me:23743: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_bcopy=yes
+ else
+@@ -23753,11 +23750,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23756: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23753: 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:23760: checking if bcopy does overlapping moves" >&5
++ echo "$as_me:23757: 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
+@@ -23767,7 +23764,7 @@
+ cf_cv_good_bcopy=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23770 "configure"
++#line 23767 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23783,15 +23780,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23789: \$? = $ac_status" >&5
++ echo "$as_me:23786: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23791: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23788: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23794: \$? = $ac_status" >&5
++ echo "$as_me:23791: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_good_bcopy=yes
+ else
+@@ -23804,7 +23801,7 @@
+ fi
+
+ fi
+-echo "$as_me:23807: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+
+ else
+@@ -23831,13 +23828,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23834: checking for $ac_func" >&5
++echo "$as_me:23831: 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 23840 "configure"
++#line 23837 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23868,16 +23865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23874: \$? = $ac_status" >&5
++ echo "$as_me:23871: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23877: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23874: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23880: \$? = $ac_status" >&5
++ echo "$as_me:23877: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -23887,7 +23884,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23887: 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
+@@ -23897,7 +23894,7 @@
+ fi
+ done
+ }
+-echo "$as_me:23900: checking if poll really works" >&5
++echo "$as_me:23897: 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
+@@ -23907,7 +23904,7 @@
+ cf_cv_working_poll=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23910 "configure"
++#line 23907 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23960,15 +23957,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23966: \$? = $ac_status" >&5
++ echo "$as_me:23963: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23968: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23965: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23971: \$? = $ac_status" >&5
++ echo "$as_me:23968: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -23980,21 +23977,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23983: result: $cf_cv_working_poll" >&5
++echo "$as_me:23980: 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:23990: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:23987: 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 23997 "configure"
++#line 23994 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24014,16 +24011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24020: \$? = $ac_status" >&5
++ echo "$as_me:24017: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24023: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24020: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24026: \$? = $ac_status" >&5
++ echo "$as_me:24023: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mb_len_max=yes
+ else
+@@ -24033,7 +24030,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24036: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24033: 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
+@@ -24043,18 +24040,18 @@
+ EOF
+
+ else
+- { echo "$as_me:24046: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++ { echo "$as_me:24043: 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:24050: checking for va_copy" >&5
++echo "$as_me:24047: 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 24057 "configure"
++#line 24054 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24071,16 +24068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24077: \$? = $ac_status" >&5
++ echo "$as_me:24074: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24080: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24077: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24083: \$? = $ac_status" >&5
++ echo "$as_me:24080: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -24090,7 +24087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24093: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24102,14 +24099,14 @@
+
+ else # !cf_cv_have_va_copy
+
+-echo "$as_me:24105: checking for __va_copy" >&5
++echo "$as_me:24102: 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 24112 "configure"
++#line 24109 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24126,16 +24123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24129: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24132: \$? = $ac_status" >&5
++ echo "$as_me:24129: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24135: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24138: \$? = $ac_status" >&5
++ echo "$as_me:24135: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -24145,7 +24142,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24148: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24157,14 +24154,14 @@
+
+ else # !cf_cv_have___va_copy
+
+-echo "$as_me:24160: checking for __builtin_va_copy" >&5
++echo "$as_me:24157: 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 24167 "configure"
++#line 24164 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24181,16 +24178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24184: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24187: \$? = $ac_status" >&5
++ echo "$as_me:24184: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24190: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24187: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24193: \$? = $ac_status" >&5
++ echo "$as_me:24190: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24200,7 +24197,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24203: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24200: 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 &&
+@@ -24218,14 +24215,14 @@
+ ;;
+
+ (*)
+- echo "$as_me:24221: checking if we can simply copy va_list" >&5
++ echo "$as_me:24218: 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 24228 "configure"
++#line 24225 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24242,16 +24239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24248: \$? = $ac_status" >&5
++ echo "$as_me:24245: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24251: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24248: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24254: \$? = $ac_status" >&5
++ echo "$as_me:24251: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_pointer_va_list=yes
+ else
+@@ -24261,19 +24258,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24264: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24261: 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:24269: checking if we can copy va_list indirectly" >&5
++ echo "$as_me:24266: 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 24276 "configure"
++#line 24273 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24290,16 +24287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24296: \$? = $ac_status" >&5
++ echo "$as_me:24293: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24299: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24296: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24302: \$? = $ac_status" >&5
++ echo "$as_me:24299: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_array_va_list=yes
+ else
+@@ -24309,7 +24306,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24312: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24309: 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
+@@ -24320,13 +24317,13 @@
+ ;;
+ esac
+
+-echo "$as_me:24323: checking for pid_t" >&5
++echo "$as_me:24320: 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 24329 "configure"
++#line 24326 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24341,16 +24338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24347: \$? = $ac_status" >&5
++ echo "$as_me:24344: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24350: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24347: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24353: \$? = $ac_status" >&5
++ echo "$as_me:24350: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -24360,7 +24357,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24363: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24360: 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
+ :
+@@ -24375,23 +24372,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:24378: checking for $ac_header" >&5
++echo "$as_me:24375: 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 24384 "configure"
++#line 24381 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24388: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24385: \"$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:24394: \$? = $ac_status" >&5
++ echo "$as_me:24391: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24410,7 +24407,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24413: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24410: 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
+@@ -24423,13 +24420,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:24426: checking for $ac_func" >&5
++echo "$as_me:24423: 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 24432 "configure"
++#line 24429 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24460,16 +24457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24466: \$? = $ac_status" >&5
++ echo "$as_me:24463: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24466: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24472: \$? = $ac_status" >&5
++ echo "$as_me:24469: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -24479,7 +24476,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24482: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24479: 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
+@@ -24491,7 +24488,7 @@
+
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:24494: checking for working fork" >&5
++ echo "$as_me:24491: 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
+@@ -24514,15 +24511,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24520: \$? = $ac_status" >&5
++ echo "$as_me:24517: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24522: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24519: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24525: \$? = $ac_status" >&5
++ echo "$as_me:24522: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -24534,7 +24531,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24537: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -24548,12 +24545,12 @@
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+- { echo "$as_me:24551: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:24548: 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:24556: checking for working vfork" >&5
++ echo "$as_me:24553: 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
+@@ -24562,7 +24559,7 @@
+ ac_cv_func_vfork_works=cross
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24565 "configure"
++#line 24562 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -24655,15 +24652,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24661: \$? = $ac_status" >&5
++ echo "$as_me:24658: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24663: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24660: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24666: \$? = $ac_status" >&5
++ echo "$as_me:24663: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -24675,13 +24672,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24678: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24675: 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:24684: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:24681: 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
+
+@@ -24706,7 +24703,7 @@
+
+ fi
+
+-echo "$as_me:24709: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24706: 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
+@@ -24716,7 +24713,7 @@
+ cf_cv_fopen_bin_r=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24719 "configure"
++#line 24716 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24751,15 +24748,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24757: \$? = $ac_status" >&5
++ echo "$as_me:24754: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24759: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24756: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24762: \$? = $ac_status" >&5
++ echo "$as_me:24759: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fopen_bin_r=yes
+ else
+@@ -24772,7 +24769,7 @@
+ fi
+
+ fi
+-echo "$as_me:24775: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24772: 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
+@@ -24781,7 +24778,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:24784: checking for openpty in -lutil" >&5
++echo "$as_me:24781: 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
+@@ -24789,7 +24786,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24792 "configure"
++#line 24789 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -24808,16 +24805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24814: \$? = $ac_status" >&5
++ echo "$as_me:24811: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24817: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24814: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24820: \$? = $ac_status" >&5
++ echo "$as_me:24817: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -24828,7 +24825,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24831: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24828: 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
+@@ -24836,7 +24833,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:24839: checking for openpty header" >&5
++echo "$as_me:24836: 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
+@@ -24863,7 +24860,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24866 "configure"
++#line 24863 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -24881,16 +24878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24887: \$? = $ac_status" >&5
++ echo "$as_me:24884: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24890: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24887: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24893: \$? = $ac_status" >&5
++ echo "$as_me:24890: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -24908,7 +24905,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:24911: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24981,7 +24978,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24984 "configure"
++#line 24981 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24993,16 +24990,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24999: \$? = $ac_status" >&5
++ echo "$as_me:24996: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25002: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25005: \$? = $ac_status" >&5
++ echo "$as_me:25002: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25019,7 +25016,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}:25022: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25055,7 +25052,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}:25058: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25066,7 +25063,7 @@
+ else
+ case "$with_hashed_db" in
+ (./*|../*|/*)
+- { echo "$as_me:25069: WARNING: no such directory $with_hashed_db" >&5
++ { echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ ;;
+ (*)
+@@ -25138,7 +25135,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25141 "configure"
++#line 25138 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -25150,16 +25147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25156: \$? = $ac_status" >&5
++ echo "$as_me:25153: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25159: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25156: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25162: \$? = $ac_status" >&5
++ echo "$as_me:25159: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25176,7 +25173,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}:25179: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25256,7 +25253,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}:25259: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25273,23 +25270,23 @@
+ fi
+ esac
+
+-echo "$as_me:25276: checking for db.h" >&5
++echo "$as_me:25273: 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 25282 "configure"
++#line 25279 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:25286: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25283: \"$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:25292: \$? = $ac_status" >&5
++ echo "$as_me:25289: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25308,11 +25305,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25311: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25308: 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:25315: checking for version of db" >&5
++echo "$as_me:25312: 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
+@@ -25323,10 +25320,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+
+-echo "${as_me:-configure}:25326: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25329 "configure"
++#line 25326 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25356,16 +25353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25359: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25362: \$? = $ac_status" >&5
++ echo "$as_me:25359: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25365: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25368: \$? = $ac_status" >&5
++ echo "$as_me:25365: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -25379,16 +25376,16 @@
+ done
+
+ fi
+-echo "$as_me:25382: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25379: 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:25386: error: Cannot determine version of db" >&5
++ { { echo "$as_me:25383: 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:25391: checking for db libraries" >&5
++echo "$as_me:25388: 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
+@@ -25418,10 +25415,10 @@
+
+ fi
+
+-echo "${as_me:-configure}:25421: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25424 "configure"
++#line 25421 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25476,16 +25473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25482: \$? = $ac_status" >&5
++ echo "$as_me:25479: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25485: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25482: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25488: \$? = $ac_status" >&5
++ echo "$as_me:25485: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -25505,11 +25502,11 @@
+ done
+
+ fi
+-echo "$as_me:25508: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25505: 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:25512: error: Cannot determine library for db" >&5
++ { { echo "$as_me:25509: 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
+@@ -25535,7 +25532,7 @@
+
+ else
+
+- { { echo "$as_me:25538: error: Cannot find db.h" >&5
++ { { echo "$as_me:25535: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -25550,7 +25547,7 @@
+
+ # Just in case, check if the C compiler has a bool type.
+
+-echo "$as_me:25553: checking if we should include stdbool.h" >&5
++echo "$as_me:25550: 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
+@@ -25558,7 +25555,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25561 "configure"
++#line 25558 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -25570,23 +25567,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25576: \$? = $ac_status" >&5
++ echo "$as_me:25573: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25579: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25576: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25582: \$? = $ac_status" >&5
++ echo "$as_me:25579: \$? = $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 25589 "configure"
++#line 25586 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -25602,16 +25599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25608: \$? = $ac_status" >&5
++ echo "$as_me:25605: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25608: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25614: \$? = $ac_status" >&5
++ echo "$as_me:25611: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -25625,13 +25622,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:25628: result: yes" >&5
++then echo "$as_me:25625: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25630: result: no" >&5
++else echo "$as_me:25627: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:25634: checking for builtin bool type" >&5
++echo "$as_me:25631: 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
+@@ -25639,7 +25636,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25642 "configure"
++#line 25639 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -25654,16 +25651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25660: \$? = $ac_status" >&5
++ echo "$as_me:25657: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25663: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25660: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25666: \$? = $ac_status" >&5
++ echo "$as_me:25663: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -25676,9 +25673,9 @@
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:25679: result: yes" >&5
++then echo "$as_me:25676: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25681: result: no" >&5
++else echo "$as_me:25678: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25695,10 +25692,10 @@
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+- echo "$as_me:25698: checking if we already have C++ library" >&5
++ echo "$as_me:25695: 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 25701 "configure"
++#line 25698 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25712,16 +25709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25718: \$? = $ac_status" >&5
++ echo "$as_me:25715: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25721: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25718: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25724: \$? = $ac_status" >&5
++ echo "$as_me:25721: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_libstdcpp=yes
+ else
+@@ -25730,7 +25727,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:25733: result: $cf_have_libstdcpp" >&5
++ echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+@@ -25749,7 +25746,7 @@
+ ;;
+ esac
+
+- echo "$as_me:25752: checking for library $cf_stdcpp_libname" >&5
++ echo "$as_me:25749: 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
+@@ -25775,7 +25772,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25778 "configure"
++#line 25775 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25789,16 +25786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25795: \$? = $ac_status" >&5
++ echo "$as_me:25792: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25798: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25801: \$? = $ac_status" >&5
++ echo "$as_me:25798: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -25810,7 +25807,7 @@
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:25813: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25832,7 +25829,7 @@
+ fi
+ fi
+
+- echo "$as_me:25835: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:25832: 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
+@@ -25847,15 +25844,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:25850: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25847: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25853: \$? = $ac_status" >&5
++ echo "$as_me:25850: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:25855: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25858: \$? = $ac_status" >&5
++ echo "$as_me:25855: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -25866,10 +25863,10 @@
+
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+- echo "$as_me:25869: result: yes" >&5
++ echo "$as_me:25866: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:25872: result: no" >&5
++ echo "$as_me:25869: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25889,7 +25886,7 @@
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:25892: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+
+@@ -25910,7 +25907,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25913 "configure"
++#line 25910 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25924,16 +25921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25930: \$? = $ac_status" >&5
++ echo "$as_me:25927: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25933: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25930: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25936: \$? = $ac_status" >&5
++ echo "$as_me:25933: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -25970,7 +25967,7 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25973 "configure"
++#line 25970 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -25984,16 +25981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25990: \$? = $ac_status" >&5
++ echo "$as_me:25987: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25993: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25996: \$? = $ac_status" >&5
++ echo "$as_me:25993: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -26026,7 +26023,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save"
+- echo "$as_me:26029: result: $cf_cxx_library" >&5
++ echo "$as_me:26026: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -26042,7 +26039,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:26045: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26042: 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
+@@ -26059,18 +26056,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 26062 "configure"
++#line 26059 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26067: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26064: \"$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:26073: \$? = $ac_status" >&5
++ echo "$as_me:26070: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26093,17 +26090,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26096 "configure"
++#line 26093 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:26100: \"$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:26106: \$? = $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
+@@ -26140,7 +26137,7 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26143: result: $CXXCPP" >&5
++echo "$as_me:26140: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26150,18 +26147,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 26153 "configure"
++#line 26150 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26158: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26155: \"$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:26164: \$? = $ac_status" >&5
++ echo "$as_me:26161: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26184,17 +26181,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26187 "configure"
++#line 26184 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:26191: \"$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:26197: \$? = $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
+@@ -26222,7 +26219,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:26225: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -26237,23 +26234,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26240: checking for $ac_header" >&5
++echo "$as_me:26237: 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 26246 "configure"
++#line 26243 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26250: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26247: \"$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:26256: \$? = $ac_status" >&5
++ echo "$as_me:26253: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26272,7 +26269,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26275: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26272: 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
+@@ -26285,23 +26282,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26288: checking for $ac_header" >&5
++echo "$as_me:26285: 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 26294 "configure"
++#line 26291 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26295: \"$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:26304: \$? = $ac_status" >&5
++ echo "$as_me:26301: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26320,7 +26317,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26320: 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
+@@ -26331,10 +26328,10 @@
+ done
+
+ if test x"$ac_cv_header_iostream" = xyes ; then
+- echo "$as_me:26334: checking if iostream uses std-namespace" >&5
++ echo "$as_me:26331: 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 26337 "configure"
++#line 26334 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -26351,16 +26348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26357: \$? = $ac_status" >&5
++ echo "$as_me:26354: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26360: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26357: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26363: \$? = $ac_status" >&5
++ echo "$as_me:26360: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -26369,7 +26366,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:26372: result: $cf_iostream_namespace" >&5
++ echo "$as_me:26369: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+
+@@ -26380,7 +26377,7 @@
+ fi
+ fi
+
+-echo "$as_me:26383: checking if we should include stdbool.h" >&5
++echo "$as_me:26380: 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
+@@ -26388,7 +26385,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26391 "configure"
++#line 26388 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -26400,23 +26397,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26406: \$? = $ac_status" >&5
++ echo "$as_me:26403: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26409: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26406: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26412: \$? = $ac_status" >&5
++ echo "$as_me:26409: \$? = $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 26419 "configure"
++#line 26416 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -26432,16 +26429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26438: \$? = $ac_status" >&5
++ echo "$as_me:26435: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26441: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26438: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26444: \$? = $ac_status" >&5
++ echo "$as_me:26441: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -26455,13 +26452,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:26458: result: yes" >&5
++then echo "$as_me:26455: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26460: result: no" >&5
++else echo "$as_me:26457: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26464: checking for builtin bool type" >&5
++echo "$as_me:26461: 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
+@@ -26469,7 +26466,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26472 "configure"
++#line 26469 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -26484,16 +26481,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26490: \$? = $ac_status" >&5
++ echo "$as_me:26487: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26493: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26490: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26496: \$? = $ac_status" >&5
++ echo "$as_me:26493: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -26506,19 +26503,19 @@
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:26509: result: yes" >&5
++then echo "$as_me:26506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26511: result: no" >&5
++else echo "$as_me:26508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26515: checking for bool" >&5
++echo "$as_me:26512: 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 26521 "configure"
++#line 26518 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26553,16 +26550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26559: \$? = $ac_status" >&5
++ echo "$as_me:26556: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26562: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26559: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26565: \$? = $ac_status" >&5
++ echo "$as_me:26562: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -26572,10 +26569,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26575: result: $ac_cv_type_bool" >&5
++echo "$as_me:26572: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:26578: checking size of bool" >&5
++echo "$as_me:26575: 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
+@@ -26584,7 +26581,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26587 "configure"
++#line 26584 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26616,21 +26613,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26622: \$? = $ac_status" >&5
++ echo "$as_me:26619: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26625: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26622: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26628: \$? = $ac_status" >&5
++ echo "$as_me:26625: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26633 "configure"
++#line 26630 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26662,16 +26659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26665: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26668: \$? = $ac_status" >&5
++ echo "$as_me:26665: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26671: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26674: \$? = $ac_status" >&5
++ echo "$as_me:26671: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -26687,7 +26684,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26690 "configure"
++#line 26687 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26719,16 +26716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26722: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26725: \$? = $ac_status" >&5
++ echo "$as_me:26722: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26728: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26725: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26731: \$? = $ac_status" >&5
++ echo "$as_me:26728: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -26744,7 +26741,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 26747 "configure"
++#line 26744 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26776,16 +26773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26782: \$? = $ac_status" >&5
++ echo "$as_me:26779: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26785: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26782: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26788: \$? = $ac_status" >&5
++ echo "$as_me:26785: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -26798,12 +26795,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:26801: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:26798: 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 26806 "configure"
++#line 26803 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26839,15 +26836,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26845: \$? = $ac_status" >&5
++ echo "$as_me:26842: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26847: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26844: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26850: \$? = $ac_status" >&5
++ echo "$as_me:26847: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26863,13 +26860,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26866: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26863: 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:26872: checking for type of bool" >&5
++echo "$as_me:26869: 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
+@@ -26888,7 +26885,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26891 "configure"
++#line 26888 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26929,15 +26926,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26935: \$? = $ac_status" >&5
++ echo "$as_me:26932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26937: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26934: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26940: \$? = $ac_status" >&5
++ echo "$as_me:26937: \$? = $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
+@@ -26954,19 +26951,19 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:26957: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26954: 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:26964: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:26961: 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:26969: checking for special defines needed for etip.h" >&5
++echo "$as_me:26966: 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"
+@@ -26984,7 +26981,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 26987 "configure"
++#line 26984 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -26998,16 +26995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27004: \$? = $ac_status" >&5
++ echo "$as_me:27001: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27007: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27010: \$? = $ac_status" >&5
++ echo "$as_me:27007: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -27028,12 +27025,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:27031: result: ${cf_result:-(none)}" >&5
++echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+
+ if test -n "$CXX"; then
+-echo "$as_me:27036: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27033: 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
+@@ -27050,7 +27047,7 @@
+ cf_cv_cpp_override=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27053 "configure"
++#line 27050 "configure"
+ #include "confdefs.h"
+
+ class base
+@@ -27069,15 +27066,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27075: \$? = $ac_status" >&5
++ echo "$as_me:27072: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27077: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27080: \$? = $ac_status" >&5
++ echo "$as_me:27077: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_override=yes
+ else
+@@ -27096,7 +27093,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27099: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27105,7 +27102,7 @@
+ EOF
+
+ if test -n "$CXX"; then
+-echo "$as_me:27108: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27105: 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
+@@ -27122,7 +27119,7 @@
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27125 "configure"
++#line 27122 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -27141,15 +27138,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27147: \$? = $ac_status" >&5
++ echo "$as_me:27144: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27149: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27146: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27152: \$? = $ac_status" >&5
++ echo "$as_me:27149: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -27168,7 +27165,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27171: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27178,7 +27175,7 @@
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:27181: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27178: 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
+@@ -27192,7 +27189,7 @@
+ ac_main_return="return"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27195 "configure"
++#line 27192 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -27236,16 +27233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27242: \$? = $ac_status" >&5
++ echo "$as_me:27239: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27245: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27242: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27248: \$? = $ac_status" >&5
++ echo "$as_me:27245: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -27263,7 +27260,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27266: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -27312,13 +27309,13 @@
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+-echo "$as_me:27315: checking for bool" >&5
++echo "$as_me:27312: 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 27321 "configure"
++#line 27318 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27353,16 +27350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27359: \$? = $ac_status" >&5
++ echo "$as_me:27356: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27362: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27359: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27365: \$? = $ac_status" >&5
++ echo "$as_me:27362: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -27372,10 +27369,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27375: result: $ac_cv_type_bool" >&5
++echo "$as_me:27372: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:27378: checking size of bool" >&5
++echo "$as_me:27375: 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
+@@ -27384,7 +27381,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27387 "configure"
++#line 27384 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27416,21 +27413,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27422: \$? = $ac_status" >&5
++ echo "$as_me:27419: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27425: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27422: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27428: \$? = $ac_status" >&5
++ echo "$as_me:27425: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27433 "configure"
++#line 27430 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27462,16 +27459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27468: \$? = $ac_status" >&5
++ echo "$as_me:27465: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27468: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27474: \$? = $ac_status" >&5
++ echo "$as_me:27471: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -27487,7 +27484,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27490 "configure"
++#line 27487 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27519,16 +27516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27522: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27525: \$? = $ac_status" >&5
++ echo "$as_me:27522: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27528: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27531: \$? = $ac_status" >&5
++ echo "$as_me:27528: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -27544,7 +27541,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 27547 "configure"
++#line 27544 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27576,16 +27573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27582: \$? = $ac_status" >&5
++ echo "$as_me:27579: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27585: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27582: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27588: \$? = $ac_status" >&5
++ echo "$as_me:27585: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -27598,12 +27595,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:27601: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:27598: 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 27606 "configure"
++#line 27603 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27639,15 +27636,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27645: \$? = $ac_status" >&5
++ echo "$as_me:27642: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27647: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27644: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27650: \$? = $ac_status" >&5
++ echo "$as_me:27647: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27663,13 +27660,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27666: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27663: 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:27672: checking for type of bool" >&5
++echo "$as_me:27669: 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
+@@ -27688,7 +27685,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27691 "configure"
++#line 27688 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27729,15 +27726,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27735: \$? = $ac_status" >&5
++ echo "$as_me:27732: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27737: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27734: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27740: \$? = $ac_status" >&5
++ echo "$as_me:27737: \$? = $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
+@@ -27754,26 +27751,26 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:27757: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27754: 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:27764: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:27761: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+
+ else
+- echo "$as_me:27770: checking for fallback type of bool" >&5
++ echo "$as_me:27767: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ case "$host_cpu" in
+ (i?86) cf_cv_type_of_bool=char ;;
+ (*) cf_cv_type_of_bool=int ;;
+ esac
+- echo "$as_me:27776: result: $cf_cv_type_of_bool" >&5
++ echo "$as_me:27773: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ fi
+ fi
+@@ -27802,7 +27799,7 @@
+
+ if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+- { echo "$as_me:27805: WARNING: libtool does not support Ada - disabling feature" >&5
++ { echo "$as_me:27802: 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
+@@ -27813,7 +27810,7 @@
+
+ ADAFLAGS="$ADAFLAGS -gnatpn"
+
+- echo "$as_me:27816: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -27830,10 +27827,10 @@
+
+ ;;
+ esac
+- echo "$as_me:27833: result: $ADAFLAGS" >&5
++ echo "$as_me:27830: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:27836: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27833: 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
+@@ -27843,11 +27840,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:27846: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27843: 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:27850: checking if GNAT supports generics" >&5
++echo "$as_me:27847: 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])
+@@ -27857,7 +27854,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:27860: result: $cf_gnat_generics" >&5
++echo "$as_me:27857: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -27869,7 +27866,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:27872: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27869: 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
+@@ -27917,7 +27914,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:27920: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27930,7 +27927,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27933: checking if GNAT supports project files" >&5
++echo "$as_me:27930: 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]*)
+@@ -27993,15 +27990,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:27996: result: $cf_gnat_projects" >&5
++echo "$as_me:27993: 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:28002: checking if GNAT supports libraries" >&5
++ echo "$as_me:27999: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:28004: result: $cf_gnat_libraries" >&5
++ echo "$as_me:28001: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -28021,7 +28018,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:28024: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:28021: 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
+@@ -28033,7 +28030,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:28036: checking for Ada95 compiler" >&5
++echo "$as_me:28033: 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.
+@@ -28044,12 +28041,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:28047: result: $cf_ada_compiler" >&5
++echo "$as_me:28044: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:28052: checking for Ada95 include directory" >&5
++echo "$as_me:28049: 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.
+@@ -28066,26 +28063,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+- ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28088: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28083: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28094,10 +28089,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:28097: result: $ADA_INCLUDE" >&5
++echo "$as_me:28092: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:28100: checking for Ada95 object directory" >&5
++echo "$as_me:28095: 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.
+@@ -28114,26 +28109,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28136: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28129: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28142,10 +28135,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:28145: result: $ADA_OBJECTS" >&5
++echo "$as_me:28138: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:28148: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28141: 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.
+@@ -28166,11 +28159,11 @@
+ fi
+ fi
+
+-echo "$as_me:28169: result: $with_ada_sharedlib" >&5
++echo "$as_me:28162: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:28173: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:28166: 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
+
+@@ -28188,7 +28181,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:28191: checking for Ada95 curses library name" >&5
++echo "$as_me:28184: 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.
+@@ -28204,7 +28197,7 @@
+ ;;
+ esac
+
+-echo "$as_me:28207: result: $ADA_LIBNAME" >&5
++echo "$as_me:28200: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ fi
+@@ -28215,13 +28208,13 @@
+
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+- echo "$as_me:28218: checking for wchar_t" >&5
++ echo "$as_me:28211: 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 28224 "configure"
++#line 28217 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28236,16 +28229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28232: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28242: \$? = $ac_status" >&5
++ echo "$as_me:28235: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28245: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28238: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28248: \$? = $ac_status" >&5
++ echo "$as_me:28241: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_wchar_t=yes
+ else
+@@ -28255,10 +28248,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28258: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28251: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+
+-echo "$as_me:28261: checking size of wchar_t" >&5
++echo "$as_me:28254: 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
+@@ -28267,7 +28260,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28270 "configure"
++#line 28263 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28279,21 +28272,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28275: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28285: \$? = $ac_status" >&5
++ echo "$as_me:28278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28288: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28281: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28291: \$? = $ac_status" >&5
++ echo "$as_me:28284: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28296 "configure"
++#line 28289 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28305,16 +28298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28301: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28311: \$? = $ac_status" >&5
++ echo "$as_me:28304: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28314: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28307: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28317: \$? = $ac_status" >&5
++ echo "$as_me:28310: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -28330,7 +28323,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28333 "configure"
++#line 28326 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28342,16 +28335,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28348: \$? = $ac_status" >&5
++ echo "$as_me:28341: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28351: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28344: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28354: \$? = $ac_status" >&5
++ echo "$as_me:28347: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -28367,7 +28360,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 28370 "configure"
++#line 28363 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28379,16 +28372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28385: \$? = $ac_status" >&5
++ echo "$as_me:28378: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28388: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28381: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28391: \$? = $ac_status" >&5
++ echo "$as_me:28384: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -28401,12 +28394,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:28404: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:28397: 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 28409 "configure"
++#line 28402 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28422,15 +28415,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28418: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28428: \$? = $ac_status" >&5
++ echo "$as_me:28421: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:28430: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28423: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28433: \$? = $ac_status" >&5
++ echo "$as_me:28426: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28446,7 +28439,7 @@
+ ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28449: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28442: 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
+@@ -28459,7 +28452,7 @@
+ then
+ test -n "$verbose" && echo " test failed (assume 2)" 1>&6
+
+-echo "${as_me:-configure}:28462: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28455: testing test failed (assume 2) ..." 1>&5
+
+ sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ mv confdefs.tmp confdefs.h
+@@ -28477,7 +28470,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28480: checking for library subsets" >&5
++echo "$as_me:28473: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -28531,7 +28524,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:28534: result: $LIB_SUBSETS" >&5
++echo "$as_me:28527: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -28562,7 +28555,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:28565: checking default library suffix" >&5
++echo "$as_me:28558: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28573,10 +28566,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28576: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28569: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:28579: checking default library-dependency suffix" >&5
++echo "$as_me:28572: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -28659,10 +28652,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:28662: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28655: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:28665: checking default object directory" >&5
++echo "$as_me:28658: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28678,11 +28671,11 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:28681: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28674: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28685: checking c++ library-dependency suffix" >&5
++echo "$as_me:28678: 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++)
+@@ -28775,7 +28768,7 @@
+ fi
+
+ fi
+-echo "$as_me:28778: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28771: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -28951,19 +28944,19 @@
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:28954: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:28947: 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 28959 "configure"
++#line 28952 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:28956: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28966: \$? = $ac_status" >&5
++ echo "$as_me:28959: \$? = $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
+@@ -28974,10 +28967,10 @@
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28977 "configure"
++#line 28970 "configure"
+ #include "confdefs.h"
+
+-#line 28980 "configure"
++#line 28973 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -28992,16 +28985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28998: \$? = $ac_status" >&5
++ echo "$as_me:28991: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:29001: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28994: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:29004: \$? = $ac_status" >&5
++ echo "$as_me:28997: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ # some linkers simply ignore the -dynamic
+@@ -29024,7 +29017,7 @@
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:29027: result: $cf_ldflags_static" >&5
++ echo "$as_me:29020: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test "$cf_ldflags_static" != yes
+@@ -29040,7 +29033,7 @@
+ ;;
+ esac
+
+-echo "$as_me:29043: checking where we will install curses.h" >&5
++echo "$as_me:29036: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+
+ includesubdir=
+@@ -29050,7 +29043,7 @@
+ then
+ includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29053: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29046: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29058,7 +29051,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:29061: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:29054: 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
+@@ -29083,7 +29076,7 @@
+
+ # pkgsrc uses these
+
+-echo "$as_me:29086: checking for desired basename for form library" >&5
++echo "$as_me:29079: 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.
+@@ -29103,10 +29096,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29106: result: $FORM_NAME" >&5
++echo "$as_me:29099: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:29109: checking for desired basename for menu library" >&5
++echo "$as_me:29102: 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.
+@@ -29126,10 +29119,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29129: result: $MENU_NAME" >&5
++echo "$as_me:29122: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:29132: checking for desired basename for panel library" >&5
++echo "$as_me:29125: 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.
+@@ -29149,10 +29142,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29152: result: $PANEL_NAME" >&5
++echo "$as_me:29145: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:29155: checking for desired basename for cxx library" >&5
++echo "$as_me:29148: 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.
+@@ -29172,13 +29165,13 @@
+ ;;
+ esac
+
+-echo "$as_me:29175: result: $CXX_NAME" >&5
++echo "$as_me:29168: 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:29181: checking for src modules" >&5
++echo "$as_me:29174: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -29237,7 +29230,7 @@
+ fi
+ fi
+ done
+-echo "$as_me:29240: result: $cf_cv_src_modules" >&5
++echo "$as_me:29233: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29398,7 +29391,7 @@
+ (*-D_XOPEN_SOURCE_EXTENDED*)
+ test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+
+-echo "${as_me:-configure}:29401: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29394: 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//'`
+@@ -29409,7 +29402,7 @@
+
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29412: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29405: 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
+@@ -29425,17 +29418,17 @@
+ done
+ test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29428: result: $PKG_CFLAGS" >&5
++echo "$as_me:29421: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+
+ case "$cf_cv_system_name" in
+ (cygwin*|msys*|mingw32*|mingw64|os2*)
+- GLOB_FULLPATH_ONLY='x/*|x[a-zA-Z]:[\\/]*'
+- GLOB_FULLPATH_ARGS='x/*\ |x[a-zA-Z]:[\\/]*\ '
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
+ ;;
+ (*)
+- GLOB_FULLPATH_ONLY='x/*'
+- GLOB_FULLPATH_ARGS='x/*\ '
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+ ;;
+ esac
+
+@@ -29497,7 +29490,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}:29500: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29493: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+
+ fi
+
+@@ -29524,7 +29517,7 @@
+
+ # This is used for the *-config script and *.pc data files.
+
+-echo "$as_me:29527: checking for linker search path" >&5
++echo "$as_me:29520: 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
+@@ -29572,7 +29565,7 @@
+ cf_pathlist="$cf_pathlist /lib /usr/lib"
+ ;;
+ (*)
+- { echo "$as_me:29575: WARNING: problem with Solaris architecture" >&5
++ { echo "$as_me:29568: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ ;;
+ esac
+@@ -29613,7 +29606,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+
+ fi
+-echo "$as_me:29616: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29609: 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'`
+@@ -29699,7 +29692,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29702: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29695: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29880,7 +29873,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:29883: error: ambiguous option: $1
++ { { echo "$as_me:29876: 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;}
+@@ -29899,7 +29892,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:29902: error: unrecognized option: $1
++ -*) { { echo "$as_me:29895: 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;}
+@@ -30029,7 +30022,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:30032: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:30025: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -30167,6 +30160,8 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
++s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
+ s,@LINT@,$LINT,;t t
+ s,@LINT_OPTS@,$LINT_OPTS,;t t
+ s,@LINT_LIBS@,$LINT_LIBS,;t t
+@@ -30411,8 +30406,6 @@
+ s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
+ s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
+ s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
+-s,@GLOB_FULLPATH_ONLY@,$GLOB_FULLPATH_ONLY,;t t
+-s,@GLOB_FULLPATH_ARGS@,$GLOB_FULLPATH_ARGS,;t t
+ s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
+ s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
+ s,@MAKE_DATABASE@,$MAKE_DATABASE,;t t
+@@ -30553,7 +30546,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:30556: creating $ac_file" >&5
++ { echo "$as_me:30549: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -30571,7 +30564,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30574: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30567: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -30584,7 +30577,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30587: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30580: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30600,7 +30593,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:30603: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:30596: 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;}
+@@ -30609,7 +30602,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:30612: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:30605: 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;}
+@@ -30654,7 +30647,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:30657: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:30650: 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;}
+@@ -30665,7 +30658,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:30668: WARNING: Some variables may not be substituted:
++ { echo "$as_me:30661: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30714,7 +30707,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:30717: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:30710: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -30725,7 +30718,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30728: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30721: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -30738,7 +30731,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30741: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30734: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30796,7 +30789,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:30799: $ac_file is unchanged" >&5
++ { echo "$as_me:30792: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31183,7 +31176,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}:31186: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31179: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+ with_shared_cxx=yes
+ ;;
+@@ -31569,7 +31562,7 @@
+ if test "$WITH_CURSES_H" = yes; then
+ cat >>headers.sh <<CF_EOF
+ case \$DST in
+-(/*/include/*)
++($GLOB_FULLPATH_POSIX/include/*)
+ END=\`basename \$DST\`
+ for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
+ do
+@@ -31586,7 +31579,7 @@
+ else
+ cat >>headers.sh <<CF_EOF
+ case \$DST in
+-(/*/include/*)
++($GLOB_FULLPATH_POSIX/include/*)
+ END=\`basename \$DST\`
+ for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`
+ do
+Index: dist.mk
+Prereq: 1.1624
+--- ncurses-6.5-20240727+/dist.mk 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/dist.mk 2024-08-10 09:45:21.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1624 2024/07/27 13:25:06 tom Exp $
++# $Id: dist.mk,v 1.1626 2024/08/10 09:45:21 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 = 20240727
++NCURSES_PATCH = 20240810
+
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: menu/menu.priv.h
+Prereq: 1.29
+--- ncurses-6.5-20240727+/menu/menu.priv.h 2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20240810/menu/menu.priv.h 2024-08-03 15:41:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey *
++ * Copyright 2020,2024 Thomas E. Dickey *
+ * Copyright 1998-2016,2017 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: menu.priv.h,v 1.29 2020/05/24 01:40:20 anonymous.maarten Exp $ */
++/* $Id: menu.priv.h,v 1.30 2024/08/03 15:41:22 tom Exp $ */
+
+ /***************************************************************************
+ * Module menu.priv.h *
+@@ -61,9 +61,6 @@
+ /* Normalize menu to default if none was given */
+ #define Normalize_Menu( menu ) ((menu)=(menu)?(menu):&_nc_Default_Menu)
+
+-#define Get_Menu_Screen( menu ) (menu->userwin ? \
+- _nc_screen_of(menu->userwin) : CURRENT_SCREEN)
+-
+ /* Get the user defined (framing) window of the menu */
+ #define Get_Menu_UserWin(menu) ((menu)->userwin ? \
+ (menu)->userwin : CURRENT_SCREEN->_stdscr)
+Index: misc/Makefile.in
+Prereq: 1.80
+--- ncurses-6.5-20240727+/misc/Makefile.in 2024-07-20 17:47:13.000000000 +0000
++++ ncurses-6.5-20240810/misc/Makefile.in 2024-08-04 14:49:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.80 2024/07/20 17:47:13 tom Exp $
++# $Id: Makefile.in,v 1.82 2024/08/04 14:49:08 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc. #
+@@ -75,6 +75,15 @@
+
+ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+
++BINDIR = $(DESTDIR)$(bindir)
++DATADIR = $(DESTDIR)$(datadir)
++
++@MAKE_DATABASE@INSTALL_PREFIX = $(DESTDIR)$(prefix)
++@MAKE_DATABASE@LIBDIR = $(DESTDIR)$(libdir)
++@MAKE_DATABASE@TICDIR = $(DESTDIR)$(ticdir)
++@MAKE_DATABASE@TICFILE = $(DESTDIR)$(ticfile)
++@MAKE_DATABASE@TABSETDIR = $(DESTDIR)$(tabsetdir)
++
+ ################################################################################
+
+ @MAKE_PHONY@.PHONY : all
+@@ -103,25 +112,19 @@
+ @MAKE_DATABASE@install :: @MISC_INSTALL_DATA@
+
+ @MAKE_DATABASE@install.data :: terminfo.tmp \
+-@MAKE_DATABASE@ $(DESTDIR)$(libdir) \
+-@MAKE_DATABASE@ $(DESTDIR)$(datadir) \
+-@MAKE_DATABASE@ $(DESTDIR)$(tabsetdir)
+-@MAKE_DATABASE@ DESTDIR=${DESTDIR} \
+-@MAKE_DATABASE@ prefix=${prefix} \
+-@MAKE_DATABASE@ exec_prefix=${exec_prefix} \
+-@MAKE_DATABASE@ bindir=${bindir} \
+-@MAKE_DATABASE@ top_srcdir=${top_srcdir} \
+-@MAKE_DATABASE@ srcdir=${srcdir} \
+-@MAKE_DATABASE@ datadir=${datadir} \
+-@MAKE_DATABASE@ ticdir=${ticdir} \
+-@MAKE_DATABASE@ source=terminfo.tmp \
+-@MAKE_DATABASE@ cross_compiling=@cross_compiling@ \
++@MAKE_DATABASE@ $(LIBDIR) \
++@MAKE_DATABASE@ $(DATADIR) \
++@MAKE_DATABASE@ $(TABSETDIR)
++@MAKE_DATABASE@ INSTALL_PREFIX=${INSTALL_PREFIX} \
++@MAKE_DATABASE@ TICDIR=${TICDIR} \
++@MAKE_DATABASE@ BINDIR=${BINDIR} \
++@MAKE_DATABASE@ tic_source=terminfo.tmp \
+ @MAKE_DATABASE@ $(SHELL) ./run_tic.sh
+ @MAKE_DATABASE@ @( cd $(srcdir)/tabset && \
+ @MAKE_DATABASE@ $(SHELL) -c 'for i in * ; do \
+ @MAKE_DATABASE@ if test -f $$i ; then \
+ @MAKE_DATABASE@ echo installing $$i; \
+-@MAKE_DATABASE@ $(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
++@MAKE_DATABASE@ $(INSTALL_DATA) $$i $(TABSETDIR)/$$i; \
+ @MAKE_DATABASE@ fi; done' )
+ install.data ::
+ @echo "finished $@"
+@@ -129,8 +132,8 @@
+ NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
+
+ install \
+-install.libs :: $(DESTDIR)$(bindir) ncurses-config
+- $(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
++install.libs :: $(BINDIR) ncurses-config
++ $(INSTALL_SCRIPT) ncurses-config $(BINDIR)/$(NCURSES_CONFIG)
+
+ # Make a list of the files that gen-pkgconfig might create:
+ @MAKE_PC_FILES@PC_FILES = \
+@@ -148,7 +151,7 @@
+ @MAKE_PC_FILES@install \
+ @MAKE_PC_FILES@install.libs :: pc-files
+ @MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
+-@MAKE_PC_FILES@ @GLOB_FULLPATH_ONLY@) \
++@MAKE_PC_FILES@ x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+ @MAKE_PC_FILES@ mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+ @MAKE_PC_FILES@ for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@ test -f $$name || continue; \
+@@ -177,23 +180,25 @@
+ datadir=${datadir} \
+ $(SHELL) $(srcdir)/gen_edit.sh >$@
+
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) \
+-$(DESTDIR)$(datadir) \
+-$(DESTDIR)$(tabsetdir) :
++$(BINDIR) \
++$(DATADIR) :
+ mkdir -p $@
+
++@MAKE_DATABASE@$(LIBDIR) \
++@MAKE_DATABASE@$(TABSETDIR) :
++@MAKE_DATABASE@ mkdir -p $@
++
+ uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs
+
+ uninstall.data :
+- -test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
+- -test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
+- -test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
++@MAKE_DATABASE@ -test -d $(TABSETDIR) && rm -rf $(TABSETDIR)
++@MAKE_DATABASE@ -test -d $(TICDIR) && rm -rf $(TICDIR)
++@MAKE_DATABASE@ -test -f $(TICFILE) && rm -f $(TICFILE)
+
+ uninstall.libs :
+- -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
++ -rm -f $(BINDIR)/$(NCURSES_CONFIG)
+ @MAKE_PC_FILES@ @$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
+-@MAKE_PC_FILES@ @GLOB_FULLPATH_ONLY@) \
++@MAKE_PC_FILES@ x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+ @MAKE_PC_FILES@ for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@ test -f $$name || continue; \
+ @MAKE_PC_FILES@ echo uninstalling $$name; \
+Index: misc/run_tic.in
+Prereq: 1.40
+--- ncurses-6.5-20240727+/misc/run_tic.in 2022-07-16 19:37:03.000000000 +0000
++++ ncurses-6.5-20240810/misc/run_tic.in 2024-08-04 14:50:26.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $
++# $Id: run_tic.in,v 1.41 2024/08/04 14:50:26 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2022 Thomas E. Dickey #
++# Copyright 2019-2022,2024 Thomas E. Dickey #
+ # Copyright 2000-2012,2017 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -42,22 +42,25 @@
+ # The script is designed to be run from the misc/Makefile as
+ # make install.data
+
+-: "${suffix:=@EXEEXT@}"
+-: "${DESTDIR:=@DESTDIR@}"
++# Symbols which are not overridden by misc/Makefile:
+ : "${prefix:=@prefix@}"
+ : "${exec_prefix:=@exec_prefix@}"
+-: "${bindir:=@bindir@}"
+ : "${top_srcdir:=@top_srcdir@}"
+ : "${srcdir:=@srcdir@}"
+ : "${datarootdir:=@datarootdir@}"
+ : "${datadir:=@datadir@}"
+-: "${TIC_PATH:=@TIC@}"
+-: "${ticdir:=@TERMINFO@}"
+-: "${source:=@TERMINFO_SRC@}"
+-: "${cross_compiling:=no}"
++: "${cross_compiling:=@cross_compiling@}"
++: "${suffix:=@EXEEXT@}"
++
+ : "${ext_funcs:=@NCURSES_EXT_FUNCS@}"
++: "${tic_path:=@TIC@}"
++: "${ticdir:=@TERMINFO@}"
++: "${tic_source:=@TERMINFO_SRC@}"
+
+-test -z "${DESTDIR}" && DESTDIR=
++# Symbols which $DESTDIR and/or install-prefix may affect:
++: "${INSTALL_PREFIX:=$prefix}"
++: "${BINDIR:=@bindir@}"
++: "${TICDIR:=$ticdir}"
+
+ # Allow tic to run either from the install-path, or from the build-directory.
+ # Do not do this if we appear to be cross-compiling. In that case, we rely
+@@ -68,21 +71,21 @@
+ then
+ case "$PATH" in
+ \@PATH_SEPARATOR@*)
+- PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH"
++ PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}$PATH"
+ ;;
+ *)
+- PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH"
++ PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}@PATH_SEPARATOR@$PATH"
+ ;;
+ esac
+ export PATH
+ if test @DFT_LWR_MODEL@ = shared
+ then
+ SHLIB="sh $srcdir/shlib"
+- TIC_PATH="$SHLIB tic"
++ tic_path="$SHLIB tic"
+ else
+- TIC_PATH="tic"
++ tic_path="tic"
+ fi
+- elif test "$TIC_PATH" = unknown
++ elif test "$tic_path" = unknown
+ then
+ echo "? no tic program found"
+ exit 1
+@@ -106,7 +109,7 @@
+
+ # don't use user's TERMINFO variable
+ unset TERMINFO_DIRS
+-TERMINFO="${DESTDIR}$ticdir" ; export TERMINFO
++TERMINFO="$TICDIR" ; export TERMINFO
+ umask 022
+
+ # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
+@@ -134,7 +137,7 @@
+
+ if test "$ext_funcs" = 1 ; then
+ cat <<EOF
+-Running $TIC_PATH to install $TERMINFO ...
++Running $tic_path to install $TERMINFO ...
+
+ You may see messages regarding extended capabilities, e.g., AX.
+ These are extended terminal capabilities which are compiled
+@@ -144,8 +147,8 @@
+ document, and install the terminfo without the -x option.
+
+ EOF
+-$TIC_PATH -V
+-if ( $TIC_PATH -x -s -o "$TERMINFO" $source )
++$tic_path -V
++if ( $tic_path -x -s -o "$TERMINFO" $tic_source )
+ then
+ echo "** built new $TERMINFO"
+ else
+@@ -154,7 +157,7 @@
+ fi
+ else
+ cat <<EOF
+-Running $TIC_PATH to install $TERMINFO ...
++Running $tic_path to install $TERMINFO ...
+
+ You may see messages regarding unknown capabilities, e.g., AX.
+ These are extended terminal capabilities which may be compiled
+@@ -164,8 +167,8 @@
+ document, and install the terminfo without the -x option.
+
+ EOF
+-$TIC_PATH -V
+-if ( $TIC_PATH -s -o "$TERMINFO" $source )
++$tic_path -V
++if ( $tic_path -s -o "$TERMINFO" $tic_source )
+ then
+ echo "** built new $TERMINFO"
+ else
+@@ -192,7 +195,7 @@
+ echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
+ fi
+ else
+- cd ${DESTDIR}$prefix || exit
++ cd ${INSTALL_PREFIX} || exit
+ # Construct a symbolic link that only assumes $ticdir has the
+ # same $prefix as the other installed directories.
+ RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240727+/package/debian-mingw/changelog 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/debian-mingw/changelog 2024-08-10 09:45:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240727) unstable; urgency=low
++ncurses6td (6.5+20240810) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Jul 2024 09:25:06 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 05:45:21 -0400
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240727+/package/debian-mingw64/changelog 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/debian-mingw64/changelog 2024-08-10 09:45:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240727) unstable; urgency=low
++ncurses6td (6.5+20240810) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Jul 2024 09:25:06 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 05:45:21 -0400
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.5-20240727+/package/debian/changelog 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/debian/changelog 2024-08-10 09:45:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240727) unstable; urgency=low
++ncurses6td (6.5+20240810) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Jul 2024 09:25:06 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 05:45:21 -0400
+
+ ncurses6 (5.9+20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.659
+--- ncurses-6.5-20240727+/package/mingw-ncurses.nsi 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/mingw-ncurses.nsi 2024-08-10 09:45:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.659 2024/07/27 13:25:06 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.661 2024/08/10 09:45:21 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 "0727"
++!define VERSION_MMDD "0810"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240727+/package/mingw-ncurses.spec 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/mingw-ncurses.spec 2024-08-10 09:45:21.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240727
++Release: 20240810
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240727+/package/ncurses.spec 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/ncurses.spec 2024-08-10 09:45:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240727
++Release: 20240810
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240727+/package/ncursest.spec 2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/ncursest.spec 2024-08-10 09:45:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240727
++Release: 20240810
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/aclocal.m4
+Prereq: 1.223
+--- ncurses-6.5-20240727+/test/aclocal.m4 2024-07-06 18:05:00.000000000 +0000
++++ ncurses-6.5-20240810/test/aclocal.m4 2024-08-10 14:31:42.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization. *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.223 2024/07/06 18:05:00 tom Exp $
++dnl $Id: aclocal.m4,v 1.227 2024/08/10 14:31:42 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -2009,13 +2009,14 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
++dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39
+ dnl ----------------
+ dnl Check for getopt's variables which are commonly defined in stdlib.h,
+ dnl unistd.h or (nonstandard) in getopt.h
+ AC_DEFUN([CF_GETOPT_HEADER],
+-[
+-AC_HAVE_HEADERS(unistd.h getopt.h)
++[AC_REQUIRE([AC_HEADER_STDC])
++
++AC_CHECK_HEADERS(getopt.h)
+ AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
+ cf_cv_getopt_header=none
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+@@ -2035,6 +2036,26 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
++dnl ----------------
++dnl Use this in case-statements to check for pathname syntax, i.e., absolute
++dnl pathnames. The "x" is assumed since we provide an alternate form for DOS.
++AC_DEFUN([CF_GLOB_FULLPATH],[
++AC_REQUIRE([CF_WITH_SYSTYPE])dnl
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
++ ;;
++(*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++ ;;
++esac
++AC_SUBST(GLOB_FULLPATH_POSIX)
++AC_SUBST(GLOB_FULLPATH_OTHER)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
+ dnl -------------
+ dnl Check if we must define _GNU_SOURCE to get a reasonable value for
+@@ -3255,35 +3276,35 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
++dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname. Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+ dnl result begins with 'NONE'. This is necessary to work around autoconf's
+ dnl delayed evaluation of those symbols.
+ AC_DEFUN([CF_PATH_SYNTAX],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++
+ if test "x$prefix" != xNONE; then
+ cf_path_syntax="$prefix"
+ else
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".[$]$1" in
+-(.\[$]\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x[$]$1" in
++(x\[$]\(*\)*|x\'*\'*)
+ ;;
+-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
++(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
+ eval $1="[$]$1"
+- case ".[$]$1" in
+- (.NONE/*)
++ case "x[$]$1" in
++ (xNONE/*)
+ $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+@@ -3522,15 +3543,16 @@
+ CF_CC_ENV_FLAGS
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
++dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
+ dnl ---------------
+ dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the
+ dnl misc/tabset install won't work properly. Usually this happens only when
+ dnl using the fallback mkinstalldirs script
+ AC_DEFUN([CF_PROG_INSTALL],
+ [AC_PROG_INSTALL
+-case $INSTALL in
+-(/*)
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+ (*)
+ CF_DIRNAME(cf_dir,$INSTALL)
+@@ -4062,12 +4084,12 @@
+ $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
++dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
+ dnl -----------
+ dnl Check for multibyte support, and if not found, utf8 compatibility library
+ AC_DEFUN([CF_UTF8_LIB],
+ [
+-AC_HAVE_HEADERS(wchar.h)
++AC_CHECK_HEADERS(wchar.h)
+ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+ cf_save_LIBS="$LIBS"
+ AC_TRY_LINK([
+@@ -4315,6 +4337,26 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
++dnl ---------------
++dnl For testing, override the derived host system-type which is used to decide
++dnl things such as the linker commands used to build shared libraries. This is
++dnl normally chosen automatically based on the type of system which you are
++dnl building on. We use it for testing the configure script.
++dnl
++dnl This is different from the --host option: it is used only for testing parts
++dnl of the configure script which would not be reachable with --host since that
++dnl relies on the build environment being real, rather than mocked up.
++AC_DEFUN([CF_WITH_SYSTYPE],[
++CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
++AC_ARG_WITH(system-type,
++ [ --with-system-type=XXX test: override derived host system-type],
++[AC_MSG_WARN(overriding system type to $withval)
++ cf_cv_system_name=$withval
++ host_os=$withval
++])
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
+ dnl ----------------
+ AC_DEFUN([CF_WITH_VALGRIND],[
+Index: test/configure
+--- ncurses-6.5-20240727+/test/configure 2024-07-06 18:05:23.000000000 +0000
++++ ncurses-6.5-20240810/test/configure 2024-08-10 15:48:47.000000000 +0000
+@@ -680,11 +680,6 @@
+
+ cat <<\EOF
+
+-Program names:
+- --program-prefix=PREFIX prepend PREFIX to installed program names
+- --program-suffix=SUFFIX append SUFFIX to installed program names
+- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+-
+ X features:
+ --x-includes=DIR X include files are in DIR
+ --x-libraries=DIR X library files are in DIR
+@@ -692,6 +687,7 @@
+ System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST build programs to run on HOST [BUILD]
++ --target=TARGET configure for building compilers for TARGET [HOST]
+ EOF
+ fi
+
+@@ -699,15 +695,16 @@
+
+ cat <<\EOF
+
+-Optional Features:
+- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+-
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+
++Optional Features:
++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
++
+ General Options:
++ --with-system-type=XXX test: override derived host system-type
+ --disable-stripping do not strip (debug info) installed executables
+ --with-strip-program=XX specify program to use when stripping in install
+ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics
+@@ -937,7 +934,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:940: loading site script $ac_site_file" >&5
++ { echo "$as_me:937: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+ cat "$ac_site_file" >&5
+ . "$ac_site_file"
+@@ -948,7 +945,7 @@
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+- { echo "$as_me:951: loading cache $cache_file" >&5
++ { echo "$as_me:948: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -956,7 +953,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:959: creating cache $cache_file" >&5
++ { echo "$as_me:956: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -972,21 +969,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:975: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:972: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+- { echo "$as_me:979: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:976: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+- { echo "$as_me:985: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:982: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+- { echo "$as_me:987: former value: $ac_old_val" >&5
++ { echo "$as_me:984: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:989: current value: $ac_new_val" >&5
++ { echo "$as_me:986: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1005,9 +1002,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1008: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1005: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- { { echo "$as_me:1010: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1007: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1036,10 +1033,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1039: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1042: \$? = $ac_status" >&5
++ echo "$as_me:1039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1071,7 +1068,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1074: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1071: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1081,11 +1078,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1088: checking build system type" >&5
++echo "$as_me:1085: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1094,24 +1091,23 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1097: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1094: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+- { { echo "$as_me:1101: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1098: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:1106: result: $ac_cv_build" >&5
++echo "$as_me:1103: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+-if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+- echo "$as_me:1114: checking host system type" >&5
++echo "$as_me:1110: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1120,18 +1116,46 @@
+ test -z "$ac_cv_host_alias" &&
+ ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+- { { echo "$as_me:1123: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++ { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:1128: result: $ac_cv_host" >&5
++echo "$as_me:1124: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
++if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
++ echo "$as_me:1132: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6
++if test "${ac_cv_target+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_target_alias=$target_alias
++test "x$ac_cv_target_alias" = "x" &&
++ ac_cv_target_alias=$ac_cv_host_alias
++ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
++ { { echo "$as_me:1141: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++ { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:1146: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6
++target=$ac_cv_target
++target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++# The aliases save the names the user supplied, while $host etc.
++# will get canonicalized.
++test -n "$target_alias" &&
++ test "$program_prefix$program_suffix$program_transform_name" = \
++ NONENONEs,x,x, &&
++ program_prefix=${target_alias}-
+ system_name="$host_os"
+ else
+ system_name="`(uname -s -r) 2>/dev/null`"
+@@ -1151,31 +1175,28 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1154: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1178: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+- echo "$as_me:1158: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1182: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+- { { echo "$as_me:1160: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1184: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+-test "$program_prefix" != NONE &&
+- program_transform_name="s,^,$program_prefix,;$program_transform_name"
+-# Use a double $ so make ignores it.
+-test "$program_suffix" != NONE &&
+- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+-# Double any \ or $. echo might interpret backslashes.
+-# By default was `s,x,x', remove it if useless.
+-cat <<\_ACEOF >conftest.sed
+-s/[\\$]/&&/g;s/;s,x,x,$//
+-_ACEOF
+-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++# Check whether --with-system-type or --without-system-type was given.
++if test "${with_system_type+set}" = set; then
++ withval="$with_system_type"
++ { echo "$as_me:1192: WARNING: overriding system type to $withval" >&5
++echo "$as_me: WARNING: overriding system type to $withval" >&2;}
++ cf_cv_system_name=$withval
++ host_os=$withval
++
++fi;
+
+-echo "$as_me:1178: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1199: 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
+@@ -1195,11 +1216,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:1198: result: yes" >&5
++ echo "$as_me:1219: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:1202: result: no" >&5
++ echo "$as_me:1223: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1213,7 +1234,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1216: checking for $ac_word" >&5
++echo "$as_me:1237: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1228,7 +1249,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1231: found $ac_dir/$ac_word" >&5
++echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1236,10 +1257,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1239: result: $CC" >&5
++ echo "$as_me:1260: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1242: result: no" >&5
++ echo "$as_me:1263: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1248,7 +1269,7 @@
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1251: checking for $ac_word" >&5
++echo "$as_me:1272: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1263,7 +1284,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1266: found $ac_dir/$ac_word" >&5
++echo "$as_me:1287: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1271,10 +1292,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1274: result: $ac_ct_CC" >&5
++ echo "$as_me:1295: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1277: result: no" >&5
++ echo "$as_me:1298: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1287,7 +1308,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1290: checking for $ac_word" >&5
++echo "$as_me:1311: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1302,7 +1323,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1305: found $ac_dir/$ac_word" >&5
++echo "$as_me:1326: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1310,10 +1331,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1313: result: $CC" >&5
++ echo "$as_me:1334: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1316: result: no" >&5
++ echo "$as_me:1337: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1322,7 +1343,7 @@
+ ac_ct_CC=$CC
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1325: checking for $ac_word" >&5
++echo "$as_me:1346: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1337,7 +1358,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1340: found $ac_dir/$ac_word" >&5
++echo "$as_me:1361: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1345,10 +1366,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1348: result: $ac_ct_CC" >&5
++ echo "$as_me:1369: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1351: result: no" >&5
++ echo "$as_me:1372: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1361,7 +1382,7 @@
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1364: checking for $ac_word" >&5
++echo "$as_me:1385: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1381,7 +1402,7 @@
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
++echo "$as_me:1405: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1403,10 +1424,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1406: result: $CC" >&5
++ echo "$as_me:1427: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1409: result: no" >&5
++ echo "$as_me:1430: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1417,7 +1438,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:1420: checking for $ac_word" >&5
++echo "$as_me:1441: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1432,7 +1453,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1435: found $ac_dir/$ac_word" >&5
++echo "$as_me:1456: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1440,10 +1461,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1443: result: $CC" >&5
++ echo "$as_me:1464: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1446: result: no" >&5
++ echo "$as_me:1467: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1456,7 +1477,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:1459: checking for $ac_word" >&5
++echo "$as_me:1480: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1471,7 +1492,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1474: found $ac_dir/$ac_word" >&5
++echo "$as_me:1495: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1479,10 +1500,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1482: result: $ac_ct_CC" >&5
++ echo "$as_me:1503: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1485: result: no" >&5
++ echo "$as_me:1506: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1494,32 +1515,32 @@
+
+ fi
+
+-test -z "$CC" && { { echo "$as_me:1497: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1518: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-echo "$as_me:1502:" \
++echo "$as_me:1523:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1505: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1526: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1508: \$? = $ac_status" >&5
++ echo "$as_me:1529: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1510: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1531: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1513: \$? = $ac_status" >&5
++ echo "$as_me:1534: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1515: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1536: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1518: \$? = $ac_status" >&5
++ echo "$as_me:1539: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1522 "configure"
++#line 1543 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1535,13 +1556,13 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1538: checking for C compiler default output" >&5
++echo "$as_me:1559: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
+-if { (eval echo "$as_me:1541: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1562: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:1544: \$? = $ac_status" >&5
++ echo "$as_me:1565: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ # Find the output, starting from the most likely. This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1564,34 +1585,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1567: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1588: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+ { (exit 77); exit 77; }; }
+ fi
+
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1573: result: $ac_file" >&5
++echo "$as_me:1594: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+
+ # Check the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1578: checking whether the C compiler works" >&5
++echo "$as_me:1599: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+ if { ac_try='./$ac_file'
+- { (eval echo "$as_me:1584: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1605: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1587: \$? = $ac_status" >&5
++ echo "$as_me:1608: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:1594: error: cannot run C compiled programs.
++ { { echo "$as_me:1615: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1599,24 +1620,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:1602: result: yes" >&5
++echo "$as_me:1623: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+ rm -f a.out a.exe "conftest$ac_cv_exeext"
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1609: checking whether we are cross compiling" >&5
++echo "$as_me:1630: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1611: result: $cross_compiling" >&5
++echo "$as_me:1632: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:1614: checking for executable suffix" >&5
++echo "$as_me:1635: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1616: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:1619: \$? = $ac_status" >&5
++ echo "$as_me:1640: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+@@ -1632,25 +1653,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:1635: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:1656: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f "conftest$ac_cv_exeext"
+-echo "$as_me:1641: result: $ac_cv_exeext" >&5
++echo "$as_me:1662: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+
+ rm -f "conftest.$ac_ext"
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1647: checking for object suffix" >&5
++echo "$as_me:1668: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1653 "configure"
++#line 1674 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1662,10 +1683,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1668: \$? = $ac_status" >&5
++ echo "$as_me:1689: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ case $ac_file in
+@@ -1677,24 +1698,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1680: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1701: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1687: result: $ac_cv_objext" >&5
++echo "$as_me:1708: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1691: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1712: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1697 "configure"
++#line 1718 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1709,16 +1730,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1715: \$? = $ac_status" >&5
++ echo "$as_me:1736: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1718: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1739: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1721: \$? = $ac_status" >&5
++ echo "$as_me:1742: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -1730,19 +1751,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:1733: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1754: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1739: checking whether $CC accepts -g" >&5
++echo "$as_me:1760: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1745 "configure"
++#line 1766 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1754,16 +1775,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1760: \$? = $ac_status" >&5
++ echo "$as_me:1781: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1763: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1784: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1766: \$? = $ac_status" >&5
++ echo "$as_me:1787: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -1773,7 +1794,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1776: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1797: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+@@ -1800,16 +1821,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1806: \$? = $ac_status" >&5
++ echo "$as_me:1827: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1809: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1830: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1812: \$? = $ac_status" >&5
++ echo "$as_me:1833: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -1821,7 +1842,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1824 "configure"
++#line 1845 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1834,16 +1855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1840: \$? = $ac_status" >&5
++ echo "$as_me:1861: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1843: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1864: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1846: \$? = $ac_status" >&5
++ echo "$as_me:1867: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -1853,7 +1874,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1856 "configure"
++#line 1877 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1865,16 +1886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1871: \$? = $ac_status" >&5
++ echo "$as_me:1892: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1874: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1877: \$? = $ac_status" >&5
++ echo "$as_me:1898: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -1904,11 +1925,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:1907: checking version of $CC" >&5
++ echo "$as_me:1928: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ test -z "$GCC_VERSION" && GCC_VERSION=unknown
+- echo "$as_me:1911: result: $GCC_VERSION" >&5
++ echo "$as_me:1932: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -1917,12 +1938,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:1920: checking if this is really Intel C compiler" >&5
++ echo "$as_me:1941: checking if this is really Intel C compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -no-gcc"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1925 "configure"
++#line 1946 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1939,16 +1960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1945: \$? = $ac_status" >&5
++ echo "$as_me:1966: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1948: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1969: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1951: \$? = $ac_status" >&5
++ echo "$as_me:1972: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1959,7 +1980,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:1962: result: $INTEL_COMPILER" >&5
++ echo "$as_me:1983: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -1968,11 +1989,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:1971: checking if this is really Clang C compiler" >&5
++ echo "$as_me:1992: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1975 "configure"
++#line 1996 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1989,16 +2010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1995: \$? = $ac_status" >&5
++ echo "$as_me:2016: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2019: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2001: \$? = $ac_status" >&5
++ echo "$as_me:2022: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2008,7 +2029,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2011: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2032: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2017,30 +2038,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2020: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2041: 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:2027: checking version of $CC" >&5
++ echo "$as_me:2048: 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:2031: result: $CLANG_VERSION" >&5
++ echo "$as_me:2052: 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:2038: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2059: 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 2043 "configure"
++#line 2064 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2054,16 +2075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2078: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2060: \$? = $ac_status" >&5
++ echo "$as_me:2081: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2063: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2084: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2066: \$? = $ac_status" >&5
++ echo "$as_me:2087: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2074,13 +2095,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2077: result: $cf_clang_optok" >&5
++ echo "$as_me:2098: 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}:2083: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2104: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2089,7 +2110,7 @@
+ done
+ fi
+
+-echo "$as_me:2092: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2113: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2097,7 +2118,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2100 "configure"
++#line 2121 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2144,16 +2165,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2150: \$? = $ac_status" >&5
++ echo "$as_me:2171: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2153: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2174: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2156: \$? = $ac_status" >&5
++ echo "$as_me:2177: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2170,10 +2191,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2173: result: none needed" >&5
++ echo "$as_me:2194: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2176: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2181,13 +2202,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2184: checking \$CFLAGS variable" >&5
++echo "$as_me:2205: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2188: result: broken" >&5
++ echo "$as_me:2209: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2190: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2211: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+ cf_flags="$CFLAGS"
+ CFLAGS=
+@@ -2295,18 +2316,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:2298: result: ok" >&5
++ echo "$as_me:2319: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2303: checking \$CC variable" >&5
++echo "$as_me:2324: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:2307: result: broken" >&5
++ echo "$as_me:2328: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2309: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:2330: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ # humor him...
+ cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+@@ -2423,24 +2444,24 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:2426: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2430: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2434: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:2438: result: ok" >&5
++ echo "$as_me:2459: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2443: checking for inline" >&5
++echo "$as_me:2464: 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
+@@ -2448,7 +2469,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2451 "configure"
++#line 2472 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -2457,16 +2478,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2463: \$? = $ac_status" >&5
++ echo "$as_me:2484: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2466: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2487: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2469: \$? = $ac_status" >&5
++ echo "$as_me:2490: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2477,7 +2498,7 @@
+ done
+
+ fi
+-echo "$as_me:2480: result: $ac_cv_c_inline" >&5
++echo "$as_me:2501: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -2496,7 +2517,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:2499: checking for $ac_word" >&5
++echo "$as_me:2520: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2511,7 +2532,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:2514: found $ac_dir/$ac_word" >&5
++echo "$as_me:2535: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2519,10 +2540,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:2522: result: $GREP" >&5
++ echo "$as_me:2543: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:2525: result: no" >&5
++ echo "$as_me:2546: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2530,7 +2551,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:2533: checking for egrep" >&5
++echo "$as_me:2554: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2542,7 +2563,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:2545: checking for $ac_word" >&5
++echo "$as_me:2566: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2559,7 +2580,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_EGREP="$ac_dir/$ac_word"
+- echo "$as_me:2562: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2583: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2570,10 +2591,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:2573: result: $EGREP" >&5
++ echo "$as_me:2594: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:2576: result: no" >&5
++ echo "$as_me:2597: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2581,12 +2602,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2584: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2605: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:2589: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2610: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -2596,7 +2617,7 @@
+ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+-echo "$as_me:2599: checking how to run the C preprocessor" >&5
++echo "$as_me:2620: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -2617,18 +2638,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 2620 "configure"
++#line 2641 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2625: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2646: \"$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:2631: \$? = $ac_status" >&5
++ echo "$as_me:2652: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2651,17 +2672,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2654 "configure"
++#line 2675 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2658: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2679: \"$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:2664: \$? = $ac_status" >&5
++ echo "$as_me:2685: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2698,7 +2719,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2701: result: $CPP" >&5
++echo "$as_me:2722: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2708,18 +2729,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 2711 "configure"
++#line 2732 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2716: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2737: \"$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:2722: \$? = $ac_status" >&5
++ echo "$as_me:2743: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2742,17 +2763,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2745 "configure"
++#line 2766 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2770: \"$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:2755: \$? = $ac_status" >&5
++ echo "$as_me:2776: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2780,7 +2801,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:2783: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:2804: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2796,7 +2817,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:2799: checking for $ac_word" >&5
++echo "$as_me:2820: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2811,7 +2832,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2814: found $ac_dir/$ac_word" >&5
++echo "$as_me:2835: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2819,16 +2840,27 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:2822: result: $AWK" >&5
++ echo "$as_me:2843: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:2825: result: no" >&5
++ echo "$as_me:2846: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ test -n "$AWK" && break
+ done
+
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
++ ;;
++(*)
++ GLOB_FULLPATH_POSIX='/*'
++ GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++ ;;
++esac
++
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -2841,7 +2873,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:2844: checking for a BSD compatible install" >&5
++echo "$as_me:2876: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -2890,7 +2922,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:2893: result: $INSTALL" >&5
++echo "$as_me:2925: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2901,8 +2933,8 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-case $INSTALL in
+-(/*)
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+ (*)
+ cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
+@@ -2911,7 +2943,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2914: checking if you want to install stripped executables" >&5
++echo "$as_me:2946: 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.
+@@ -2928,7 +2960,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:2931: result: $enable_stripping" >&5
++echo "$as_me:2963: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -2939,7 +2971,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:2942: checking if install accepts -p option" >&5
++echo "$as_me:2974: 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
+@@ -2970,10 +3002,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:2973: result: $cf_cv_install_p" >&5
++echo "$as_me:3005: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:2976: checking if install needs to be told about ownership" >&5
++echo "$as_me:3008: 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)
+@@ -2984,7 +3016,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2987: result: $with_install_o" >&5
++echo "$as_me:3019: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -2995,7 +3027,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:2998: checking if you want to specify strip-program" >&5
++ echo "$as_me:3030: 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.
+@@ -3005,11 +3037,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:3008: result: $with_strip_program" >&5
++ echo "$as_me:3040: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:3012: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:3044: 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
+@@ -3030,11 +3062,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:3033: result: $check_install_strip" >&5
++ echo "$as_me:3065: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:3037: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:3069: 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
+ ;;
+@@ -3049,7 +3081,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:3052: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3084: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -3063,7 +3095,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:3066: checking for $ac_word" >&5
++echo "$as_me:3098: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LINT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3078,7 +3110,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3081: found $ac_dir/$ac_word" >&5
++echo "$as_me:3113: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3086,10 +3118,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+- echo "$as_me:3089: result: $LINT" >&5
++ echo "$as_me:3121: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+- echo "$as_me:3092: result: no" >&5
++ echo "$as_me:3124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3102,7 +3134,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3105: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3137: 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
+@@ -3157,14 +3189,14 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3160: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3192: 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:3167: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3199: 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
+@@ -3191,7 +3223,7 @@
+ fi
+
+ fi
+-echo "$as_me:3194: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3226: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3202,7 +3234,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:3205: checking for $ac_word" >&5
++echo "$as_me:3237: 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
+@@ -3217,7 +3249,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3220: found $ac_dir/$ac_word" >&5
++echo "$as_me:3252: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3225,10 +3257,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:3228: result: $CTAGS" >&5
++ echo "$as_me:3260: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:3231: result: no" >&5
++ echo "$as_me:3263: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3239,7 +3271,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:3242: checking for $ac_word" >&5
++echo "$as_me:3274: 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
+@@ -3254,7 +3286,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3257: found $ac_dir/$ac_word" >&5
++echo "$as_me:3289: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3262,10 +3294,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:3265: result: $ETAGS" >&5
++ echo "$as_me:3297: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:3268: result: no" >&5
++ echo "$as_me:3300: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3274,7 +3306,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:3277: checking for $ac_word" >&5
++echo "$as_me:3309: 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
+@@ -3289,7 +3321,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:3292: found $ac_dir/$ac_word" >&5
++echo "$as_me:3324: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3298,17 +3330,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:3301: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:3333: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:3304: result: no" >&5
++ echo "$as_me:3336: 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:3311: checking for $ac_word" >&5
++echo "$as_me:3343: 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
+@@ -3323,7 +3355,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:3326: found $ac_dir/$ac_word" >&5
++echo "$as_me:3358: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3332,10 +3364,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:3335: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:3367: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:3338: result: no" >&5
++ echo "$as_me:3370: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3355,14 +3387,14 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:3358: checking if -lm needed for math functions" >&5
++echo "$as_me:3390: 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 3365 "configure"
++#line 3397 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3378,16 +3410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3381: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3413: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3384: \$? = $ac_status" >&5
++ echo "$as_me:3416: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3387: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3419: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3390: \$? = $ac_status" >&5
++ echo "$as_me:3422: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -3397,7 +3429,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3400: result: $cf_cv_need_libm" >&5
++echo "$as_me:3432: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -3405,14 +3437,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:3408: checking if -lm is available for math functions" >&5
++ echo "$as_me:3440: 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 3415 "configure"
++#line 3447 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3428,16 +3460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3431: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3463: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3434: \$? = $ac_status" >&5
++ echo "$as_me:3466: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3437: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3469: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3440: \$? = $ac_status" >&5
++ echo "$as_me:3472: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -3447,7 +3479,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3450: result: $cf_cv_have_libm" >&5
++echo "$as_me:3482: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -3502,7 +3534,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+
+-echo "$as_me:3505: checking for fgrep" >&5
++echo "$as_me:3537: 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
+@@ -3514,7 +3546,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:3517: checking for $ac_word" >&5
++echo "$as_me:3549: 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
+@@ -3531,7 +3563,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:3534: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3566: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3542,10 +3574,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:3545: result: $FGREP" >&5
++ echo "$as_me:3577: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:3548: result: no" >&5
++ echo "$as_me:3580: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3553,16 +3585,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3556: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3588: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:3561: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3593: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:3565: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3597: 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.
+@@ -3579,17 +3611,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:3582: result: $enable_stdnoreturn" >&5
++echo "$as_me:3614: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3586: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3618: 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 3592 "configure"
++#line 3624 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -3605,16 +3637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3611: \$? = $ac_status" >&5
++ echo "$as_me:3643: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3614: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3646: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3617: \$? = $ac_status" >&5
++ echo "$as_me:3649: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -3625,7 +3657,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:3628: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3660: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -3664,10 +3696,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:3667: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:3699: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 3670 "${as_me:-configure}"
++#line 3702 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3717,12 +3749,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3723: \$? = $ac_status" >&5
++ echo "$as_me:3755: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:3725: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:3757: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -3781,7 +3813,7 @@
+ rm -rf ./conftest*
+ fi
+
+-echo "$as_me:3784: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3816: 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.
+@@ -3791,7 +3823,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:3794: result: $enable_string_hacks" >&5
++echo "$as_me:3826: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3800,15 +3832,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:3803: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:3835: 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:3805: checking for strlcat" >&5
++ echo "$as_me:3837: 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 3811 "configure"
++#line 3843 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3839,16 +3871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3874: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3845: \$? = $ac_status" >&5
++ echo "$as_me:3877: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3848: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3880: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3851: \$? = $ac_status" >&5
++ echo "$as_me:3883: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -3858,7 +3890,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3861: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3893: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -3868,7 +3900,7 @@
+
+ else
+
+- echo "$as_me:3871: checking for strlcat in -lbsd" >&5
++ echo "$as_me:3903: 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
+@@ -3876,7 +3908,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3879 "configure"
++#line 3911 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -3895,16 +3927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3930: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3901: \$? = $ac_status" >&5
++ echo "$as_me:3933: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3904: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3936: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3907: \$? = $ac_status" >&5
++ echo "$as_me:3939: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3915,7 +3947,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3918: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3950: 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
+
+@@ -3938,23 +3970,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3941: checking for $ac_header" >&5
++echo "$as_me:3973: 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 3947 "configure"
++#line 3979 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3983: \"$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:3957: \$? = $ac_status" >&5
++ echo "$as_me:3989: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3973,7 +4005,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:3976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:4008: 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
+@@ -3994,13 +4026,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:3997: checking for $ac_func" >&5
++echo "$as_me:4029: 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 4003 "configure"
++#line 4035 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4031,16 +4063,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4066: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4037: \$? = $ac_status" >&5
++ echo "$as_me:4069: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:4040: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4072: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4043: \$? = $ac_status" >&5
++ echo "$as_me:4075: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -4050,7 +4082,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4053: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4085: 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
+@@ -4062,14 +4094,14 @@
+
+ fi
+
+-echo "$as_me:4065: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:4097: 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 4072 "configure"
++#line 4104 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4088,16 +4120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4123: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4094: \$? = $ac_status" >&5
++ echo "$as_me:4126: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4097: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4129: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4100: \$? = $ac_status" >&5
++ echo "$as_me:4132: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -4108,7 +4140,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4111: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4143: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4150,14 +4182,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:4153: checking if this is the GNU C library" >&5
++echo "$as_me:4185: 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 4160 "configure"
++#line 4192 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4176,16 +4208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4182: \$? = $ac_status" >&5
++ echo "$as_me:4214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4185: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4188: \$? = $ac_status" >&5
++ echo "$as_me:4220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -4196,7 +4228,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4199: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4231: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4204,7 +4236,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:4207: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:4239: 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
+@@ -4216,7 +4248,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4219 "configure"
++#line 4251 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4235,16 +4267,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4270: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4241: \$? = $ac_status" >&5
++ echo "$as_me:4273: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4244: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4276: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4247: \$? = $ac_status" >&5
++ echo "$as_me:4279: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -4256,12 +4288,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:4259: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4291: 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:4264: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:4296: 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
+@@ -4366,7 +4398,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4369 "configure"
++#line 4401 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -4386,16 +4418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4392: \$? = $ac_status" >&5
++ echo "$as_me:4424: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4395: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4427: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4398: \$? = $ac_status" >&5
++ echo "$as_me:4430: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4406,7 +4438,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4409: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4441: 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
+@@ -4415,14 +4447,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:4418: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:4450: 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 4425 "configure"
++#line 4457 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4437,16 +4469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4443: \$? = $ac_status" >&5
++ echo "$as_me:4475: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4446: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4478: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4449: \$? = $ac_status" >&5
++ echo "$as_me:4481: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4553,7 +4585,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4556 "configure"
++#line 4588 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4568,16 +4600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4574: \$? = $ac_status" >&5
++ echo "$as_me:4606: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4577: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4609: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4580: \$? = $ac_status" >&5
++ echo "$as_me:4612: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4592,12 +4624,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4595: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4627: 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:4600: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:4632: 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
+@@ -4607,7 +4639,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4610 "configure"
++#line 4642 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4622,16 +4654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4628: \$? = $ac_status" >&5
++ echo "$as_me:4660: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4631: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4663: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4634: \$? = $ac_status" >&5
++ echo "$as_me:4666: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -4642,7 +4674,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4645: result: $cf_cv_default_source" >&5
++echo "$as_me:4677: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -4679,16 +4711,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:4682: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4714: 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}:4688: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4720: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4691 "configure"
++#line 4723 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4703,16 +4735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4706: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4738: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4709: \$? = $ac_status" >&5
++ echo "$as_me:4741: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4712: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4744: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4715: \$? = $ac_status" >&5
++ echo "$as_me:4747: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -4733,7 +4765,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4736 "configure"
++#line 4768 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4748,16 +4780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4754: \$? = $ac_status" >&5
++ echo "$as_me:4786: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4757: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4789: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4760: \$? = $ac_status" >&5
++ echo "$as_me:4792: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4768,7 +4800,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4776,10 +4808,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:4779: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4811: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4782 "configure"
++#line 4814 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4794,16 +4826,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4800: \$? = $ac_status" >&5
++ echo "$as_me:4832: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4803: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4835: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4806: \$? = $ac_status" >&5
++ echo "$as_me:4838: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4819,7 +4851,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4822: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4854: 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
+@@ -4936,7 +4968,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:4939: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:4971: 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
+@@ -4968,14 +5000,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:4971: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5003: 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 4978 "configure"
++#line 5010 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -4993,16 +5025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5028: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4999: \$? = $ac_status" >&5
++ echo "$as_me:5031: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5002: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5034: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5005: \$? = $ac_status" >&5
++ echo "$as_me:5037: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5014,7 +5046,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5017 "configure"
++#line 5049 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5032,16 +5064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5038: \$? = $ac_status" >&5
++ echo "$as_me:5070: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5041: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5073: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5044: \$? = $ac_status" >&5
++ echo "$as_me:5076: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5056,7 +5088,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5059: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5091: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5216,16 +5248,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:5219: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5251: 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}:5225: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5257: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5228 "configure"
++#line 5260 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5240,16 +5272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5246: \$? = $ac_status" >&5
++ echo "$as_me:5278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5249: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5281: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5252: \$? = $ac_status" >&5
++ echo "$as_me:5284: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -5270,7 +5302,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5273 "configure"
++#line 5305 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5285,16 +5317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5320: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5291: \$? = $ac_status" >&5
++ echo "$as_me:5323: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5294: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5326: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5297: \$? = $ac_status" >&5
++ echo "$as_me:5329: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5305,7 +5337,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5313,10 +5345,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:5316: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5348: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5319 "configure"
++#line 5351 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5331,16 +5363,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5334: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5337: \$? = $ac_status" >&5
++ echo "$as_me:5369: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5340: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5372: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5343: \$? = $ac_status" >&5
++ echo "$as_me:5375: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5356,7 +5388,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5359: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5391: 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
+@@ -5469,10 +5501,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}:5472: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5504: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5475 "configure"
++#line 5507 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5490,23 +5522,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5525: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5496: \$? = $ac_status" >&5
++ echo "$as_me:5528: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5499: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5531: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5502: \$? = $ac_status" >&5
++ echo "$as_me:5534: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:5509: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:5541: 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
+@@ -5529,7 +5561,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}:5532: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5564: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -5541,7 +5573,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}:5544: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5576: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5629,7 +5661,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:5632: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5664: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5639,7 +5671,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:5642: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5674: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5649,7 +5681,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}:5652: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5684: 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"
+@@ -5661,10 +5693,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:5664: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:5696: 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 5667 "configure"
++#line 5699 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5679,16 +5711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5685: \$? = $ac_status" >&5
++ echo "$as_me:5717: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5688: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5720: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5691: \$? = $ac_status" >&5
++ echo "$as_me:5723: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5697,12 +5729,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:5700: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:5732: 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 5705 "configure"
++#line 5737 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5717,16 +5749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5723: \$? = $ac_status" >&5
++ echo "$as_me:5755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5726: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5729: \$? = $ac_status" >&5
++ echo "$as_me:5761: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5737,19 +5769,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:5740: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:5772: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:5745: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5777: 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 5752 "configure"
++#line 5784 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5767,16 +5799,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5773: \$? = $ac_status" >&5
++ echo "$as_me:5805: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5776: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5808: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5779: \$? = $ac_status" >&5
++ echo "$as_me:5811: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5788,7 +5820,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5791 "configure"
++#line 5823 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5806,16 +5838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5841: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5812: \$? = $ac_status" >&5
++ echo "$as_me:5844: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5815: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5847: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5818: \$? = $ac_status" >&5
++ echo "$as_me:5850: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5830,7 +5862,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5833: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5865: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5977,13 +6009,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:5980: checking for ANSI C header files" >&5
++echo "$as_me:6012: 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 5986 "configure"
++#line 6018 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -5991,13 +6023,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:5994: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6026: \"$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:6000: \$? = $ac_status" >&5
++ echo "$as_me:6032: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6019,7 +6051,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 6022 "configure"
++#line 6054 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6037,7 +6069,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 6040 "configure"
++#line 6072 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6058,7 +6090,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6061 "configure"
++#line 6093 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6084,15 +6116,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6087: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6090: \$? = $ac_status" >&5
++ echo "$as_me:6122: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6092: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6124: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6095: \$? = $ac_status" >&5
++ echo "$as_me:6127: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6105,7 +6137,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6108: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6140: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6121,28 +6153,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6124: checking for $ac_header" >&5
++echo "$as_me:6156: 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 6130 "configure"
++#line 6162 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6139: \$? = $ac_status" >&5
++ echo "$as_me:6171: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6142: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6174: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6145: \$? = $ac_status" >&5
++ echo "$as_me:6177: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6152,7 +6184,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6187: 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
+@@ -6162,13 +6194,13 @@
+ fi
+ done
+
+-echo "$as_me:6165: checking whether exit is declared" >&5
++echo "$as_me:6197: 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 6171 "configure"
++#line 6203 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6183,16 +6215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6186: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6189: \$? = $ac_status" >&5
++ echo "$as_me:6221: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6192: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6224: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6195: \$? = $ac_status" >&5
++ echo "$as_me:6227: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6202,10 +6234,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6205: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6237: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+
+-echo "$as_me:6208: checking for signal global datatype" >&5
++echo "$as_me:6240: 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
+@@ -6217,7 +6249,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6220 "configure"
++#line 6252 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6241,16 +6273,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6244: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6247: \$? = $ac_status" >&5
++ echo "$as_me:6279: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6250: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6282: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6253: \$? = $ac_status" >&5
++ echo "$as_me:6285: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6264,7 +6296,7 @@
+
+ fi
+
+-echo "$as_me:6267: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6299: 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
+@@ -6273,14 +6305,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:6276: checking if SIGWINCH is defined" >&5
++echo "$as_me:6308: 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 6283 "configure"
++#line 6315 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6295,23 +6327,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6301: \$? = $ac_status" >&5
++ echo "$as_me:6333: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6304: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6336: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6307: \$? = $ac_status" >&5
++ echo "$as_me:6339: \$? = $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 6314 "configure"
++#line 6346 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6329,16 +6361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6335: \$? = $ac_status" >&5
++ echo "$as_me:6367: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6338: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6370: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6341: \$? = $ac_status" >&5
++ echo "$as_me:6373: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -6352,11 +6384,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6355: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6387: 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:6359: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6391: 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
+@@ -6367,7 +6399,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6370 "configure"
++#line 6402 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6389,16 +6421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6392: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6395: \$? = $ac_status" >&5
++ echo "$as_me:6427: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6398: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6430: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6401: \$? = $ac_status" >&5
++ echo "$as_me:6433: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -6412,7 +6444,7 @@
+ done
+
+ fi
+-echo "$as_me:6415: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6447: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6422,13 +6454,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:6425: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6457: 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 6431 "configure"
++#line 6463 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6442,16 +6474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6448: \$? = $ac_status" >&5
++ echo "$as_me:6480: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6451: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6483: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6454: \$? = $ac_status" >&5
++ echo "$as_me:6486: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -6462,7 +6494,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6465: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6497: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -6472,7 +6504,7 @@
+
+ fi
+
+-echo "$as_me:6475: checking if you want to use pkg-config" >&5
++echo "$as_me:6507: 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.
+@@ -6482,7 +6514,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:6485: result: $cf_pkg_config" >&5
++echo "$as_me:6517: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -6494,7 +6526,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:6497: checking for $ac_word" >&5
++echo "$as_me:6529: 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
+@@ -6511,7 +6543,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:6514: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6546: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6522,10 +6554,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:6525: result: $PKG_CONFIG" >&5
++ echo "$as_me:6557: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:6528: result: no" >&5
++ echo "$as_me:6560: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6534,7 +6566,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:6537: checking for $ac_word" >&5
++echo "$as_me:6569: 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
+@@ -6551,7 +6583,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:6554: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6586: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6563,10 +6595,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:6566: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:6598: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:6569: result: no" >&5
++ echo "$as_me:6601: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6590,37 +6622,35 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$PKG_CONFIG" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$PKG_CONFIG" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+- ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval PKG_CONFIG="$PKG_CONFIG"
+- case ".$PKG_CONFIG" in
+- (.NONE/*)
++ case "x$PKG_CONFIG" in
++ (xNONE/*)
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:6642: 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:6619: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:6649: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+
+-echo "$as_me:6623: checking if you want to see long compiling messages" >&5
++echo "$as_me:6653: 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.
+@@ -6654,10 +6684,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:6657: result: $enableval" >&5
++echo "$as_me:6687: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:6660: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6690: 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.
+@@ -6667,10 +6697,10 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6670: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6700: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+
+-echo "$as_me:6673: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6703: 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.
+@@ -6687,10 +6717,10 @@
+ cf_enable_widec=yes
+
+ fi;
+-echo "$as_me:6690: result: $cf_enable_widec" >&5
++echo "$as_me:6720: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+
+-echo "$as_me:6693: checking for specific curses-directory" >&5
++echo "$as_me:6723: 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.
+@@ -6700,7 +6730,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6703: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6733: 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"
+@@ -6712,26 +6742,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval withval="$withval"
+- case ".$withval" in
+- (.NONE/*)
++ case "x$withval" in
++ (xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6734: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:6762: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -6767,7 +6795,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6770 "configure"
++#line 6798 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6779,16 +6807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6785: \$? = $ac_status" >&5
++ echo "$as_me:6813: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6788: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6791: \$? = $ac_status" >&5
++ echo "$as_me:6819: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6805,7 +6833,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}:6808: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6836: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6841,7 +6869,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}:6844: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6872: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -6854,7 +6882,7 @@
+
+ cf_cv_screen=curses
+
+-echo "$as_me:6857: checking for specified curses library type" >&5
++echo "$as_me:6885: 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.
+@@ -6898,13 +6926,13 @@
+ fi;
+ fi;
+
+-echo "$as_me:6901: result: $cf_cv_screen" >&5
++echo "$as_me:6929: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+
+ case $cf_cv_screen in
+ (curses|curses_*)
+
+-echo "$as_me:6907: checking for extra include directories" >&5
++echo "$as_me:6935: 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
+@@ -6930,7 +6958,7 @@
+ esac
+
+ fi
+-echo "$as_me:6933: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:6961: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6940,7 +6968,7 @@
+
+ fi
+
+-echo "$as_me:6943: checking if we have identified curses headers" >&5
++echo "$as_me:6971: 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
+@@ -6952,7 +6980,7 @@
+ curses.h ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6955 "configure"
++#line 6983 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6964,16 +6992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6970: \$? = $ac_status" >&5
++ echo "$as_me:6998: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6973: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6976: \$? = $ac_status" >&5
++ echo "$as_me:7004: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6984,11 +7012,11 @@
+ done
+
+ fi
+-echo "$as_me:6987: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7015: 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:6991: error: No curses header-files found" >&5
++ { { echo "$as_me:7019: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6998,23 +7026,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:7001: checking for $ac_header" >&5
++echo "$as_me:7029: 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 7007 "configure"
++#line 7035 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7039: \"$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:7017: \$? = $ac_status" >&5
++ echo "$as_me:7045: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7033,7 +7061,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7064: 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
+@@ -7043,7 +7071,7 @@
+ fi
+ done
+
+-echo "$as_me:7046: checking for terminfo header" >&5
++echo "$as_me:7074: 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
+@@ -7061,7 +7089,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7064 "configure"
++#line 7092 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7076,16 +7104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7082: \$? = $ac_status" >&5
++ echo "$as_me:7110: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7085: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7113: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7088: \$? = $ac_status" >&5
++ echo "$as_me:7116: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -7101,7 +7129,7 @@
+ done
+
+ fi
+-echo "$as_me:7104: result: $cf_cv_term_header" >&5
++echo "$as_me:7132: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7133,7 +7161,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7136: checking for ncurses version" >&5
++echo "$as_me:7164: 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
+@@ -7159,10 +7187,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:7162: \"$cf_try\"") >&5
++ { (eval echo "$as_me:7190: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7165: \$? = $ac_status" >&5
++ echo "$as_me:7193: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7172,7 +7200,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7175 "configure"
++#line 7203 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7199,15 +7227,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7205: \$? = $ac_status" >&5
++ echo "$as_me:7233: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7207: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7235: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7210: \$? = $ac_status" >&5
++ echo "$as_me:7238: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7221,17 +7249,17 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:7224: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7252: 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:7231: checking if we have identified curses libraries" >&5
++echo "$as_me:7259: 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 7234 "configure"
++#line 7262 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7243,16 +7271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7246: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7249: \$? = $ac_status" >&5
++ echo "$as_me:7277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7252: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7255: \$? = $ac_status" >&5
++ echo "$as_me:7283: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7261,13 +7289,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7264: result: $cf_result" >&5
++echo "$as_me:7292: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+- echo "$as_me:7270: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:7298: 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
+@@ -7275,7 +7303,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7278 "configure"
++#line 7306 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7294,16 +7322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7325: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7300: \$? = $ac_status" >&5
++ echo "$as_me:7328: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7303: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7331: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7306: \$? = $ac_status" >&5
++ echo "$as_me:7334: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7314,7 +7342,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7317: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7345: 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
+
+@@ -7344,7 +7372,7 @@
+ # term.h) for cur_colr
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+- echo "$as_me:7347: checking for initscr in -lcur_colr" >&5
++ echo "$as_me:7375: 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
+@@ -7352,7 +7380,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7355 "configure"
++#line 7383 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7371,16 +7399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7377: \$? = $ac_status" >&5
++ echo "$as_me:7405: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7380: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7408: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7383: \$? = $ac_status" >&5
++ echo "$as_me:7411: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7391,7 +7419,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7394: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7422: 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
+
+@@ -7415,7 +7443,7 @@
+
+ else
+
+- echo "$as_me:7418: checking for initscr in -lHcurses" >&5
++ echo "$as_me:7446: 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
+@@ -7423,7 +7451,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7426 "configure"
++#line 7454 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7442,16 +7470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7473: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7448: \$? = $ac_status" >&5
++ echo "$as_me:7476: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7451: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7479: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7454: \$? = $ac_status" >&5
++ echo "$as_me:7482: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7462,7 +7490,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7465: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7493: 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
+
+@@ -7520,7 +7548,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}:7523: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7551: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7549,7 +7577,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}:7552: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7580: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7580,7 +7608,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}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7611: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7615,7 +7643,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}:7618: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7646: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7659,13 +7687,13 @@
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+- echo "$as_me:7662: checking for tgoto" >&5
++ echo "$as_me:7690: 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 7668 "configure"
++#line 7696 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7696,16 +7724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7727: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7702: \$? = $ac_status" >&5
++ echo "$as_me:7730: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7705: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7733: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7708: \$? = $ac_status" >&5
++ echo "$as_me:7736: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_tgoto=yes
+ else
+@@ -7715,7 +7743,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7718: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7746: 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
+@@ -7724,7 +7752,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:7727: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7755: 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
+@@ -7732,7 +7760,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7735 "configure"
++#line 7763 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7751,16 +7779,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7757: \$? = $ac_status" >&5
++ echo "$as_me:7785: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7760: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7788: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7763: \$? = $ac_status" >&5
++ echo "$as_me:7791: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -7771,7 +7799,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7774: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7802: 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
+
+@@ -7794,10 +7822,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:7797: checking if we can link with $cf_curs_lib library" >&5
++ echo "$as_me:7825: 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 7800 "configure"
++#line 7828 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7809,16 +7837,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7840: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7815: \$? = $ac_status" >&5
++ echo "$as_me:7843: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7818: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7846: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7821: \$? = $ac_status" >&5
++ echo "$as_me:7849: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7827,16 +7855,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7830: result: $cf_result" >&5
++ echo "$as_me:7858: 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:7836: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++ echo "$as_me:7864: 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 7839 "configure"
++#line 7867 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7848,16 +7876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7854: \$? = $ac_status" >&5
++ echo "$as_me:7882: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7860: \$? = $ac_status" >&5
++ echo "$as_me:7888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -7866,7 +7894,7 @@
+
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7869 "configure"
++#line 7897 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7878,16 +7906,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7884: \$? = $ac_status" >&5
++ echo "$as_me:7912: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7887: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7915: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7890: \$? = $ac_status" >&5
++ echo "$as_me:7918: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7899,13 +7927,13 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7902: result: $cf_result" >&5
++ echo "$as_me:7930: 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:7908: error: no curses library found" >&5
++ test "$cf_curs_lib" = unknown && { { echo "$as_me:7936: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7917,23 +7945,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7920: checking for $ac_header" >&5
++echo "$as_me:7948: 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 7926 "configure"
++#line 7954 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7930: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7958: \"$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:7936: \$? = $ac_status" >&5
++ echo "$as_me:7964: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7952,7 +7980,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7955: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7983: 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
+@@ -7962,7 +7990,7 @@
+ fi
+ done
+
+-echo "$as_me:7965: checking for multibyte character support" >&5
++echo "$as_me:7993: 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
+@@ -7970,7 +7998,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7973 "configure"
++#line 8001 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7987,16 +8015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7993: \$? = $ac_status" >&5
++ echo "$as_me:8021: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7996: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8024: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7999: \$? = $ac_status" >&5
++ echo "$as_me:8027: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -8008,12 +8036,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:8011: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8039: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8016 "configure"
++#line 8044 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8026,16 +8054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8032: \$? = $ac_status" >&5
++ echo "$as_me:8060: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8035: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8063: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8038: \$? = $ac_status" >&5
++ echo "$as_me:8066: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8049,7 +8077,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8052 "configure"
++#line 8080 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8062,16 +8090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8068: \$? = $ac_status" >&5
++ echo "$as_me:8096: \$? = $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:8099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8074: \$? = $ac_status" >&5
++ echo "$as_me:8102: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8088,9 +8116,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:8091: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8119: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:8093: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8121: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8181,7 +8209,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}:8184: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8212: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -8189,7 +8217,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8192 "configure"
++#line 8220 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8202,21 +8230,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8208: \$? = $ac_status" >&5
++ echo "$as_me:8236: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8211: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8214: \$? = $ac_status" >&5
++ echo "$as_me:8242: \$? = $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}:8219: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8247: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8234,7 +8262,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:8237: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8265: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -8309,13 +8337,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}:8312: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8340: 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 8318 "configure"
++#line 8346 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8328,21 +8356,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8331: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8334: \$? = $ac_status" >&5
++ echo "$as_me:8362: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8337: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8365: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8340: \$? = $ac_status" >&5
++ echo "$as_me:8368: \$? = $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}:8345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8373: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -8384,7 +8412,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8387: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8415: 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
+@@ -8422,7 +8450,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8425 "configure"
++#line 8453 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8434,16 +8462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8440: \$? = $ac_status" >&5
++ echo "$as_me:8468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8443: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8446: \$? = $ac_status" >&5
++ echo "$as_me:8474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8460,7 +8488,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}:8463: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8491: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8496,7 +8524,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}:8499: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8527: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -8526,13 +8554,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:8529: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:8557: 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:8532: result: yes" >&5
++ echo "$as_me:8560: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:8535: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:8563: 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
+
+@@ -8665,7 +8693,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8668 "configure"
++#line 8696 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8677,37 +8705,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8680: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8683: \$? = $ac_status" >&5
++ echo "$as_me:8711: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8686: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8714: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8689: \$? = $ac_status" >&5
++ echo "$as_me:8717: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8695 "configure"
++#line 8723 "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:8702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8705: \$? = $ac_status" >&5
++ echo "$as_me:8733: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8707: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8735: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8710: \$? = $ac_status" >&5
++ echo "$as_me:8738: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8881,7 +8909,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8884 "configure"
++#line 8912 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8893,37 +8921,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8924: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8899: \$? = $ac_status" >&5
++ echo "$as_me:8927: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8902: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8930: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8905: \$? = $ac_status" >&5
++ echo "$as_me:8933: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8911 "configure"
++#line 8939 "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:8918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8946: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8921: \$? = $ac_status" >&5
++ echo "$as_me:8949: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8923: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8951: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8926: \$? = $ac_status" >&5
++ echo "$as_me:8954: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -8940,7 +8968,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8943: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:8971: 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"
+@@ -8956,7 +8984,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:8959: checking for terminfo header" >&5
++echo "$as_me:8987: 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
+@@ -8974,7 +9002,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8977 "configure"
++#line 9005 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8989,16 +9017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9020: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8995: \$? = $ac_status" >&5
++ echo "$as_me:9023: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9026: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9001: \$? = $ac_status" >&5
++ echo "$as_me:9029: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9014,7 +9042,7 @@
+ done
+
+ fi
+-echo "$as_me:9017: result: $cf_cv_term_header" >&5
++echo "$as_me:9045: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9049,7 +9077,7 @@
+ fi
+
+ else
+- echo "$as_me:9052: result: no" >&5
++ echo "$as_me:9080: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -9065,7 +9093,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:9068: checking for $ac_word" >&5
++echo "$as_me:9096: 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
+@@ -9080,7 +9108,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:9083: found $ac_dir/$ac_word" >&5
++echo "$as_me:9111: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9088,10 +9116,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:9091: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:9119: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9094: result: no" >&5
++ echo "$as_me:9122: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9104,7 +9132,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:9107: checking for $ac_word" >&5
++echo "$as_me:9135: 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
+@@ -9119,7 +9147,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:9122: found $ac_dir/$ac_word" >&5
++echo "$as_me:9150: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9127,10 +9155,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:9130: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:9158: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9133: result: no" >&5
++ echo "$as_me:9161: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9287,7 +9315,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:9290: checking if we have identified curses headers" >&5
++echo "$as_me:9318: 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
+@@ -9299,7 +9327,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9302 "configure"
++#line 9330 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9311,16 +9339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9317: \$? = $ac_status" >&5
++ echo "$as_me:9345: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9320: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9348: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9323: \$? = $ac_status" >&5
++ echo "$as_me:9351: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9331,11 +9359,11 @@
+ done
+
+ fi
+-echo "$as_me:9334: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9362: 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:9338: error: No curses header-files found" >&5
++ { { echo "$as_me:9366: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9345,23 +9373,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:9348: checking for $ac_header" >&5
++echo "$as_me:9376: 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 9354 "configure"
++#line 9382 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9358: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9386: \"$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:9364: \$? = $ac_status" >&5
++ echo "$as_me:9392: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9380,7 +9408,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9383: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9411: 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
+@@ -9436,7 +9464,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9439 "configure"
++#line 9467 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9448,16 +9476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9479: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9454: \$? = $ac_status" >&5
++ echo "$as_me:9482: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9457: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9485: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9460: \$? = $ac_status" >&5
++ echo "$as_me:9488: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9474,7 +9502,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}:9477: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9505: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9493,7 +9521,7 @@
+
+ }
+
+-echo "$as_me:9496: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9524: 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
+@@ -9505,7 +9533,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9508 "configure"
++#line 9536 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9529,16 +9557,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9535: \$? = $ac_status" >&5
++ echo "$as_me:9563: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9538: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9566: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9541: \$? = $ac_status" >&5
++ echo "$as_me:9569: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -9553,14 +9581,14 @@
+ done
+
+ fi
+-echo "$as_me:9556: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9584: 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:9563: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9591: 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
+@@ -9681,7 +9709,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9684 "configure"
++#line 9712 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9693,16 +9721,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9724: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9699: \$? = $ac_status" >&5
++ echo "$as_me:9727: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9702: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9730: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9705: \$? = $ac_status" >&5
++ echo "$as_me:9733: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9719,7 +9747,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}:9722: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9750: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9742,7 +9770,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9745 "configure"
++#line 9773 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9766,16 +9794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9772: \$? = $ac_status" >&5
++ echo "$as_me:9800: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9775: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9803: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9778: \$? = $ac_status" >&5
++ echo "$as_me:9806: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -9796,12 +9824,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9799: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9827: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:9804: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9832: 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%/[^/]*$%%'`
+@@ -9837,7 +9865,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9840 "configure"
++#line 9868 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9849,16 +9877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9855: \$? = $ac_status" >&5
++ echo "$as_me:9883: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9858: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9886: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9861: \$? = $ac_status" >&5
++ echo "$as_me:9889: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9875,7 +9903,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}:9878: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9923,7 +9951,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9926: checking for terminfo header" >&5
++echo "$as_me:9954: 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
+@@ -9941,7 +9969,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9944 "configure"
++#line 9972 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9956,16 +9984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9962: \$? = $ac_status" >&5
++ echo "$as_me:9990: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9993: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9968: \$? = $ac_status" >&5
++ echo "$as_me:9996: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9981,7 +10009,7 @@
+ done
+
+ fi
+-echo "$as_me:9984: result: $cf_cv_term_header" >&5
++echo "$as_me:10012: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10019,7 +10047,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:10022: checking for ncurses version" >&5
++echo "$as_me:10050: 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
+@@ -10045,10 +10073,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:10048: \"$cf_try\"") >&5
++ { (eval echo "$as_me:10076: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10051: \$? = $ac_status" >&5
++ echo "$as_me:10079: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10058,7 +10086,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10061 "configure"
++#line 10089 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10085,15 +10113,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10116: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10091: \$? = $ac_status" >&5
++ echo "$as_me:10119: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10093: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10121: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10096: \$? = $ac_status" >&5
++ echo "$as_me:10124: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10107,7 +10135,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:10110: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10138: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10120,7 +10148,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10123: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10151: 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
+@@ -10128,7 +10156,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10131 "configure"
++#line 10159 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10147,16 +10175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10150: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10178: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10153: \$? = $ac_status" >&5
++ echo "$as_me:10181: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10156: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10184: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10159: \$? = $ac_status" >&5
++ echo "$as_me:10187: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10167,10 +10195,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10170: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10198: 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:10173: checking for initscr in -lgpm" >&5
++ echo "$as_me:10201: 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
+@@ -10178,7 +10206,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10181 "configure"
++#line 10209 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10197,16 +10225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10203: \$? = $ac_status" >&5
++ echo "$as_me:10231: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10206: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10209: \$? = $ac_status" >&5
++ echo "$as_me:10237: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10217,7 +10245,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10220: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10248: 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"
+@@ -10232,7 +10260,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:10235: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:10263: 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
+@@ -10240,7 +10268,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10243 "configure"
++#line 10271 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10259,16 +10287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10290: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10265: \$? = $ac_status" >&5
++ echo "$as_me:10293: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10268: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10296: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10271: \$? = $ac_status" >&5
++ echo "$as_me:10299: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10279,7 +10307,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10282: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10310: 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"
+@@ -10328,13 +10356,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:10331: checking for initscr" >&5
++ echo "$as_me:10359: 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 10337 "configure"
++#line 10365 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10365,16 +10393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10368: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10371: \$? = $ac_status" >&5
++ echo "$as_me:10399: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10374: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10402: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10377: \$? = $ac_status" >&5
++ echo "$as_me:10405: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -10384,18 +10412,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10387: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10415: 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:10394: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:10422: 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 10398 "configure"
++#line 10426 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10407,25 +10435,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10410: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10413: \$? = $ac_status" >&5
++ echo "$as_me:10441: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10416: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10444: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10419: \$? = $ac_status" >&5
++ echo "$as_me:10447: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10421: result: yes" >&5
++ echo "$as_me:10449: 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:10428: result: no" >&5
++echo "$as_me:10456: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -10493,11 +10521,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:10496: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:10524: 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 10500 "configure"
++#line 10528 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10509,25 +10537,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10515: \$? = $ac_status" >&5
++ echo "$as_me:10543: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10518: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10546: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10521: \$? = $ac_status" >&5
++ echo "$as_me:10549: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10523: result: yes" >&5
++ echo "$as_me:10551: 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:10530: result: no" >&5
++echo "$as_me:10558: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -10542,7 +10570,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:10545: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:10573: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10550,7 +10578,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:10553: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:10581: 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
+@@ -10560,7 +10588,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10563 "configure"
++#line 10591 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10572,23 +10600,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10603: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10578: \$? = $ac_status" >&5
++ echo "$as_me:10606: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10581: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10609: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10584: \$? = $ac_status" >&5
++ echo "$as_me:10612: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10586: result: yes" >&5
++ echo "$as_me:10614: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10591: result: no" >&5
++echo "$as_me:10619: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10613,13 +10641,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:10616: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:10644: 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:10619: result: yes" >&5
++ echo "$as_me:10647: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:10622: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:10650: 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
+
+@@ -10752,7 +10780,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10755 "configure"
++#line 10783 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10764,37 +10792,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10767: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10770: \$? = $ac_status" >&5
++ echo "$as_me:10798: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10773: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10801: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10776: \$? = $ac_status" >&5
++ echo "$as_me:10804: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10782 "configure"
++#line 10810 "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:10789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10792: \$? = $ac_status" >&5
++ echo "$as_me:10820: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10794: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10822: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10797: \$? = $ac_status" >&5
++ echo "$as_me:10825: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -10968,7 +10996,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10971 "configure"
++#line 10999 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10980,37 +11008,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10986: \$? = $ac_status" >&5
++ echo "$as_me:11014: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10989: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11017: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10992: \$? = $ac_status" >&5
++ echo "$as_me:11020: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10998 "configure"
++#line 11026 "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:11005: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11033: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11008: \$? = $ac_status" >&5
++ echo "$as_me:11036: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11010: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11038: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11013: \$? = $ac_status" >&5
++ echo "$as_me:11041: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -11027,7 +11055,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:11030: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:11058: 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"
+@@ -11043,7 +11071,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:11046: checking for terminfo header" >&5
++echo "$as_me:11074: 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
+@@ -11061,7 +11089,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11064 "configure"
++#line 11092 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11076,16 +11104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11107: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11082: \$? = $ac_status" >&5
++ echo "$as_me:11110: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11085: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11113: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11088: \$? = $ac_status" >&5
++ echo "$as_me:11116: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11101,7 +11129,7 @@
+ done
+
+ fi
+-echo "$as_me:11104: result: $cf_cv_term_header" >&5
++echo "$as_me:11132: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11136,7 +11164,7 @@
+ fi
+
+ else
+- echo "$as_me:11139: result: no" >&5
++ echo "$as_me:11167: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -11152,7 +11180,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:11155: checking for $ac_word" >&5
++echo "$as_me:11183: 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
+@@ -11167,7 +11195,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:11170: found $ac_dir/$ac_word" >&5
++echo "$as_me:11198: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11175,10 +11203,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:11178: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:11206: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11181: result: no" >&5
++ echo "$as_me:11209: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11191,7 +11219,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:11194: checking for $ac_word" >&5
++echo "$as_me:11222: 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
+@@ -11206,7 +11234,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:11209: found $ac_dir/$ac_word" >&5
++echo "$as_me:11237: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11214,10 +11242,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:11217: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:11245: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11220: result: no" >&5
++ echo "$as_me:11248: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11374,7 +11402,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:11377: checking if we have identified curses headers" >&5
++echo "$as_me:11405: 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
+@@ -11386,7 +11414,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11389 "configure"
++#line 11417 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11398,16 +11426,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11404: \$? = $ac_status" >&5
++ echo "$as_me:11432: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11407: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11435: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11410: \$? = $ac_status" >&5
++ echo "$as_me:11438: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11418,11 +11446,11 @@
+ done
+
+ fi
+-echo "$as_me:11421: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11449: 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:11425: error: No curses header-files found" >&5
++ { { echo "$as_me:11453: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11432,23 +11460,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:11435: checking for $ac_header" >&5
++echo "$as_me:11463: 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 11441 "configure"
++#line 11469 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11473: \"$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:11451: \$? = $ac_status" >&5
++ echo "$as_me:11479: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11467,7 +11495,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11498: 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
+@@ -11523,7 +11551,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11526 "configure"
++#line 11554 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11535,16 +11563,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11538: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11541: \$? = $ac_status" >&5
++ echo "$as_me:11569: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11544: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11572: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11547: \$? = $ac_status" >&5
++ echo "$as_me:11575: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11561,7 +11589,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}:11564: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11592: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11580,7 +11608,7 @@
+
+ }
+
+-echo "$as_me:11583: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11611: 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
+@@ -11592,7 +11620,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11595 "configure"
++#line 11623 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11616,16 +11644,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11647: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11622: \$? = $ac_status" >&5
++ echo "$as_me:11650: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11625: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11653: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11628: \$? = $ac_status" >&5
++ echo "$as_me:11656: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -11640,14 +11668,14 @@
+ done
+
+ fi
+-echo "$as_me:11643: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11671: 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:11650: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11678: 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
+@@ -11768,7 +11796,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11771 "configure"
++#line 11799 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11780,16 +11808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11783: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11786: \$? = $ac_status" >&5
++ echo "$as_me:11814: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11789: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11817: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11792: \$? = $ac_status" >&5
++ echo "$as_me:11820: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11806,7 +11834,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}:11809: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11837: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11829,7 +11857,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11832 "configure"
++#line 11860 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11853,16 +11881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11884: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11859: \$? = $ac_status" >&5
++ echo "$as_me:11887: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11862: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11865: \$? = $ac_status" >&5
++ echo "$as_me:11893: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11883,12 +11911,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11886: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11914: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11891: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11919: 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%/[^/]*$%%'`
+@@ -11924,7 +11952,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11927 "configure"
++#line 11955 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11936,16 +11964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11967: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11942: \$? = $ac_status" >&5
++ echo "$as_me:11970: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11945: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11973: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11948: \$? = $ac_status" >&5
++ echo "$as_me:11976: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11962,7 +11990,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}:11965: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11993: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -12010,7 +12038,7 @@
+ ;;
+ esac
+
+-echo "$as_me:12013: checking for terminfo header" >&5
++echo "$as_me:12041: 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
+@@ -12028,7 +12056,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12031 "configure"
++#line 12059 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12043,16 +12071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12049: \$? = $ac_status" >&5
++ echo "$as_me:12077: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12052: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12055: \$? = $ac_status" >&5
++ echo "$as_me:12083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -12068,7 +12096,7 @@
+ done
+
+ fi
+-echo "$as_me:12071: result: $cf_cv_term_header" >&5
++echo "$as_me:12099: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12106,7 +12134,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:12109: checking for ncurses version" >&5
++echo "$as_me:12137: 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
+@@ -12132,10 +12160,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:12135: \"$cf_try\"") >&5
++ { (eval echo "$as_me:12163: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12138: \$? = $ac_status" >&5
++ echo "$as_me:12166: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12145,7 +12173,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12148 "configure"
++#line 12176 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12172,15 +12200,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12178: \$? = $ac_status" >&5
++ echo "$as_me:12206: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:12180: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12208: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12183: \$? = $ac_status" >&5
++ echo "$as_me:12211: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12194,7 +12222,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:12197: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12225: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12207,7 +12235,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12210: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12238: 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
+@@ -12215,7 +12243,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12218 "configure"
++#line 12246 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12234,16 +12262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12265: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12240: \$? = $ac_status" >&5
++ echo "$as_me:12268: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12243: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12271: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12246: \$? = $ac_status" >&5
++ echo "$as_me:12274: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12254,10 +12282,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12257: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12285: 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:12260: checking for initscr in -lgpm" >&5
++ echo "$as_me:12288: 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
+@@ -12265,7 +12293,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12268 "configure"
++#line 12296 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12284,16 +12312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12290: \$? = $ac_status" >&5
++ echo "$as_me:12318: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12293: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12321: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12296: \$? = $ac_status" >&5
++ echo "$as_me:12324: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12304,7 +12332,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12307: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12335: 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"
+@@ -12319,7 +12347,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:12322: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:12350: 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
+@@ -12327,7 +12355,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12330 "configure"
++#line 12358 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12346,16 +12374,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12377: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12352: \$? = $ac_status" >&5
++ echo "$as_me:12380: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12355: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12383: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12358: \$? = $ac_status" >&5
++ echo "$as_me:12386: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12366,7 +12394,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12369: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12397: 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"
+@@ -12415,13 +12443,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:12418: checking for initscr" >&5
++ echo "$as_me:12446: 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 12424 "configure"
++#line 12452 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12452,16 +12480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12483: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12458: \$? = $ac_status" >&5
++ echo "$as_me:12486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12461: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12464: \$? = $ac_status" >&5
++ echo "$as_me:12492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -12471,18 +12499,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12474: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12502: 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:12481: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:12509: 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 12485 "configure"
++#line 12513 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12494,25 +12522,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12525: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12500: \$? = $ac_status" >&5
++ echo "$as_me:12528: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12503: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12531: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12506: \$? = $ac_status" >&5
++ echo "$as_me:12534: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12508: result: yes" >&5
++ echo "$as_me:12536: 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:12515: result: no" >&5
++echo "$as_me:12543: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -12580,11 +12608,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:12583: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:12611: 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 12587 "configure"
++#line 12615 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12596,25 +12624,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12627: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12602: \$? = $ac_status" >&5
++ echo "$as_me:12630: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12605: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12633: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12608: \$? = $ac_status" >&5
++ echo "$as_me:12636: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12610: result: yes" >&5
++ echo "$as_me:12638: 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:12617: result: no" >&5
++echo "$as_me:12645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -12629,7 +12657,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:12632: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:12660: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -12637,7 +12665,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:12640: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:12668: 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
+@@ -12647,7 +12675,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12650 "configure"
++#line 12678 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12659,23 +12687,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12665: \$? = $ac_status" >&5
++ echo "$as_me:12693: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12668: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12696: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12671: \$? = $ac_status" >&5
++ echo "$as_me:12699: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12673: result: yes" >&5
++ echo "$as_me:12701: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12678: result: no" >&5
++echo "$as_me:12706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12695,7 +12723,7 @@
+
+ ;;
+ (pdcurses)
+- echo "$as_me:12698: checking for X" >&5
++ echo "$as_me:12726: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -12799,17 +12827,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 12802 "configure"
++#line 12830 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:12806: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12834: \"$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:12812: \$? = $ac_status" >&5
++ echo "$as_me:12840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12842,7 +12870,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12845 "configure"
++#line 12873 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -12854,16 +12882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12885: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12860: \$? = $ac_status" >&5
++ echo "$as_me:12888: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12863: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12891: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12866: \$? = $ac_status" >&5
++ echo "$as_me:12894: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12901,7 +12929,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:12904: result: $have_x" >&5
++ echo "$as_me:12932: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -12911,7 +12939,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:12914: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:12942: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -12938,11 +12966,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:12941: checking whether -R must be followed by a space" >&5
++ echo "$as_me:12969: 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 12945 "configure"
++#line 12973 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12954,16 +12982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12960: \$? = $ac_status" >&5
++ echo "$as_me:12988: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12963: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12991: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12966: \$? = $ac_status" >&5
++ echo "$as_me:12994: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -12973,13 +13001,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:12976: result: no" >&5
++ echo "$as_me:13004: 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 12982 "configure"
++#line 13010 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12991,16 +13019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12997: \$? = $ac_status" >&5
++ echo "$as_me:13025: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13000: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13028: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13003: \$? = $ac_status" >&5
++ echo "$as_me:13031: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -13010,11 +13038,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:13013: result: yes" >&5
++ echo "$as_me:13041: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:13017: result: neither works" >&5
++ echo "$as_me:13045: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -13034,7 +13062,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 13037 "configure"
++#line 13065 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13053,22 +13081,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13059: \$? = $ac_status" >&5
++ echo "$as_me:13087: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13062: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13090: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13065: \$? = $ac_status" >&5
++ echo "$as_me:13093: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13071: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13099: 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
+@@ -13076,7 +13104,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13079 "configure"
++#line 13107 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13095,16 +13123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13126: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13101: \$? = $ac_status" >&5
++ echo "$as_me:13129: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13104: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13132: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13107: \$? = $ac_status" >&5
++ echo "$as_me:13135: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13115,14 +13143,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13118: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13146: 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:13125: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:13153: 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
+@@ -13130,7 +13158,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13133 "configure"
++#line 13161 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13149,16 +13177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13152: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13180: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13155: \$? = $ac_status" >&5
++ echo "$as_me:13183: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13158: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13186: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13161: \$? = $ac_status" >&5
++ echo "$as_me:13189: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13169,7 +13197,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13172: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13200: 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"
+@@ -13188,13 +13216,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:13191: checking for gethostbyname" >&5
++ echo "$as_me:13219: 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 13197 "configure"
++#line 13225 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13225,16 +13253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13231: \$? = $ac_status" >&5
++ echo "$as_me:13259: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13234: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13262: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13237: \$? = $ac_status" >&5
++ echo "$as_me:13265: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -13244,11 +13272,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13247: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13275: 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:13251: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:13279: 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
+@@ -13256,7 +13284,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13259 "configure"
++#line 13287 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13275,16 +13303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13281: \$? = $ac_status" >&5
++ echo "$as_me:13309: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13284: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13287: \$? = $ac_status" >&5
++ echo "$as_me:13315: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13295,14 +13323,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13298: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13326: 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:13305: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:13333: 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
+@@ -13310,7 +13338,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13313 "configure"
++#line 13341 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13329,16 +13357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13332: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13335: \$? = $ac_status" >&5
++ echo "$as_me:13363: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13338: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13366: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13341: \$? = $ac_status" >&5
++ echo "$as_me:13369: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13349,7 +13377,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13352: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13380: 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"
+@@ -13365,13 +13393,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:13368: checking for connect" >&5
++ echo "$as_me:13396: 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 13374 "configure"
++#line 13402 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13402,16 +13430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13433: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13408: \$? = $ac_status" >&5
++ echo "$as_me:13436: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13411: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13439: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13414: \$? = $ac_status" >&5
++ echo "$as_me:13442: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -13421,11 +13449,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13424: result: $ac_cv_func_connect" >&5
++echo "$as_me:13452: 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:13428: checking for connect in -lsocket" >&5
++ echo "$as_me:13456: 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
+@@ -13433,7 +13461,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13436 "configure"
++#line 13464 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13452,16 +13480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13458: \$? = $ac_status" >&5
++ echo "$as_me:13486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13461: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13464: \$? = $ac_status" >&5
++ echo "$as_me:13492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -13472,7 +13500,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13475: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13503: 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"
+@@ -13481,13 +13509,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:13484: checking for remove" >&5
++ echo "$as_me:13512: 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 13490 "configure"
++#line 13518 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13518,16 +13546,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13524: \$? = $ac_status" >&5
++ echo "$as_me:13552: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13527: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13555: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13530: \$? = $ac_status" >&5
++ echo "$as_me:13558: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -13537,11 +13565,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13540: result: $ac_cv_func_remove" >&5
++echo "$as_me:13568: 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:13544: checking for remove in -lposix" >&5
++ echo "$as_me:13572: 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
+@@ -13549,7 +13577,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13552 "configure"
++#line 13580 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13568,16 +13596,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13574: \$? = $ac_status" >&5
++ echo "$as_me:13602: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13577: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13580: \$? = $ac_status" >&5
++ echo "$as_me:13608: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -13588,7 +13616,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13591: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13619: 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"
+@@ -13597,13 +13625,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:13600: checking for shmat" >&5
++ echo "$as_me:13628: 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 13606 "configure"
++#line 13634 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13634,16 +13662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13640: \$? = $ac_status" >&5
++ echo "$as_me:13668: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13643: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13671: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13646: \$? = $ac_status" >&5
++ echo "$as_me:13674: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -13653,11 +13681,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13656: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13684: 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:13660: checking for shmat in -lipc" >&5
++ echo "$as_me:13688: 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
+@@ -13665,7 +13693,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13668 "configure"
++#line 13696 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13684,16 +13712,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13690: \$? = $ac_status" >&5
++ echo "$as_me:13718: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13693: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13696: \$? = $ac_status" >&5
++ echo "$as_me:13724: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13704,7 +13732,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13707: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13735: 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"
+@@ -13722,7 +13750,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:13725: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:13753: 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
+@@ -13730,7 +13758,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13733 "configure"
++#line 13761 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13749,16 +13777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13780: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13755: \$? = $ac_status" >&5
++ echo "$as_me:13783: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13758: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13786: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13761: \$? = $ac_status" >&5
++ echo "$as_me:13789: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13769,7 +13797,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13772: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13800: 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"
+@@ -13781,7 +13809,7 @@
+
+ cf_x_athena=${cf_x_athena:-Xaw}
+
+-echo "$as_me:13784: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13812: 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=
+
+@@ -13792,14 +13820,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3d
+- echo "$as_me:13795: result: yes" >&5
++ echo "$as_me:13823: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13798: result: no" >&5
++ echo "$as_me:13826: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13802: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13830: 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=
+
+@@ -13810,14 +13838,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3dxft
+- echo "$as_me:13813: result: yes" >&5
++ echo "$as_me:13841: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13816: result: no" >&5
++ echo "$as_me:13844: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13820: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13848: 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=
+
+@@ -13828,14 +13856,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=neXtaw
+- echo "$as_me:13831: result: yes" >&5
++ echo "$as_me:13859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13834: result: no" >&5
++ echo "$as_me:13862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13838: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13866: 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=
+
+@@ -13846,10 +13874,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=XawPlus
+- echo "$as_me:13849: result: yes" >&5
++ echo "$as_me:13877: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13852: result: no" >&5
++ echo "$as_me:13880: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -13869,17 +13897,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}:13872: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13900: 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}:13878: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13906: 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}:13882: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13910: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14010,20 +14038,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}:14013: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14041: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
+-echo "$as_me:14019: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14047: 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 14026 "configure"
++#line 14054 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14041,16 +14069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14072: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14047: \$? = $ac_status" >&5
++ echo "$as_me:14075: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14050: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14078: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14053: \$? = $ac_status" >&5
++ echo "$as_me:14081: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xaw_compat=yes
+ else
+@@ -14060,7 +14088,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14063: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14091: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+ if test "$cf_cv_xaw_compat" = no
+@@ -14072,7 +14100,7 @@
+ (*)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+-echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
+
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'`
+@@ -14080,17 +14108,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ test -n "$verbose" && echo " found package xmu" 1>&6
+
+-echo "${as_me:-configure}:14083: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14111: 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}:14089: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14117: 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}:14093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14121: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14210,12 +14238,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14213: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14241: 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}:14218: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14246: testing ...after $LIBS ..." 1>&5
+
+ else
+ cf_pkgconfig_incs=
+@@ -14223,12 +14251,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14226: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14254: 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}:14231: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14259: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -14239,7 +14267,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}:14242: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14270: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+@@ -14264,17 +14292,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ test -n "$verbose" && echo " found package Xext" 1>&6
+
+-echo "${as_me:-configure}:14267: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14295: 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}:14273: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14301: 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}:14277: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14305: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14395,7 +14423,7 @@
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+
+- echo "$as_me:14398: checking for XextCreateExtension in -lXext" >&5
++ echo "$as_me:14426: 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
+@@ -14403,7 +14431,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14406 "configure"
++#line 14434 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14422,16 +14450,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14428: \$? = $ac_status" >&5
++ echo "$as_me:14456: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14431: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14459: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14434: \$? = $ac_status" >&5
++ echo "$as_me:14462: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14442,7 +14470,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14445: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14473: 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
+
+@@ -14478,17 +14506,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:14481: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14509: 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}:14487: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14515: 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}:14491: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14519: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14608,24 +14636,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14611: WARNING: unable to find X11 library" >&5
++ { echo "$as_me:14639: 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}:14618: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14646: 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}:14624: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14652: 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}:14628: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14656: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14745,24 +14773,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14748: WARNING: unable to find ICE library" >&5
++ { echo "$as_me:14776: 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}:14755: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14783: 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}:14761: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14789: 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}:14765: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14793: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14882,24 +14910,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14885: WARNING: unable to find SM library" >&5
++ { echo "$as_me:14913: 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}:14892: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14920: 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}:14898: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14926: 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}:14902: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14930: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15019,7 +15047,7 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:15022: WARNING: unable to find Xt library" >&5
++ { echo "$as_me:15050: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+
+@@ -15032,17 +15060,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:15035: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15063: 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}:15041: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15069: 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}:15045: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15073: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15163,14 +15191,14 @@
+ ;;
+ (*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15166: checking for usable X dependency" >&5
++echo "$as_me:15194: 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 15173 "configure"
++#line 15201 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15190,16 +15218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15196: \$? = $ac_status" >&5
++ echo "$as_me:15224: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15199: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15202: \$? = $ac_status" >&5
++ echo "$as_me:15230: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_x11_compat=yes
+ else
+@@ -15209,30 +15237,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15212: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15240: 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}:15218: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15246: 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}:15225: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15253: 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}:15231: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15259: 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}:15235: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15263: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15355,12 +15383,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15358: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15386: 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}:15363: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15391: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15368,14 +15396,14 @@
+ ;;
+ esac
+
+-echo "$as_me:15371: checking for usable X Toolkit package" >&5
++echo "$as_me:15399: 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 15378 "configure"
++#line 15406 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15391,16 +15419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15394: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15397: \$? = $ac_status" >&5
++ echo "$as_me:15425: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15400: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15428: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15403: \$? = $ac_status" >&5
++ echo "$as_me:15431: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_ice_compat=yes
+ else
+@@ -15410,7 +15438,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15413: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15441: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+
+ if test "$cf_cv_xt_ice_compat" = no
+@@ -15424,22 +15452,22 @@
+ (*)
+ test -n "$verbose" && echo " work around broken ICE dependency" 1>&6
+
+-echo "${as_me:-configure}:15427: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15455: 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}:15432: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15460: 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}:15438: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15466: 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}:15442: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15470: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15558,17 +15586,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:15561: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15589: 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}:15567: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15595: 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}:15571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15599: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15697,12 +15725,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15700: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15728: 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}:15705: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15733: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15722,7 +15750,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15725: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15753: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15807,7 +15835,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:15810: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15838: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15817,7 +15845,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:15820: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15848: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15827,7 +15855,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}:15830: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15858: 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"
+@@ -15836,7 +15864,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15839 "configure"
++#line 15867 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -15848,16 +15876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15879: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15854: \$? = $ac_status" >&5
++ echo "$as_me:15882: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15860: \$? = $ac_status" >&5
++ echo "$as_me:15888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -15865,12 +15893,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15868: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15896: 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}:15873: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15901: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -15878,13 +15906,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+- echo "$as_me:15881: checking for XOpenDisplay" >&5
++ echo "$as_me:15909: 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 15887 "configure"
++#line 15915 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15915,16 +15943,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15946: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15921: \$? = $ac_status" >&5
++ echo "$as_me:15949: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15924: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15952: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15927: \$? = $ac_status" >&5
++ echo "$as_me:15955: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XOpenDisplay=yes
+ else
+@@ -15934,13 +15962,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15937: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:15965: 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:15943: checking for XOpenDisplay in -lX11" >&5
++ echo "$as_me:15971: 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
+@@ -15948,7 +15976,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15951 "configure"
++#line 15979 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -15967,16 +15995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15998: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15973: \$? = $ac_status" >&5
++ echo "$as_me:16001: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15976: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16004: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15979: \$? = $ac_status" >&5
++ echo "$as_me:16007: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15987,7 +16015,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15990: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16018: 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
+
+@@ -16011,13 +16039,13 @@
+
+ fi
+
+- echo "$as_me:16014: checking for XtAppInitialize" >&5
++ echo "$as_me:16042: 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 16020 "configure"
++#line 16048 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16048,16 +16076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16079: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16054: \$? = $ac_status" >&5
++ echo "$as_me:16082: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16057: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16085: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16060: \$? = $ac_status" >&5
++ echo "$as_me:16088: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16067,13 +16095,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16070: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16098: 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:16076: checking for XtAppInitialize in -lXt" >&5
++ echo "$as_me:16104: 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
+@@ -16081,7 +16109,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16084 "configure"
++#line 16112 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16100,16 +16128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16106: \$? = $ac_status" >&5
++ echo "$as_me:16134: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16109: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16112: \$? = $ac_status" >&5
++ echo "$as_me:16140: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16120,7 +16148,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16123: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16151: 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
+
+@@ -16137,7 +16165,7 @@
+ fi
+
+ if test "$cf_have_X_LIBS" = no ; then
+- { echo "$as_me:16140: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++ { echo "$as_me:16168: 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
+@@ -16178,14 +16206,14 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+
+- echo "$as_me:16181: checking for $cf_test in $cf_path" >&5
++ echo "$as_me:16209: 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:16184: checking for $cf_test" >&5
++ echo "$as_me:16212: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16188 "configure"
++#line 16216 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Intrinsic.h>
+@@ -16199,16 +16227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16205: \$? = $ac_status" >&5
++ echo "$as_me:16233: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16208: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16211: \$? = $ac_status" >&5
++ echo "$as_me:16239: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16217,7 +16245,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:16220: result: $cf_result" >&5
++ echo "$as_me:16248: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16233,7 +16261,7 @@
+ done
+
+ if test -z "$cf_x_athena_inc" ; then
+- { echo "$as_me:16236: WARNING: Unable to find Athena header files" >&5
++ { echo "$as_me:16264: 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
+
+@@ -16298,10 +16326,10 @@
+ done
+ LIBS="$cf_add_libs"
+
+- echo "$as_me:16301: checking for $cf_test in $cf_libs" >&5
++ echo "$as_me:16329: 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 16304 "configure"
++#line 16332 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16318,16 +16346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16324: \$? = $ac_status" >&5
++ echo "$as_me:16352: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16355: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16330: \$? = $ac_status" >&5
++ echo "$as_me:16358: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16336,7 +16364,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:16339: result: $cf_result" >&5
++ echo "$as_me:16367: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16353,7 +16381,7 @@
+ done
+
+ if test -z "$cf_x_athena_lib" ; then
+- { { echo "$as_me:16356: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++ { { echo "$as_me:16384: 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
+@@ -16387,7 +16415,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:16390: checking for $ac_word" >&5
++echo "$as_me:16418: 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
+@@ -16402,7 +16430,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:16405: found $ac_dir/$ac_word" >&5
++echo "$as_me:16433: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16410,10 +16438,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+- echo "$as_me:16413: result: $XCURSES_CONFIG" >&5
++ echo "$as_me:16441: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16416: result: no" >&5
++ echo "$as_me:16444: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16426,7 +16454,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:16429: checking for $ac_word" >&5
++echo "$as_me:16457: 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
+@@ -16441,7 +16469,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:16444: found $ac_dir/$ac_word" >&5
++echo "$as_me:16472: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16449,10 +16477,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+- echo "$as_me:16452: result: $ac_ct_XCURSES_CONFIG" >&5
++ echo "$as_me:16480: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16455: result: no" >&5
++ echo "$as_me:16483: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16587,7 +16615,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16590: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16618: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16672,7 +16700,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:16675: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16703: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16682,7 +16710,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:16685: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16713: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16692,7 +16720,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}:16695: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16723: 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"
+@@ -16701,7 +16729,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16704 "configure"
++#line 16732 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -16713,16 +16741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16719: \$? = $ac_status" >&5
++ echo "$as_me:16747: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16722: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16725: \$? = $ac_status" >&5
++ echo "$as_me:16753: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -16730,12 +16758,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16733: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16761: 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}:16738: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16766: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -16743,7 +16771,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:16746: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16774: 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
+@@ -16751,7 +16779,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16754 "configure"
++#line 16782 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16770,16 +16798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16773: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16776: \$? = $ac_status" >&5
++ echo "$as_me:16804: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16779: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16807: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16782: \$? = $ac_status" >&5
++ echo "$as_me:16810: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16790,7 +16818,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16793: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16821: 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
+
+@@ -16812,7 +16840,7 @@
+
+ fi
+
+-echo "$as_me:16815: checking for XCurses library" >&5
++echo "$as_me:16843: 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
+@@ -16835,7 +16863,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16838 "configure"
++#line 16866 "configure"
+ #include "confdefs.h"
+
+ #include <xcurses.h>
+@@ -16850,16 +16878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16856: \$? = $ac_status" >&5
++ echo "$as_me:16884: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16859: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16887: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16862: \$? = $ac_status" >&5
++ echo "$as_me:16890: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_lib_XCurses=yes
+ else
+@@ -16870,7 +16898,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16873: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16901: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+
+ fi
+@@ -16885,23 +16913,23 @@
+ #define XCURSES 1
+ EOF
+
+- echo "$as_me:16888: checking for xcurses.h" >&5
++ echo "$as_me:16916: 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 16894 "configure"
++#line 16922 "configure"
+ #include "confdefs.h"
+ #include <xcurses.h>
+ _ACEOF
+-if { (eval echo "$as_me:16898: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16926: \"$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:16904: \$? = $ac_status" >&5
++ echo "$as_me:16932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16920,7 +16948,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16923: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16951: 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
+
+@@ -16931,26 +16959,26 @@
+ fi
+
+ else
+- { { echo "$as_me:16934: error: Cannot link with XCurses" >&5
++ { { echo "$as_me:16962: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ ;;
+ (*)
+- { { echo "$as_me:16941: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:16969: 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:16947: checking for _nc_init_pthreads" >&5
++echo "$as_me:16975: 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 16953 "configure"
++#line 16981 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16981,16 +17009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17012: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16987: \$? = $ac_status" >&5
++ echo "$as_me:17015: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16990: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17018: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16993: \$? = $ac_status" >&5
++ echo "$as_me:17021: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17000,7 +17028,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17003: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17031: 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
+@@ -17035,7 +17063,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17038: checking for X11 rgb file" >&5
++echo "$as_me:17066: 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.
+@@ -17080,26 +17108,24 @@
+ cf_path_syntax="$ac_default_prefix"
+ fi
+
+-case ".$cf_path" in
+-(.\$\(*\)*|.\'*\'*)
+- ;;
+-(..|./*|.\\*)
++case "x$cf_path" in
++(x\$\(*\)*|x\'*\'*)
+ ;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ ;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ eval cf_path="$cf_path"
+- case ".$cf_path" in
+- (.NONE/*)
++ case "x$cf_path" in
++ (xNONE/*)
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ esac
+ ;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:17102: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:17128: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -17107,7 +17133,7 @@
+
+ fi
+
+-echo "$as_me:17110: result: $RGB_PATH" >&5
++echo "$as_me:17136: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -17148,7 +17174,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17151: checking for desired basename for form library" >&5
++echo "$as_me:17177: 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.
+@@ -17168,10 +17194,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17171: result: $FORM_NAME" >&5
++echo "$as_me:17197: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:17174: checking for desired basename for menu library" >&5
++echo "$as_me:17200: 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.
+@@ -17191,10 +17217,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17194: result: $MENU_NAME" >&5
++echo "$as_me:17220: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:17197: checking for desired basename for panel library" >&5
++echo "$as_me:17223: 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.
+@@ -17214,10 +17240,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17217: result: $PANEL_NAME" >&5
++echo "$as_me:17243: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:17220: checking if you want to check for panel functions" >&5
++echo "$as_me:17246: 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.
+@@ -17234,7 +17260,7 @@
+ cf_enable_panel=$cf_default_panel
+
+ fi;
+-echo "$as_me:17237: result: $cf_enable_panel" >&5
++echo "$as_me:17263: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17245,13 +17271,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17248: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17274: 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:17251: result: yes" >&5
++ echo "$as_me:17277: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17254: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17280: 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"
+@@ -17401,7 +17427,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17404 "configure"
++#line 17430 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17413,37 +17439,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17442: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17419: \$? = $ac_status" >&5
++ echo "$as_me:17445: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17422: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17448: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17425: \$? = $ac_status" >&5
++ echo "$as_me:17451: \$? = $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 17431 "configure"
++#line 17457 "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:17438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17464: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17441: \$? = $ac_status" >&5
++ echo "$as_me:17467: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17443: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17469: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17446: \$? = $ac_status" >&5
++ echo "$as_me:17472: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17460,7 +17486,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17463: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17489: 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"
+@@ -17481,7 +17507,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:17484: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17510: 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
+@@ -17489,7 +17515,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17492 "configure"
++#line 17518 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17508,16 +17534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17514: \$? = $ac_status" >&5
++ echo "$as_me:17540: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17517: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17543: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17520: \$? = $ac_status" >&5
++ echo "$as_me:17546: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17528,7 +17554,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17531: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17557: 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
+
+@@ -17561,7 +17587,7 @@
+ cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+
+-echo "$as_me:17564: checking if you want to check for menu functions" >&5
++echo "$as_me:17590: 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.
+@@ -17578,7 +17604,7 @@
+ cf_enable_menu=$cf_default_menu
+
+ fi;
+-echo "$as_me:17581: result: $cf_enable_menu" >&5
++echo "$as_me:17607: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17587,14 +17613,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:17590: checking for NetBSD menu.h" >&5
++echo "$as_me:17616: 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 17597 "configure"
++#line 17623 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17612,16 +17638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17641: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17618: \$? = $ac_status" >&5
++ echo "$as_me:17644: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17621: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17647: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17624: \$? = $ac_status" >&5
++ echo "$as_me:17650: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_menu_h=yes
+
+@@ -17633,7 +17659,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17636: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17662: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17650,13 +17676,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17653: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17679: 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:17656: result: yes" >&5
++ echo "$as_me:17682: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17659: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17685: 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"
+@@ -17806,7 +17832,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17809 "configure"
++#line 17835 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17818,37 +17844,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17847: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17824: \$? = $ac_status" >&5
++ echo "$as_me:17850: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17827: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17853: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17830: \$? = $ac_status" >&5
++ echo "$as_me:17856: \$? = $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 17836 "configure"
++#line 17862 "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:17843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17846: \$? = $ac_status" >&5
++ echo "$as_me:17872: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17848: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17874: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17851: \$? = $ac_status" >&5
++ echo "$as_me:17877: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17865,7 +17891,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17868: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17894: 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"
+@@ -17886,7 +17912,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:17889: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17915: 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
+@@ -17894,7 +17920,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17897 "configure"
++#line 17923 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17913,16 +17939,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17919: \$? = $ac_status" >&5
++ echo "$as_me:17945: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17922: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17948: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17925: \$? = $ac_status" >&5
++ echo "$as_me:17951: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17933,7 +17959,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17936: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17962: 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
+
+@@ -17966,7 +17992,7 @@
+ cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+
+-echo "$as_me:17969: checking if you want to check for form functions" >&5
++echo "$as_me:17995: 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.
+@@ -17983,7 +18009,7 @@
+ cf_enable_form=$cf_default_form
+
+ fi;
+-echo "$as_me:17986: result: $cf_enable_form" >&5
++echo "$as_me:18012: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -17992,14 +18018,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:17995: checking for NetBSD form.h" >&5
++echo "$as_me:18021: 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 18002 "configure"
++#line 18028 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18018,16 +18044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18047: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18024: \$? = $ac_status" >&5
++ echo "$as_me:18050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18027: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18030: \$? = $ac_status" >&5
++ echo "$as_me:18056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_form_h=yes
+
+@@ -18039,7 +18065,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18042: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18068: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18056,13 +18082,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:18059: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++ echo "$as_me:18085: 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:18062: result: yes" >&5
++ echo "$as_me:18088: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:18065: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:18091: 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"
+@@ -18212,7 +18238,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18215 "configure"
++#line 18241 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18224,37 +18250,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18230: \$? = $ac_status" >&5
++ echo "$as_me:18256: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18233: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18259: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18236: \$? = $ac_status" >&5
++ echo "$as_me:18262: \$? = $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 18242 "configure"
++#line 18268 "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:18249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18275: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18252: \$? = $ac_status" >&5
++ echo "$as_me:18278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:18254: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18280: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18257: \$? = $ac_status" >&5
++ echo "$as_me:18283: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -18271,7 +18297,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18274: result: $cf_have_curses_lib" >&5
++ echo "$as_me:18300: 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"
+@@ -18292,7 +18318,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:18295: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18321: 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
+@@ -18300,7 +18326,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18303 "configure"
++#line 18329 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18319,16 +18345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18325: \$? = $ac_status" >&5
++ echo "$as_me:18351: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18328: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18354: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18331: \$? = $ac_status" >&5
++ echo "$as_me:18357: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -18339,7 +18365,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18342: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18368: 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
+
+@@ -18377,23 +18403,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18380: checking for $ac_header" >&5
++echo "$as_me:18406: 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 18386 "configure"
++#line 18412 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18416: \"$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:18396: \$? = $ac_status" >&5
++ echo "$as_me:18422: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18412,7 +18438,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18415: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18441: 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
+@@ -18422,13 +18448,13 @@
+ fi
+ done
+
+-echo "$as_me:18425: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18451: 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 18431 "configure"
++#line 18457 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -18444,16 +18470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18450: \$? = $ac_status" >&5
++ echo "$as_me:18476: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18453: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18479: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18456: \$? = $ac_status" >&5
++ echo "$as_me:18482: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -18463,7 +18489,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18466: result: $ac_cv_header_time" >&5
++echo "$as_me:18492: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -18474,7 +18500,6 @@
+ fi
+
+ for ac_header in \
+-getopt.h \
+ locale.h \
+ math.h \
+ stdarg.h \
+@@ -18482,27 +18507,26 @@
+ sys/select.h \
+ sys/time.h \
+ termios.h \
+-unistd.h \
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18489: checking for $ac_header" >&5
++echo "$as_me:18513: 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 18495 "configure"
++#line 18519 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18523: \"$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:18505: \$? = $ac_status" >&5
++ echo "$as_me:18529: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18521,7 +18545,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18548: 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
+@@ -18531,26 +18555,26 @@
+ fi
+ done
+
+-for ac_header in unistd.h getopt.h
++for ac_header in getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18537: checking for $ac_header" >&5
++echo "$as_me:18561: 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 18543 "configure"
++#line 18567 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18571: \"$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:18553: \$? = $ac_status" >&5
++ echo "$as_me:18577: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18569,7 +18593,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18596: 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
+@@ -18579,7 +18603,7 @@
+ fi
+ done
+
+-echo "$as_me:18582: checking for header declaring getopt variables" >&5
++echo "$as_me:18606: 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
+@@ -18589,7 +18613,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18592 "configure"
++#line 18616 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -18602,16 +18626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18629: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18608: \$? = $ac_status" >&5
++ echo "$as_me:18632: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18635: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18614: \$? = $ac_status" >&5
++ echo "$as_me:18638: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -18623,7 +18647,7 @@
+ done
+
+ fi
+-echo "$as_me:18626: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18650: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -18641,13 +18665,13 @@
+ fi
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:18644: checking for clock_gettime" >&5
++echo "$as_me:18668: 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 18650 "configure"
++#line 18674 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18678,16 +18702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18684: \$? = $ac_status" >&5
++ echo "$as_me:18708: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18687: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18690: \$? = $ac_status" >&5
++ echo "$as_me:18714: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -18697,12 +18721,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18700: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18724: 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:18705: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:18729: 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
+@@ -18710,7 +18734,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18713 "configure"
++#line 18737 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18729,16 +18753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18756: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18735: \$? = $ac_status" >&5
++ echo "$as_me:18759: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18738: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18762: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18741: \$? = $ac_status" >&5
++ echo "$as_me:18765: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18749,7 +18773,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18752: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18776: 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"
+@@ -18761,14 +18785,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18764: checking if clock_gettime links" >&5
++echo "$as_me:18788: 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 18771 "configure"
++#line 18795 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -18786,16 +18810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18792: \$? = $ac_status" >&5
++ echo "$as_me:18816: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18795: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18819: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18798: \$? = $ac_status" >&5
++ echo "$as_me:18822: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -18806,7 +18830,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18809: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18833: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -18820,13 +18844,13 @@
+ EOF
+
+ else
+-echo "$as_me:18823: checking for gettimeofday" >&5
++echo "$as_me:18847: 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 18829 "configure"
++#line 18853 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18857,16 +18881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18863: \$? = $ac_status" >&5
++ echo "$as_me:18887: \$? = $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:18890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18869: \$? = $ac_status" >&5
++ echo "$as_me:18893: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -18876,7 +18900,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18879: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18903: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -18886,7 +18910,7 @@
+
+ else
+
+-echo "$as_me:18889: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18913: 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
+@@ -18894,7 +18918,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18897 "configure"
++#line 18921 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18913,16 +18937,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18940: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18919: \$? = $ac_status" >&5
++ echo "$as_me:18943: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18922: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18946: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18925: \$? = $ac_status" >&5
++ echo "$as_me:18949: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18933,7 +18957,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18936: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18960: 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
+
+@@ -18971,13 +18995,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18974: checking for $ac_func" >&5
++echo "$as_me:18998: 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 18980 "configure"
++#line 19004 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19008,16 +19032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19014: \$? = $ac_status" >&5
++ echo "$as_me:19038: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19017: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19041: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19020: \$? = $ac_status" >&5
++ echo "$as_me:19044: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19027,7 +19051,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19030: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19054: 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
+@@ -19038,14 +19062,14 @@
+ done
+
+ # use a compile-check to work with ncurses*-config and subdirectory includes
+-echo "$as_me:19041: checking if we can use termcap.h" >&5
++echo "$as_me:19065: 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 19048 "configure"
++#line 19072 "configure"
+ #include "confdefs.h"
+
+ #include <curses.h>
+@@ -19066,16 +19090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19072: \$? = $ac_status" >&5
++ echo "$as_me:19096: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19075: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19078: \$? = $ac_status" >&5
++ echo "$as_me:19102: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_termcap_h=yes
+ else
+@@ -19085,7 +19109,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19088: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19112: 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
+@@ -19095,14 +19119,14 @@
+ EOF
+
+ else
+-echo "$as_me:19098: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19122: 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 19105 "configure"
++#line 19129 "configure"
+ #include "confdefs.h"
+
+ #include <ncurses/curses.h>
+@@ -19123,16 +19147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19126: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19150: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19129: \$? = $ac_status" >&5
++ echo "$as_me:19153: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19132: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19156: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19135: \$? = $ac_status" >&5
++ echo "$as_me:19159: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19142,7 +19166,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19145: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19169: 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
+@@ -19152,7 +19176,7 @@
+ fi
+
+ if test "x$ac_cv_func_getopt" = xno; then
+- { { echo "$as_me:19155: error: getopt is required for building programs" >&5
++ { { echo "$as_me:19179: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -19171,13 +19195,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19174: checking for $ac_func" >&5
++echo "$as_me:19198: 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 19180 "configure"
++#line 19204 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19208,16 +19232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19214: \$? = $ac_status" >&5
++ echo "$as_me:19238: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19217: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19241: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19220: \$? = $ac_status" >&5
++ echo "$as_me:19244: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19227,7 +19251,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19254: 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
+@@ -19239,7 +19263,7 @@
+
+ fi
+
+-echo "$as_me:19242: checking definition to turn on extended curses functions" >&5
++echo "$as_me:19266: 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
+@@ -19247,7 +19271,7 @@
+
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19250 "configure"
++#line 19274 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -19280,16 +19304,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19307: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19286: \$? = $ac_status" >&5
++ echo "$as_me:19310: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19289: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19313: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19292: \$? = $ac_status" >&5
++ echo "$as_me:19316: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=none
+ else
+@@ -19299,7 +19323,7 @@
+ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19302 "configure"
++#line 19326 "configure"
+ #include "confdefs.h"
+
+ #define $cf_try_xopen_extension 1
+@@ -19325,16 +19349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19352: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19331: \$? = $ac_status" >&5
++ echo "$as_me:19355: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19334: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19358: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19337: \$? = $ac_status" >&5
++ echo "$as_me:19361: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19348,7 +19372,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19351: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19375: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+
+ case "$cf_cv_need_xopen_extension" in
+@@ -19360,7 +19384,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19363: checking for term.h" >&5
++echo "$as_me:19387: 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
+@@ -19381,7 +19405,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19384 "configure"
++#line 19408 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19395,16 +19419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19422: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19401: \$? = $ac_status" >&5
++ echo "$as_me:19425: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19404: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19428: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19407: \$? = $ac_status" >&5
++ echo "$as_me:19431: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19423,7 +19447,7 @@
+ for cf_header in ncurses/term.h ncursesw/term.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19426 "configure"
++#line 19450 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19441,16 +19465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19444: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19468: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19447: \$? = $ac_status" >&5
++ echo "$as_me:19471: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19450: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19474: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19453: \$? = $ac_status" >&5
++ echo "$as_me:19477: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19465,7 +19489,7 @@
+ esac
+
+ fi
+-echo "$as_me:19468: result: $cf_cv_term_header" >&5
++echo "$as_me:19492: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ case "$cf_cv_term_header" in
+@@ -19492,7 +19516,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19495: checking for unctrl.h" >&5
++echo "$as_me:19519: 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
+@@ -19513,7 +19537,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19516 "configure"
++#line 19540 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19527,16 +19551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19533: \$? = $ac_status" >&5
++ echo "$as_me:19557: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19560: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19539: \$? = $ac_status" >&5
++ echo "$as_me:19563: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unctrl_header=$cf_header
+ break
+@@ -19549,12 +19573,12 @@
+ done
+
+ fi
+-echo "$as_me:19552: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19576: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+
+ case "$cf_cv_unctrl_header" in
+ (no)
+- { echo "$as_me:19557: WARNING: unctrl.h header not found" >&5
++ { echo "$as_me:19581: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ ;;
+ esac
+@@ -19652,10 +19676,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19655: checking for ${cf_func}" >&5
++ echo "$as_me:19679: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19658: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19682: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19664,7 +19688,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19667 "configure"
++#line 19691 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19697,16 +19721,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19724: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19703: \$? = $ac_status" >&5
++ echo "$as_me:19727: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19706: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19730: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19709: \$? = $ac_status" >&5
++ echo "$as_me:19733: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19722,7 +19746,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19725: result: $cf_result" >&5
++ echo "$as_me:19749: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19737,10 +19761,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19740: checking for ${cf_func}" >&5
++ echo "$as_me:19764: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19743: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19767: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19749,7 +19773,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19752 "configure"
++#line 19776 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19782,16 +19806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19809: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19788: \$? = $ac_status" >&5
++ echo "$as_me:19812: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19791: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19815: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19794: \$? = $ac_status" >&5
++ echo "$as_me:19818: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19807,7 +19831,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19810: result: $cf_result" >&5
++ echo "$as_me:19834: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19831,7 +19855,7 @@
+ cf_return="return value"
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19834 "configure"
++#line 19858 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19851,21 +19875,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19878: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19857: \$? = $ac_status" >&5
++ echo "$as_me:19881: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19860: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19884: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19863: \$? = $ac_status" >&5
++ echo "$as_me:19887: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6
+
+-echo "${as_me:-configure}:19868: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19892: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TPUTS_ARG $cf_arg
+@@ -19885,14 +19909,14 @@
+ done
+ fi
+
+-echo "$as_me:19888: checking for ncurses extended functions" >&5
++echo "$as_me:19912: 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 19895 "configure"
++#line 19919 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19907,16 +19931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19910: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19913: \$? = $ac_status" >&5
++ echo "$as_me:19937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19916: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19919: \$? = $ac_status" >&5
++ echo "$as_me:19943: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19924,7 +19948,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19927 "configure"
++#line 19951 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19949,16 +19973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19952: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19955: \$? = $ac_status" >&5
++ echo "$as_me:19979: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19958: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19982: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19961: \$? = $ac_status" >&5
++ echo "$as_me:19985: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19972,7 +19996,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19975: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:19999: 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
+@@ -19986,11 +20010,11 @@
+ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ then
+ cf_define_xpg5=no
+- echo "$as_me:19989: checking if _XPG5 should be defined to enable wide-characters" >&5
++ echo "$as_me:20013: 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 19993 "configure"
++#line 20017 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20003,16 +20027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20006: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20009: \$? = $ac_status" >&5
++ echo "$as_me:20033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20012: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20015: \$? = $ac_status" >&5
++ echo "$as_me:20039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -20021,7 +20045,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XPG5"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20024 "configure"
++#line 20048 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20034,16 +20058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20037: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20040: \$? = $ac_status" >&5
++ echo "$as_me:20064: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20043: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20067: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20046: \$? = $ac_status" >&5
++ echo "$as_me:20070: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_define_xpg5=yes
+ else
+@@ -20054,7 +20078,7 @@
+ CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:20057: result: $cf_define_xpg5" >&5
++ echo "$as_me:20081: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+
+ if test "$cf_define_xpg5" = yes
+@@ -20063,14 +20087,14 @@
+ fi
+ fi
+
+- echo "$as_me:20066: checking for wide-character functions" >&5
++ echo "$as_me:20090: 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 20073 "configure"
++#line 20097 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20087,16 +20111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20093: \$? = $ac_status" >&5
++ echo "$as_me:20117: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20096: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20120: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20099: \$? = $ac_status" >&5
++ echo "$as_me:20123: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_widechar_funcs=yes
+ else
+@@ -20107,7 +20131,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20110: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20134: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ if test "$cf_cv_widechar_funcs" != no ; then
+
+@@ -20128,14 +20152,14 @@
+
+ fi
+
+-echo "$as_me:20131: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20155: 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 20138 "configure"
++#line 20162 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20153,16 +20177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20159: \$? = $ac_status" >&5
++ echo "$as_me:20183: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20162: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20186: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20165: \$? = $ac_status" >&5
++ echo "$as_me:20189: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_use_pthreads=yes
+ else
+@@ -20173,21 +20197,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20176: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20200: 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:20183: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20207: 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 20190 "configure"
++#line 20214 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -20207,16 +20231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20210: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20213: \$? = $ac_status" >&5
++ echo "$as_me:20237: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20216: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20240: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20219: \$? = $ac_status" >&5
++ echo "$as_me:20243: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -20228,7 +20252,7 @@
+
+ fi
+
+-echo "$as_me:20231: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20255: 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
+@@ -20237,7 +20261,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:20240: checking for openpty in -lutil" >&5
++echo "$as_me:20264: 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
+@@ -20245,7 +20269,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20248 "configure"
++#line 20272 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20264,16 +20288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20270: \$? = $ac_status" >&5
++ echo "$as_me:20294: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20273: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20297: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20276: \$? = $ac_status" >&5
++ echo "$as_me:20300: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -20284,7 +20308,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20287: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20311: 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
+@@ -20292,7 +20316,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:20295: checking for openpty header" >&5
++echo "$as_me:20319: 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
+@@ -20319,7 +20343,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20322 "configure"
++#line 20346 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20337,16 +20361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20343: \$? = $ac_status" >&5
++ echo "$as_me:20367: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20346: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20370: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20349: \$? = $ac_status" >&5
++ echo "$as_me:20373: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -20364,7 +20388,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:20367: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20391: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20398,7 +20422,7 @@
+ fi
+ fi
+
+-echo "$as_me:20401: checking for function curses_version" >&5
++echo "$as_me:20425: 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
+@@ -20408,7 +20432,7 @@
+ cf_cv_func_curses_version=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20411 "configure"
++#line 20435 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20424,15 +20448,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20451: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20430: \$? = $ac_status" >&5
++ echo "$as_me:20454: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:20432: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20456: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20435: \$? = $ac_status" >&5
++ echo "$as_me:20459: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_curses_version=yes
+
+@@ -20447,14 +20471,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20450: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20474: 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:20457: checking for alternate character set array" >&5
++echo "$as_me:20481: 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
+@@ -20464,7 +20488,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20467 "configure"
++#line 20491 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20480,16 +20504,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20507: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20486: \$? = $ac_status" >&5
++ echo "$as_me:20510: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20489: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20513: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20492: \$? = $ac_status" >&5
++ echo "$as_me:20516: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_acs_map=$name; break
+ else
+@@ -20500,7 +20524,7 @@
+ done
+
+ fi
+-echo "$as_me:20503: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20527: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20510,7 +20534,7 @@
+
+ if test "$cf_enable_widec" = yes; then
+
+-echo "$as_me:20513: checking for wide alternate character set array" >&5
++echo "$as_me:20537: 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
+@@ -20520,7 +20544,7 @@
+ for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20523 "configure"
++#line 20547 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20536,16 +20560,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20563: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20542: \$? = $ac_status" >&5
++ echo "$as_me:20566: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20545: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20569: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20548: \$? = $ac_status" >&5
++ echo "$as_me:20572: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_map=$name
+ break
+@@ -20556,7 +20580,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ done
+ fi
+-echo "$as_me:20559: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20583: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20564,7 +20588,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+
+-echo "$as_me:20567: checking for wide alternate character constants" >&5
++echo "$as_me:20591: 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
+@@ -20574,7 +20598,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20577 "configure"
++#line 20601 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20591,16 +20615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20594: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20597: \$? = $ac_status" >&5
++ echo "$as_me:20621: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20600: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20624: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20603: \$? = $ac_status" >&5
++ echo "$as_me:20627: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20610,7 +20634,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20613 "configure"
++#line 20637 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20626,16 +20650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20632: \$? = $ac_status" >&5
++ echo "$as_me:20656: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20635: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20659: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20638: \$? = $ac_status" >&5
++ echo "$as_me:20662: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20646,7 +20670,7 @@
+ fi
+
+ fi
+-echo "$as_me:20649: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20673: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20656,10 +20680,10 @@
+
+ fi
+
+-echo "$as_me:20659: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20683: 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 20662 "configure"
++#line 20686 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20677,16 +20701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20683: \$? = $ac_status" >&5
++ echo "$as_me:20707: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20686: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20710: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20689: \$? = $ac_status" >&5
++ echo "$as_me:20713: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -20695,7 +20719,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20698: result: $cf_result" >&5
++echo "$as_me:20722: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -20716,14 +20740,14 @@
+ if test "$cf_enable_widec" = yes; then
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20719: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20743: 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 20726 "configure"
++#line 20750 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20741,23 +20765,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20747: \$? = $ac_status" >&5
++ echo "$as_me:20771: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20750: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20774: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20753: \$? = $ac_status" >&5
++ echo "$as_me:20777: \$? = $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 20760 "configure"
++#line 20784 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20776,16 +20800,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20803: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20782: \$? = $ac_status" >&5
++ echo "$as_me:20806: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20785: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20809: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20788: \$? = $ac_status" >&5
++ echo "$as_me:20812: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -20797,7 +20821,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20800: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20824: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20820,14 +20844,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20823: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20847: 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 20830 "configure"
++#line 20854 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20845,23 +20869,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20851: \$? = $ac_status" >&5
++ echo "$as_me:20875: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20854: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20878: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20857: \$? = $ac_status" >&5
++ echo "$as_me:20881: \$? = $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 20864 "configure"
++#line 20888 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20880,16 +20904,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20886: \$? = $ac_status" >&5
++ echo "$as_me:20910: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20889: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20913: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20892: \$? = $ac_status" >&5
++ echo "$as_me:20916: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -20901,7 +20925,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20904: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20928: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20924,14 +20948,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20927: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20951: 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 20934 "configure"
++#line 20958 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20949,23 +20973,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20955: \$? = $ac_status" >&5
++ echo "$as_me:20979: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20958: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20961: \$? = $ac_status" >&5
++ echo "$as_me:20985: \$? = $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 20968 "configure"
++#line 20992 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20984,16 +21008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20990: \$? = $ac_status" >&5
++ echo "$as_me:21014: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20993: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21017: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20996: \$? = $ac_status" >&5
++ echo "$as_me:21020: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -21005,7 +21029,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21008: result: $cf_cv_wint_t" >&5
++echo "$as_me:21032: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21029,10 +21053,10 @@
+
+ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+
+-echo "$as_me:21032: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21056: 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 21035 "configure"
++#line 21059 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21050,16 +21074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21056: \$? = $ac_status" >&5
++ echo "$as_me:21080: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21059: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21083: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21062: \$? = $ac_status" >&5
++ echo "$as_me:21086: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21068,7 +21092,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21071: result: $cf_result" >&5
++echo "$as_me:21095: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21090,10 +21114,10 @@
+
+ if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+
+-echo "$as_me:21093: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21117: 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 21096 "configure"
++#line 21120 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21111,16 +21135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21117: \$? = $ac_status" >&5
++ echo "$as_me:21141: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21120: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21144: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21123: \$? = $ac_status" >&5
++ echo "$as_me:21147: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21129,7 +21153,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21132: result: $cf_result" >&5
++echo "$as_me:21156: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21151,10 +21175,10 @@
+
+ if test "$NCURSES_OK_WINT_T" = 0 ; then
+
+-echo "$as_me:21154: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21178: 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 21157 "configure"
++#line 21181 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21172,16 +21196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21178: \$? = $ac_status" >&5
++ echo "$as_me:21202: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21181: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21205: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21184: \$? = $ac_status" >&5
++ echo "$as_me:21208: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21190,7 +21214,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21193: result: $cf_result" >&5
++echo "$as_me:21217: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21219,11 +21243,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21222: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21246: 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 21226 "configure"
++#line 21250 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21256,16 +21280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21259: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21283: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21262: \$? = $ac_status" >&5
++ echo "$as_me:21286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21265: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21268: \$? = $ac_status" >&5
++ echo "$as_me:21292: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21275,7 +21299,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21278: result: $cf_result" >&5
++echo "$as_me:21302: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = yes ; then
+@@ -21287,14 +21311,14 @@
+ EOF
+
+ else
+- echo "$as_me:21290: checking for data $cf_data in library" >&5
++ echo "$as_me:21314: 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 21297 "configure"
++#line 21321 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21333,16 +21357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21336: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21360: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21339: \$? = $ac_status" >&5
++ echo "$as_me:21363: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21342: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21366: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21345: \$? = $ac_status" >&5
++ echo "$as_me:21369: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21354,7 +21378,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21357 "configure"
++#line 21381 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21386,15 +21410,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21392: \$? = $ac_status" >&5
++ echo "$as_me:21416: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21394: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21418: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21397: \$? = $ac_status" >&5
++ echo "$as_me:21421: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21406,7 +21430,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+- echo "$as_me:21409: result: $cf_result" >&5
++ echo "$as_me:21433: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21423,7 +21447,7 @@
+
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+- echo "$as_me:21426: checking for X" >&5
++ echo "$as_me:21450: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -21527,17 +21551,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 21530 "configure"
++#line 21554 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:21534: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21558: \"$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:21540: \$? = $ac_status" >&5
++ echo "$as_me:21564: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21570,7 +21594,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21573 "configure"
++#line 21597 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -21582,16 +21606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21588: \$? = $ac_status" >&5
++ echo "$as_me:21612: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21591: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21615: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21594: \$? = $ac_status" >&5
++ echo "$as_me:21618: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21629,7 +21653,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:21632: result: $have_x" >&5
++ echo "$as_me:21656: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -21639,7 +21663,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:21642: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:21666: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -21666,11 +21690,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:21669: checking whether -R must be followed by a space" >&5
++ echo "$as_me:21693: 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 21673 "configure"
++#line 21697 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21682,16 +21706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21709: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21688: \$? = $ac_status" >&5
++ echo "$as_me:21712: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21691: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21715: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21694: \$? = $ac_status" >&5
++ echo "$as_me:21718: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -21701,13 +21725,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:21704: result: no" >&5
++ echo "$as_me:21728: 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 21710 "configure"
++#line 21734 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21719,16 +21743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21722: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21746: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21725: \$? = $ac_status" >&5
++ echo "$as_me:21749: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21728: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21752: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21731: \$? = $ac_status" >&5
++ echo "$as_me:21755: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -21738,11 +21762,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:21741: result: yes" >&5
++ echo "$as_me:21765: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:21745: result: neither works" >&5
++ echo "$as_me:21769: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -21762,7 +21786,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 21765 "configure"
++#line 21789 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21781,22 +21805,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21784: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21787: \$? = $ac_status" >&5
++ echo "$as_me:21811: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21790: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21814: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21793: \$? = $ac_status" >&5
++ echo "$as_me:21817: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21799: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21823: 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
+@@ -21804,7 +21828,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21807 "configure"
++#line 21831 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21823,16 +21847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21829: \$? = $ac_status" >&5
++ echo "$as_me:21853: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21832: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21856: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21835: \$? = $ac_status" >&5
++ echo "$as_me:21859: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21843,14 +21867,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21846: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21870: 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:21853: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:21877: 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
+@@ -21858,7 +21882,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21861 "configure"
++#line 21885 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21877,16 +21901,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21904: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21883: \$? = $ac_status" >&5
++ echo "$as_me:21907: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21886: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21910: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21889: \$? = $ac_status" >&5
++ echo "$as_me:21913: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21897,7 +21921,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21900: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21924: 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"
+@@ -21916,13 +21940,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:21919: checking for gethostbyname" >&5
++ echo "$as_me:21943: 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 21925 "configure"
++#line 21949 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21953,16 +21977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21959: \$? = $ac_status" >&5
++ echo "$as_me:21983: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21962: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21986: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21965: \$? = $ac_status" >&5
++ echo "$as_me:21989: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -21972,11 +21996,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21975: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:21999: 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:21979: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:22003: 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
+@@ -21984,7 +22008,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21987 "configure"
++#line 22011 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22003,16 +22027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22009: \$? = $ac_status" >&5
++ echo "$as_me:22033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22012: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22015: \$? = $ac_status" >&5
++ echo "$as_me:22039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22023,14 +22047,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22026: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22050: 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:22033: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:22057: 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
+@@ -22038,7 +22062,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22041 "configure"
++#line 22065 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22057,16 +22081,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22084: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22063: \$? = $ac_status" >&5
++ echo "$as_me:22087: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22066: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22090: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22069: \$? = $ac_status" >&5
++ echo "$as_me:22093: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22077,7 +22101,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22080: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22104: 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"
+@@ -22093,13 +22117,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:22096: checking for connect" >&5
++ echo "$as_me:22120: 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 22102 "configure"
++#line 22126 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22130,16 +22154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22133: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22136: \$? = $ac_status" >&5
++ echo "$as_me:22160: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22139: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22163: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22142: \$? = $ac_status" >&5
++ echo "$as_me:22166: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -22149,11 +22173,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22152: result: $ac_cv_func_connect" >&5
++echo "$as_me:22176: 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:22156: checking for connect in -lsocket" >&5
++ echo "$as_me:22180: 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
+@@ -22161,7 +22185,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22164 "configure"
++#line 22188 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22180,16 +22204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22186: \$? = $ac_status" >&5
++ echo "$as_me:22210: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22189: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22192: \$? = $ac_status" >&5
++ echo "$as_me:22216: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -22200,7 +22224,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22203: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22227: 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"
+@@ -22209,13 +22233,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:22212: checking for remove" >&5
++ echo "$as_me:22236: 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 22218 "configure"
++#line 22242 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22246,16 +22270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22252: \$? = $ac_status" >&5
++ echo "$as_me:22276: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22255: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22258: \$? = $ac_status" >&5
++ echo "$as_me:22282: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -22265,11 +22289,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22268: result: $ac_cv_func_remove" >&5
++echo "$as_me:22292: 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:22272: checking for remove in -lposix" >&5
++ echo "$as_me:22296: 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
+@@ -22277,7 +22301,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22280 "configure"
++#line 22304 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22296,16 +22320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22302: \$? = $ac_status" >&5
++ echo "$as_me:22326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22305: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22308: \$? = $ac_status" >&5
++ echo "$as_me:22332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -22316,7 +22340,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22319: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22343: 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"
+@@ -22325,13 +22349,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:22328: checking for shmat" >&5
++ echo "$as_me:22352: 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 22334 "configure"
++#line 22358 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22362,16 +22386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22368: \$? = $ac_status" >&5
++ echo "$as_me:22392: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22371: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22395: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22374: \$? = $ac_status" >&5
++ echo "$as_me:22398: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -22381,11 +22405,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22384: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22408: 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:22388: checking for shmat in -lipc" >&5
++ echo "$as_me:22412: 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
+@@ -22393,7 +22417,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22396 "configure"
++#line 22420 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22412,16 +22436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22418: \$? = $ac_status" >&5
++ echo "$as_me:22442: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22421: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22424: \$? = $ac_status" >&5
++ echo "$as_me:22448: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22432,7 +22456,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22435: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22459: 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"
+@@ -22450,7 +22474,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:22453: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:22477: 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
+@@ -22458,7 +22482,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22461 "configure"
++#line 22485 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22477,16 +22501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22504: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22483: \$? = $ac_status" >&5
++ echo "$as_me:22507: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22486: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22510: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22489: \$? = $ac_status" >&5
++ echo "$as_me:22513: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22497,7 +22521,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22500: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22524: 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"
+@@ -22544,16 +22568,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22547: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22571: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22552: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22576: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22556: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22580: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22592,16 +22616,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22595: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22619: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22600: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22624: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22604: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22628: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22640,23 +22664,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22643: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22667: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22648: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22672: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22652: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22676: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:22659: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22683: 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.
+@@ -22673,7 +22697,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:22676: result: $enable_warnings" >&5
++echo "$as_me:22700: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22696,10 +22720,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:22699: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:22723: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22702 "${as_me:-configure}"
++#line 22726 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22749,12 +22773,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:22776: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22755: \$? = $ac_status" >&5
++ echo "$as_me:22779: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:22757: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:22781: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -22832,7 +22856,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22835 "configure"
++#line 22859 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -22847,26 +22871,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22874: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22853: \$? = $ac_status" >&5
++ echo "$as_me:22877: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22856: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22880: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22859: \$? = $ac_status" >&5
++ echo "$as_me:22883: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:22862: checking for X11/Xt const-feature" >&5
++echo "$as_me:22886: 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 22869 "configure"
++#line 22893 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -22884,16 +22908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22911: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22890: \$? = $ac_status" >&5
++ echo "$as_me:22914: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22893: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22917: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22896: \$? = $ac_status" >&5
++ echo "$as_me:22920: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -22908,7 +22932,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22911: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22935: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22937,7 +22961,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22940 "${as_me:-configure}"
++#line 22964 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -22953,7 +22977,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:22956: checking for $CC warning options..." >&5
++ { echo "$as_me:22980: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22969,12 +22993,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:22972: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:22996: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22975: \$? = $ac_status" >&5
++ echo "$as_me:22999: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:22977: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23001: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -22982,7 +23006,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:22985: checking for $CC warning options..." >&5
++ { echo "$as_me:23009: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -23005,12 +23029,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:23008: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:23032: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23011: \$? = $ac_status" >&5
++ echo "$as_me:23035: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:23013: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23037: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -23018,7 +23042,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23028,7 +23052,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23031: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23045,7 +23069,7 @@
+
+ fi
+
+-echo "$as_me:23048: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23072: 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.
+@@ -23067,7 +23091,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:23070: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23094: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23181,23 +23205,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:23184: checking for dmalloc.h" >&5
++ echo "$as_me:23208: 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 23190 "configure"
++#line 23214 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23194: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23218: \"$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:23200: \$? = $ac_status" >&5
++ echo "$as_me:23224: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23216,11 +23240,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23219: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23243: 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:23223: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23247: 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
+@@ -23228,7 +23252,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23231 "configure"
++#line 23255 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23247,16 +23271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23253: \$? = $ac_status" >&5
++ echo "$as_me:23277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23256: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23280: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23259: \$? = $ac_status" >&5
++ echo "$as_me:23283: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23267,7 +23291,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23270: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23294: 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
+@@ -23282,7 +23306,7 @@
+
+ fi
+
+-echo "$as_me:23285: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:23309: 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.
+@@ -23304,7 +23328,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:23307: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23331: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23418,23 +23442,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:23421: checking for dbmalloc.h" >&5
++ echo "$as_me:23445: 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 23427 "configure"
++#line 23451 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23455: \"$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:23437: \$? = $ac_status" >&5
++ echo "$as_me:23461: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23453,11 +23477,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23456: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23480: 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:23460: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23484: 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
+@@ -23465,7 +23489,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23468 "configure"
++#line 23492 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23484,16 +23508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23490: \$? = $ac_status" >&5
++ echo "$as_me:23514: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23493: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23496: \$? = $ac_status" >&5
++ echo "$as_me:23520: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23504,7 +23528,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23507: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23531: 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
+@@ -23519,7 +23543,7 @@
+
+ fi
+
+-echo "$as_me:23522: checking if you want to use valgrind for testing" >&5
++echo "$as_me:23546: 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.
+@@ -23541,7 +23565,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:23544: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23568: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23654,7 +23678,7 @@
+ ;;
+ esac
+
+-echo "$as_me:23657: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23681: 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.
+@@ -23665,7 +23689,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:23668: result: $with_no_leaks" >&5
++echo "$as_me:23692: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -23683,7 +23707,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:23686: checking for an rpath option" >&5
++ echo "$as_me:23710: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -23714,12 +23738,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:23717: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:23741: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:23722: checking if we need a space after rpath option" >&5
++ echo "$as_me:23746: 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"
+
+@@ -23740,7 +23764,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23743 "configure"
++#line 23767 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -23752,16 +23776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23758: \$? = $ac_status" >&5
++ echo "$as_me:23782: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23761: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23785: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23764: \$? = $ac_status" >&5
++ echo "$as_me:23788: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -23771,14 +23795,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:23774: result: $cf_rpath_space" >&5
++ echo "$as_me:23798: 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:23781: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23805: 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.
+@@ -23796,22 +23820,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:23799: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23823: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:23804: checking for updated LDFLAGS" >&5
++echo "$as_me:23828: 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:23807: result: maybe" >&5
++ echo "$as_me:23831: 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:23814: checking for $ac_word" >&5
++echo "$as_me:23838: 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
+@@ -23826,7 +23850,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:23829: found $ac_dir/$ac_word" >&5
++echo "$as_me:23853: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -23834,10 +23858,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:23837: result: $cf_ldd_prog" >&5
++ echo "$as_me:23861: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:23840: result: no" >&5
++ echo "$as_me:23864: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -23851,7 +23875,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23854 "configure"
++#line 23878 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -23863,16 +23887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23869: \$? = $ac_status" >&5
++ echo "$as_me:23893: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23872: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23896: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23875: \$? = $ac_status" >&5
++ echo "$as_me:23899: \$? = $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`
+@@ -23900,7 +23924,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -23912,11 +23936,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23915: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23939: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23919: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23943: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23953,7 +23977,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:23956: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23980: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -23966,11 +23990,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23969: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23993: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:23973: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23997: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24007,7 +24031,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:24010: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24034: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -24020,14 +24044,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:24023: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24047: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:24027: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24051: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:24030: result: no" >&5
++ echo "$as_me:24054: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -24117,7 +24141,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24120: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24144: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24298,7 +24322,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:24301: error: ambiguous option: $1
++ { { echo "$as_me:24325: 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;}
+@@ -24317,7 +24341,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:24320: error: unrecognized option: $1
++ -*) { { echo "$as_me:24344: 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;}
+@@ -24367,7 +24391,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:24370: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:24394: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -24459,6 +24483,10 @@
+ s,@host_cpu@,$host_cpu,;t t
+ s,@host_vendor@,$host_vendor,;t t
+ s,@host_os@,$host_os,;t t
++s,@target@,$target,;t t
++s,@target_cpu@,$target_cpu,;t t
++s,@target_vendor@,$target_vendor,;t t
++s,@target_os@,$target_os,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+@@ -24475,6 +24503,8 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
++s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
+ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t
+ s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t
+ s,@LINT@,$LINT,;t t
+@@ -24675,7 +24705,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:24678: creating $ac_file" >&5
++ { echo "$as_me:24708: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -24693,7 +24723,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24696: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24726: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -24706,7 +24736,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24709: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24739: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24722,7 +24752,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:24725: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:24755: 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;}
+@@ -24731,7 +24761,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:24734: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:24764: 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;}
+@@ -24776,7 +24806,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:24779: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:24809: 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;}
+@@ -24787,7 +24817,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:24790: WARNING: Some variables may not be substituted:
++ { echo "$as_me:24820: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24836,7 +24866,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:24839: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:24869: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -24847,7 +24877,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24850: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24880: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -24860,7 +24890,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24863: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24893: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24918,7 +24948,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:24921: $ac_file is unchanged" >&5
++ { echo "$as_me:24951: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/configure.in
+Prereq: 1.174
+--- ncurses-6.5-20240727+/test/configure.in 2024-03-30 14:31:11.000000000 +0000
++++ ncurses-6.5-20240810/test/configure.in 2024-08-10 14:11:56.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1996-on
+ dnl
+-dnl $Id: configure.in,v 1.174 2024/03/30 14:31:11 tom Exp $
++dnl $Id: configure.in,v 1.177 2024/08/10 14:11:56 tom Exp $
+ dnl This is a simple configuration-script for the ncurses test programs that
+ dnl allows the test-directory to be separately configured against a reference
+ dnl system (i.e., sysvr4 curses)
+@@ -48,12 +48,10 @@
+
+ CF_INHERIT_SCRIPT(config.guess)
+ CF_INHERIT_SCRIPT(config.sub)
+-CF_CHECK_CACHE
+-
+-AC_ARG_PROGRAM
+
+ CF_HELP_MESSAGE(General Options:)
+
++CF_WITH_SYSTYPE
+ AC_PROG_MAKE_SET
+ CF_PROG_CC
+ AC_C_INLINE
+@@ -240,7 +238,6 @@
+
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS( \
+-getopt.h \
+ locale.h \
+ math.h \
+ stdarg.h \
+@@ -248,7 +245,6 @@
+ sys/select.h \
+ sys/time.h \
+ termios.h \
+-unistd.h \
+ )
+
+ CF_GETOPT_HEADER